muck-contents 0.2.20 → 0.2.21

data/VERSION

@@ -1 +1 @@
-0.2.20
+0.2.21

data/app/controllers/muck/contents_controller.rb

@@ -79,9 +79,9 @@ class Muck::ContentsController < ApplicationController
       format.html do
         after_create_redirect
       end
-      # HACK there should be a way to force polymorphic_url to use an id instead of to_param
-      update_path = polymorphic_url([@parent, @content]).gsub(@content.to_param, "#{@content.id}") # force the id.  The slugs can cause problems during edit
-      format.json { render :json => { :success => true, :content => @content, :parent_id => @parent ? @parent.id : nil, :update_path => update_path, :preview_path => @content.uri, :type => 'create' } } 
+      format.json do
+        after_create_json
+      end
     end
   rescue ActiveRecord::RecordInvalid => ex
     if @content
@@ -155,6 +155,12 @@ class Muck::ContentsController < ApplicationController
       redirect_to @content.uri
     end
     
+    def after_create_json
+      # HACK there should be a way to force polymorphic_url to use an id instead of to_param
+      update_path = polymorphic_url([@parent, @content]).gsub(@content.to_param, "#{@content.id}") # force the id.  The slugs can cause problems during edit
+      render :json => { :success => true, :content => @content, :parent_id => @parent ? @parent.id : nil, :update_path => update_path, :preview_path => @content.uri, :type => 'create' }
+    end
+    
     def after_update_redirect
       redirect_to @content.uri
     end

data/app/views/layouts/tiny_mce.html.erb

@@ -9,8 +9,7 @@
       tiny_mce/tiny_mce_popup.js
       tiny_mce/utils/mctabs.js
       tiny_mce/utils/form_utils.js
-      tiny_mce/utils/validate.js
-      application.js }, :cache => 'tinymce_js_cached' %>
+      tiny_mce/utils/validate.js }, :cache => 'tinymce_js_cached' %>
     <%= javascript_tag %[const AUTH_TOKEN = #{form_authenticity_token.inspect};] if protect_against_forgery? %>
     <%= stylesheet_link_tag %W{ tinymce jquery/jquery.autocomplete } %>
     <%= yield :head -%>

data/config/initializers/mce_options.rb

@@ -23,7 +23,7 @@ GlobalConfig.advanced_mce_options = {
                                 bold italic underline strikethrough separator 
                                 justifyleft justifycenter justifyright indent outdent separator 
                                 bullist numlist separator 
-                                link unlink image file media anchor separator  
+                                mucklink muckimage muckfile media anchor separator  
                                 template visualaid separator
                                 fullscreen code},
   :theme_advanced_buttons2 => %w{styleprops styleselect separator
@@ -33,7 +33,7 @@ GlobalConfig.advanced_mce_options = {
                                  sub sup charmap },
   :theme_advanced_buttons3 => %w{}, #bramus_cssextras_classes bramus_cssextras_ids
   #:theme_advanced_buttons3 => %w{cleanup code insertdate inserttime removeformat insertlayer},
-  :plugins => %w{ paste media preview inlinepopups safari save searchreplace table style template fullscreen print autosave muckimage mucklink},
+  :plugins => %w{ paste media preview inlinepopups safari save searchreplace table style template fullscreen print autosave muckimage mucklink muckfile},
   # codehighlighting
   # spellchecker,pagebreak,layer,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,
   # contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template

data/muck-contents.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-contents}
-  s.version = "0.2.20"
+  s.version = "0.2.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2010-04-08}
+  s.date = %q{2010-05-05}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -99,6 +99,9 @@ Gem::Specification.new do |s|
      "locales/zh-TW.yml",
      "locales/zh.yml",
      "muck-contents.gemspec",
+     "public/images/tinymce/doc.jpg",
+     "public/images/tinymce/image.jpg",
+     "public/images/tinymce/link.jpg",
      "public/images/tinymce/sample.gif",
      "public/images/tinymce/upload.gif",
      "public/javascripts/tiny_mce/langs/ar.js",

data/public/javascripts/tiny_mce/plugins/muckfile/editor_plugin.js

@@ -4,10 +4,10 @@
  * @copyright Copyright © 2009, Tatemae.
  */
 (function() {
-	tinymce.create('tinymce.plugins.AdvancedFileTooPlugin', {
+	tinymce.create('tinymce.plugins.MuckFilePlugin', {
 		init : function(ed, url) {
 			// Register commands
-			ed.addCommand('mceAdvFileToo', function() {
+			ed.addCommand('mceMuckFile', function() {
 				var e = ed.selection.getNode();
 				// Internal file object like a flash placeholder
 				if (ed.dom.getAttrib(e, 'class').indexOf('mceItem') != -1)
@@ -22,10 +22,10 @@
 				});
 			});
 			// Register button
-			ed.addButton('file', {
+			ed.addButton('muckfile', {
 				title : 'Upload Files',
-				cmd : 'mceAdvFileToo',
-				image : '/images/tinymce/upload.gif'
+				cmd : 'mceMuckFile',
+				image : '/images/tinymce/doc.jpg'
 			});
 		},
 		getInfo : function() {
@@ -38,5 +38,5 @@
 		}
 	});
 	// Register plugin
-	tinymce.PluginManager.add('muckfile', tinymce.plugins.AdvancedFileTooPlugin);
+	tinymce.PluginManager.add('muckfile', tinymce.plugins.MuckFilePlugin);
 })();

data/public/javascripts/tiny_mce/plugins/muckfile/editor_plugin_src.js

@@ -4,10 +4,10 @@
  * @copyright Copyright © 2009, Tatemae.
  */
 (function() {
-	tinymce.create('tinymce.plugins.AdvancedFileTooPlugin', {
+	tinymce.create('tinymce.plugins.MuckFilePlugin', {
 		init : function(ed, url) {
 			// Register commands
-			ed.addCommand('mceAdvFileToo', function() {
+			ed.addCommand('mceMuckFile', function() {
 				var e = ed.selection.getNode();
 				// Internal file object like a flash placeholder
 				if (ed.dom.getAttrib(e, 'class').indexOf('mceItem') != -1)
@@ -22,10 +22,10 @@
 				});
 			});
 			// Register button
-			ed.addButton('file', {
+			ed.addButton('muckfile', {
 				title : 'Upload Files',
-				cmd : 'mceAdvFileToo',
-				image : '/images/tinymce/upload.gif'
+				cmd : 'mceMuckFile',
+				image : '/images/tinymce/doc.jpg'
 			});
 		},
 		getInfo : function() {
@@ -38,5 +38,5 @@
 		}
 	});
 	// Register plugin
-	tinymce.PluginManager.add('muckfile', tinymce.plugins.AdvancedFileTooPlugin);
+	tinymce.PluginManager.add('muckfile', tinymce.plugins.MuckFilePlugin);
 })();

data/public/javascripts/tiny_mce/plugins/muckimage/editor_plugin.js

@@ -4,10 +4,10 @@
  * @copyright Copyright © 2009, Tatemae.
  */
 (function() {
-	tinymce.create('tinymce.plugins.AdvancedImageTooPlugin', {
+	tinymce.create('tinymce.plugins.MuckImagePlugin', {
 		init : function(ed, url) {
 			// Register commands
-			ed.addCommand('mceAdvImageToo', function() {
+			ed.addCommand('mceMuckImage', function() {
 				var e = ed.selection.getNode();
 				// Internal image object like a flash placeholder
 				if (ed.dom.getAttrib(e, 'class').indexOf('mceItem') != -1)
@@ -22,9 +22,10 @@
 				});
 			});
 			// Register buttons
-			ed.addButton('image', {
+			ed.addButton('muckimage', {
 				title : 'Upload Images',
-				cmd : 'mceAdvImageToo'
+				cmd : 'mceMuckImage',
+				image : '/images/tinymce/image.jpg'
 			});
 		},
 		getInfo : function() {
@@ -37,5 +38,5 @@
 		}
 	});
 	// Register plugin
-	tinymce.PluginManager.add('muckimage', tinymce.plugins.AdvancedImageTooPlugin);
+	tinymce.PluginManager.add('muckimage', tinymce.plugins.MuckImagePlugin);
 })();

data/public/javascripts/tiny_mce/plugins/muckimage/editor_plugin_src.js

@@ -4,10 +4,10 @@
  * @copyright Copyright © 2009, Tatemae.
  */
 (function() {
-	tinymce.create('tinymce.plugins.AdvancedImageTooPlugin', {
+	tinymce.create('tinymce.plugins.MuckImagePlugin', {
 		init : function(ed, url) {
 			// Register commands
-			ed.addCommand('mceAdvImageToo', function() {
+			ed.addCommand('mceMuckImage', function() {
 				var e = ed.selection.getNode();
 				// Internal image object like a flash placeholder
 				if (ed.dom.getAttrib(e, 'class').indexOf('mceItem') != -1)
@@ -22,9 +22,10 @@
 				});
 			});
 			// Register buttons
-			ed.addButton('image', {
+			ed.addButton('muckimage', {
 				title : 'Upload Images',
-				cmd : 'mceAdvImageToo'
+				cmd : 'mceMuckImage',
+				image : '/images/tinymce/image.jpg'
 			});
 		},
 		getInfo : function() {
@@ -37,5 +38,5 @@
 		}
 	});
 	// Register plugin
-	tinymce.PluginManager.add('muckimage', tinymce.plugins.AdvancedImageTooPlugin);
+	tinymce.PluginManager.add('muckimage', tinymce.plugins.MuckImagePlugin);
 })();

data/public/javascripts/tiny_mce/plugins/mucklink/editor_plugin.js

@@ -4,11 +4,11 @@
  * @copyright Copyright © 2009, Tatemae, All rights reserved.
  */
 (function() {
-	tinymce.create('tinymce.plugins.AdvancedLinkTooPlugin', {
+	tinymce.create('tinymce.plugins.MuckLink', {
 		init : function(ed, url) {
 			this.editor = ed;
 			// Register commands
-			ed.addCommand('mceAdvLinkToo', function() {
+			ed.addCommand('mceMuckLink', function() {
 				var se = ed.selection;
 				// No selection and not in link
 				if (se.isCollapsed() && !ed.dom.getParent(se.getNode(), 'A'))
@@ -23,11 +23,12 @@
 				});
 			});
 			// Register buttons
-			ed.addButton('link', {
-				title : 'mucklink.link_desc',
-				cmd : 'mceAdvLinkToo'
+			ed.addButton('mucklink', {
+				title : 'Create Link',
+				cmd : 'mceMuckLink',
+				image : '/images/tinymce/link.jpg'
 			});
-			ed.addShortcut('ctrl+k', 'mucklink.advlink_desc', 'mceAdvLinkToo');
+			ed.addShortcut('ctrl+k', 'Create Link', 'mceMuckLink');
 			ed.onNodeChange.add(function(ed, cm, n, co) {
 				cm.setDisabled('link', co && n.nodeName != 'A');
 				cm.setActive('link', n.nodeName == 'A' && !n.name);
@@ -43,5 +44,5 @@
 		}
 	});
 	// Register plugin
-	tinymce.PluginManager.add('mucklink', tinymce.plugins.AdvancedLinkTooPlugin);
+	tinymce.PluginManager.add('mucklink', tinymce.plugins.MuckLink);
 })();

data/public/javascripts/tiny_mce/plugins/mucklink/editor_plugin_src.js

@@ -4,11 +4,11 @@
  * @copyright Copyright � 2009, Tatemae, All rights reserved.
  */
 (function() {
-	tinymce.create('tinymce.plugins.AdvancedLinkTooPlugin', {
+	tinymce.create('tinymce.plugins.MuckLink', {
 		init : function(ed, url) {
 			this.editor = ed;
 			// Register commands
-			ed.addCommand('mceAdvLinkToo', function() {
+			ed.addCommand('mceMuckLink', function() {
 				var se = ed.selection;
 				// No selection and not in link
 				if (se.isCollapsed() && !ed.dom.getParent(se.getNode(), 'A'))
@@ -23,11 +23,12 @@
 				});
 			});
 			// Register buttons
-			ed.addButton('link', {
-				title : 'mucklink.link_desc',
-				cmd : 'mceAdvLinkToo'
+			ed.addButton('mucklink', {
+				title : 'Create Link',
+				cmd : 'mceMuckLink',
+				image : '/images/tinymce/link.jpg'
 			});
-			ed.addShortcut('ctrl+k', 'mucklink.advlink_desc', 'mceAdvLinkToo');
+			ed.addShortcut('ctrl+k', 'Create Link', 'mceMuckLink');
 			ed.onNodeChange.add(function(ed, cm, n, co) {
 				cm.setDisabled('link', co && n.nodeName != 'A');
 				cm.setActive('link', n.nodeName == 'A' && !n.name);
@@ -43,5 +44,5 @@
 		}
 	});
 	// Register plugin
-	tinymce.PluginManager.add('mucklink', tinymce.plugins.AdvancedLinkTooPlugin);
+	tinymce.PluginManager.add('mucklink', tinymce.plugins.MuckLink);
 })();

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 20
-  version: 0.2.20
+  - 21
+  version: 0.2.21
 platform: ruby
 authors: 
 - Justin Ball
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 -06:00
+date: 2010-05-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -231,6 +231,9 @@ files:
 - locales/zh-TW.yml
 - locales/zh.yml
 - muck-contents.gemspec
+- public/images/tinymce/doc.jpg
+- public/images/tinymce/image.jpg
+- public/images/tinymce/link.jpg
 - public/images/tinymce/sample.gif
 - public/images/tinymce/upload.gif
 - public/javascripts/tiny_mce/langs/ar.js