tb_media 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16f0a55ec656f1ee487ff39fcb9a93230854cf8e
-  data.tar.gz: 16f7960348f0918610608ab85079eccbe95dacd2
+  metadata.gz: 3c3448825f405e61320e2742b24f276e871e78cf
+  data.tar.gz: 7496f2fb04fd200df6801b29513b5d826975a54a
 SHA512:
-  metadata.gz: 4e59f606e31de84bad6bafbc05a216184da92d610734b14b6342dda668b1ae99908e259cfddf86e72e5e13edd840e6fea5d9dd31c0ec3135b59bdfd21265f68d
-  data.tar.gz: 6800dd0b04f58df98b2a203356503f5720bbe05afb55042a08b4c249d3f135bb5aa75993628016f92c62485b4e3e1a26b53ec74c59d8922b3a01c8690b6d43ef
+  metadata.gz: 2bce79a6d9912df6364d076ea641aad1eb356d181297839e65c0b5b5f663a7b7bfc760112b3da4791c7a7b55323d57b20bf0f442e9de62e9e88254fc64df3b73
+  data.tar.gz: 500f08f685d773c53eaa776a4991588d19e1432a2e6f2e6f79b70183b976adeead0df0313d264feacf52e359193b5344598a29bcef571fd952493fd8dfe4ae04

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

@@ -163,4 +163,5 @@ spud.admin.media = new function(){
       return false;
     }
   };
+
 };

data/app/assets/javascripts/admin/media/plugin.js.erb

@@ -10,92 +10,93 @@
 
 (function() {
 
-  // Tell spud about our plugin and button
-  spud.admin.editor.registerPlugin('spud_media_picker');
-  spud.admin.editor.registerButton('spud_media_picker');
+  $("html").on("tb:tinymce-loaded", function(){
+       // Tell spud about our plugin and button
+      spud.admin.editor.registerPlugin('spud_media_picker');
+      spud.admin.editor.registerButton('spud_media_picker');
+      tinymce.create('tinymce.plugins.SpudMediaPicker', {
+      /**
+       * Initializes the plugin, this will be executed after the plugin has been created.
+       * This call is done before the editor instance has finished it's initialization so use the onInit event
+       * of the editor instance to intercept that event.
+       *
+       * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+       * @param {string} url Absolute URL to where the plugin is located.
+       */
+      init : function(ed, url) {
+        // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
+        ed.addCommand('spudMediaShowPicker', function(){
+          ed.windowManager.open({
+            title: 'Media Picker',
+            file: '/admin/media_picker',
+            width: 450 + parseInt(ed.getLang('example.delta_width', 0), 10),
+            height: 300 + parseInt(ed.getLang('example.delta_height', 0), 10),
+            inline: 1,
+            resizable: false,
+            popup_css: false, // prevent tinymce from injecting some default css into our dialog box
+            close_previous: true, // close any previously opened dialogs
+            scrollbars: false
+          });
+        });
 
-  tinymce.create('tinymce.plugins.SpudMediaPicker', {
-    /**
-     * Initializes the plugin, this will be executed after the plugin has been created.
-     * This call is done before the editor instance has finished it's initialization so use the onInit event
-     * of the editor instance to intercept that event.
-     *
-     * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
-     * @param {string} url Absolute URL to where the plugin is located.
-     */
-    init : function(ed, url) {
-      // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
-      ed.addCommand('spudMediaShowPicker', function(){
-        ed.windowManager.open({
-          title: 'Media Picker',
-          file: '/admin/media_picker',
-          width: 450 + parseInt(ed.getLang('example.delta_width', 0), 10),
-          height: 300 + parseInt(ed.getLang('example.delta_height', 0), 10),
-          inline: 1,
-          resizable: false,
-          popup_css: false, // prevent tinymce from injecting some default css into our dialog box
-          close_previous: true, // close any previously opened dialogs
-          scrollbars: false
+        // Register picker button
+        ed.addButton('spud_media_picker', {
+          title: 'Insert Media',
+          cmd: 'spudMediaShowPicker',
+          image: '<%= asset_path('admin/media_tiny.png') %>',
+          stateSelector: 'img:not([data-mce-object],[data-mce-placeholder])'
         });
-      });
 
-      // Register picker button
-      ed.addButton('spud_media_picker', {
-        title: 'Insert Media',
-        cmd: 'spudMediaShowPicker',
-        image: '<%= asset_path('admin/media_tiny.png') %>',
-        stateSelector: 'img:not([data-mce-object],[data-mce-placeholder])'
-      });
+        ed.addCommand('spudMediaInsertSelected', function(ui, data){
+          if(data.type == 'img'){
+            var img = ed.dom.createHTML('img', {
+              src: data.url,
+              title: data.title,
+              alt: data.alt,
+              style: data.style,
+              width: data.width,
+              height: data.height
+            });
+            ed.execCommand('mceInsertContent', false, img);
+          }
+          else{
+            var link = ed.dom.createHTML('a', {
+              href: data.url,
+              target: data.target
+            }, data.text);
+            ed.execCommand('mceInsertContent', false, link);
+          }
+        });
 
-      ed.addCommand('spudMediaInsertSelected', function(ui, data){
-        if(data.type == 'img'){
-          var img = ed.dom.createHTML('img', {
-            src: data.url,
-            title: data.title,
-            alt: data.alt,
-            style: data.style,
-            width: data.width,
-            height: data.height
-          });
-          ed.execCommand('mceInsertContent', false, img);
-        }
-        else{
-          var link = ed.dom.createHTML('a', {
-            href: data.url,
-            target: data.target
-          }, data.text);
-          ed.execCommand('mceInsertContent', false, link);
-        }
-      });
+        /*
+        * Add a node change handler, selects the button in the UI when a image is selected
+        * @param {tinymce.Editor} ed Editor
+        * @param {tinymce.ControlManager} cm
+        * @param {node} n
+        */
+        // ed.onNodeChange.add(function(ed, cm, n) {
+        //   cm.setActive('spud_media_picker', n.nodeName == 'IMG');
+        // });
+      },
 
-      /*
-      * Add a node change handler, selects the button in the UI when a image is selected
-      * @param {tinymce.Editor} ed Editor
-      * @param {tinymce.ControlManager} cm
-      * @param {node} n
-      */
-      // ed.onNodeChange.add(function(ed, cm, n) {
-      //   cm.setActive('spud_media_picker', n.nodeName == 'IMG');
-      // });
-    },
+      /**
+       * Returns information about the plugin as a name/value array.
+       * The current keys are longname, author, authorurl, infourl and version.
+       *
+       * @return {Object} Name/value array containing information about the plugin.
+       */
+      getInfo: function(){
+        return {
+          longname : 'TB Media',
+          author : 'Westlake Design',
+          authorurl : 'http://www.westlakedesign.com',
+          infourl : 'https://bitbucket.org/westlakedesign/tb_media',
+          version : "1.0"
+        };
+      }
+    });
 
-    /**
-     * Returns information about the plugin as a name/value array.
-     * The current keys are longname, author, authorurl, infourl and version.
-     *
-     * @return {Object} Name/value array containing information about the plugin.
-     */
-    getInfo: function(){
-      return {
-        longname : 'TB Media',
-        author : 'Westlake Design',
-        authorurl : 'http://www.westlakedesign.com',
-        infourl : 'https://bitbucket.org/westlakedesign/tb_media',
-        version : "1.0"
-      };
-    }
+    // Register plugin
+    tinymce.PluginManager.add('spud_media_picker', tinymce.plugins.SpudMediaPicker);
   });
-
-  // Register plugin
-  tinymce.PluginManager.add('spud_media_picker', tinymce.plugins.SpudMediaPicker);
 })();

data/app/controllers/admin/media_controller.rb

@@ -1,7 +1,7 @@
 class Admin::MediaController < Admin::ApplicationController
 	layout 'admin/detail'
 	add_breadcrumb "Media", :admin_media_path
-	belongs_to_spud_app :media
+	belongs_to_app :media
 	before_filter :load_media,:only => [:edit,:update,:show,:destroy,:set_private,:set_access]
 	
 	def index

data/lib/spud_media/engine.rb

@@ -3,8 +3,9 @@ require 'paperclip'
 
 module Spud
 	module Media
-		 class Engine < Rails::Engine
+		class Engine < Rails::Engine
 			engine_name :tb_media
+			
 			initializer :admin do
 				config.assets.precompile += ['admin/media/picker.js']
 				Spud::Core.append_admin_javascripts('admin/media/application')
@@ -13,6 +14,11 @@ module Spud
 				  config.admin_applications += [{:name => "Media", :thumbnail => "admin/media_thumb.png", :url => "/admin/media", :order => 3, :retina => true}]
 				end
 			end
-		 end
+
+			initializer 'tb_media.assets' do
+				Rails.application.config.assets.precompile += ['admin/media_thumb.png']
+			end
+
+		end
 	end
 end

data/lib/spud_media/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Media
-		VERSION = "1.2.1"
+		VERSION = "1.2.2"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_media
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Westlake Design
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tb_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.7
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement