tb_media 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1387c1ba0eb754c7363e2c2beab5a4d94af6dc96
-  data.tar.gz: 0fa036c28e19bd7cbf0d53d4062c271095bc680d
+  metadata.gz: 7fbe6cf7d2b36b60603ad2a3a5d99aba8c9aaba1
+  data.tar.gz: a935cadae7ae9a15b471cc150a70ba334519a48d
 SHA512:
-  metadata.gz: aee37a7b86e49d30a95b1b1c7634503096a49b51b53285a9a95c1023ae356466e8aa66c6a09ef505cd61161b692faa5cc1e99ea1c6b23beb123d13e7fb6ae849
-  data.tar.gz: 01cca18ee17a2d9e8764ff1ffffd8010487e01411dfb9b6e22cb4c8c18c569b83e045b406c1272528ea21f3c1b66fd95cdcd39df738520bac23007e8f2f0583a
+  metadata.gz: 98ef3de0fbe5db1c3abbfddefe5e9a85f5dda2babb09b0e475b120d35bef5cb256d9ed880e8c8efdf1d58bcc17af758a5923aef606dfd8bc1603d3fbd147c19b
+  data.tar.gz: 75aa870cc470dc4ef8d1bbb64ccb140402977a20378e749719be411dad6c59832cc13905d9bacc4d12e34afa514645f3b8f5bdd37fd70c62f897393bb6db40f1

data/app/assets/javascripts/admin/media/picker.js

@@ -1,6 +1,5 @@
 //= require jquery
 //= require jquery_ujs
-//= require tinymce/tiny_mce_popup
 //= require_self
 //= require admin/media/utils
 
@@ -96,7 +95,7 @@ spud.admin.mediapicker = new function(){
   
   self.clickedCancel = function(e){
     e.preventDefault();
-    tinyMCEPopup.close();
+    parent.tinyMCE.activeEditor.windowManager.close();
   };
   
   self.clickedUseSelected = function(e){
@@ -198,7 +197,7 @@ spud.admin.mediapicker = new function(){
     else{
       $('.spud_media_picker_option_target').show();
       $('.spud_media_picker_option_text').show();
-      $('.spud_media_picker_option_text input').val(tinyMCEPopup.editor.selection.getContent());
+      $('.spud_media_picker_option_text input').val(parent.tinyMCE.activeEditor.selection.getContent());
       $('.spud_media_picker_option_float').hide();
       $('.spud_media_picker_option_title').hide();
       $('.spud_media_picker_option_dimensions').hide();
@@ -254,8 +253,8 @@ spud.admin.mediapicker = new function(){
         return;
       }
     }
-    tinyMCEPopup.editor.execCommand('spudMediaInsertSelected', false, selectedFile);
-    tinyMCEPopup.close();
+    parent.tinyMCE.activeEditor.execCommand('spudMediaInsertSelected', false, selectedFile);
+    parent.tinyMCE.activeEditor.windowManager.close();
   };
 
   self.pickerOptionKeyDown = function(e){

data/lib/spud_media/content_types.rb

@@ -39,6 +39,7 @@ module Spud
       'image/bmp',
       'image/gif',
       'image/jpeg',
+      'image/pjpeg',
       'image/png',
       'image/svg+xml',
       'image/tiff',

data/lib/spud_media/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Media
-		VERSION = "1.0.5"
+		VERSION = "1.0.6"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_media
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Westlake Design
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +215,6 @@ files:
 - app/assets/images/admin/files_thumbs/zip_thumb.png
 - app/assets/images/admin/media/checkers.jpg
 - app/assets/images/admin/media_thumb.png
-- app/assets/images/admin/media_thumb@2x.png
 - app/assets/images/admin/media_tiny.png
 - app/assets/javascripts/admin/media/application.js
 - app/assets/javascripts/admin/media/picker.js