tinymce-rails-imageupload 3.5.6.2 → 3.5.6.3

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+## 3.5.6.3 (August 27, 2012)
+
+* Make the POST URL configurable (#3). Thanks to minaguib (Mina Naguib)
+* Make it possible to send extra parameters to the controller (#10). Thanks to minaguib (Mina Naguib)
+
 ## 3.5.6.2 (August 20, 2012)
 
 * Portugese translation. Thanks to Hefesto

data/README.markdown

@@ -1,11 +1,11 @@
 # tinymce-rails-imageupload
 
-Simple plugin for TinyMCE that allows uploading images and inserting.
-It makes no assumptions about how you store the images, but it POSTs to a URL and expects JSON back (see the Setup section).
+  Simple plugin for TinyMCE that allows uploading images and inserting.
+  It makes no assumptions about how you store the images, but it POSTs to a URL and expects JSON back (see the Setup section).
 
-This plugin borrows heavily from work done by [Peter Shoukry](http://77effects.com/).
+  This plugin borrows heavily from work done by [Peter Shoukry](http://77effects.com/).
 
-The icon used for the button comes from the icon set [Silk by famfamfam](http://www.famfamfam.com/lab/icons/silk/)
+  The icon used for the button comes from the icon set [Silk by famfamfam](http://www.famfamfam.com/lab/icons/silk/)
 
 ## Requirements
 
@@ -14,29 +14,37 @@ The icon used for the button comes from the icon set [Silk by famfamfam](http://
 
 ## Setup
 
-Add the gem to your Gemfile
+### Add the gem to your Gemfile
 
-    gem 'tinymce-rails-imageupload', '~> 3.5.6.1'
+    gem 'tinymce-rails-imageupload', '~> 3.5.6.3'
 
-Set up TinyMCE as you would normally, but in the call to `.tinymce()`, add
+### Set up TinyMCE as you would normally, but in the call to `.tinymce()`, add
 
     plugins: "uploadimage"
     # theme_advanced_buttonsX must include "uploadimage" somewhere to have the button appear
 
-and the rest should happen automatically.
+  and the rest should happen automatically.
 
-The plugin POSTs to `/tinymce_assets` by default, which is currently not configurable ([issue #3](https://github.com/PerfectlyNormal/tinymce-rails-imageupload/issues/3)).
-Set it up using something similar in `routes.rb`
+### Set up upload URL and handler
+
+  The plugin defaults to POSTing to `/tinymce_assets`.  You may modify it by supplying option `uploadimage_form_url` in the call to `.tinymce()`
+
+  Routing to your controller must be done manually.  Set it up using something similar in `routes.rb`:
 
     post '/tinymce_assets' => 'tinymce_assets#create'
 
-This action gets called with a file parameter creatively called `file`, and must respond with JSON, containing the URL to the image.
-The JSON has to be returned with a content type of "text/html" to work, which is going to be fixed as soon as possible ([issue #7](https://github.com/PerfectlyNormal/tinymce-rails-imageupload/issues/7)).
-Example:
+  The plugin will relay option `uploadimage_hint` in the call to `.tinymce()` to the POSTed URL as param `hint`.  You may use this to relay any hints you wish (for example, blog post ID #) to the controller.
+
+  This action gets called with a file parameter creatively called `file`, and must respond with JSON, containing the URL to the image.
+
+  The JSON has to be returned with a content type of "text/html" to work, which is going to be fixed as soon as possible ([issue #7](https://github.com/PerfectlyNormal/tinymce-rails-imageupload/issues/7)).
+
+  Example:
 
     class TinymceAssetsController < ApplicationController
       def create
         # Take upload from params[:file] and store it somehow...
+        # Optionally also accept params[:hint] and consume if needed
 
         render json: {
           image: {
@@ -46,11 +54,11 @@ Example:
       end
     end
 
-If the JSON response contains a `width` and/or `height` key, those will be used in the inserted HTML (`<img src="..." width="..." height="...">`), but if those are not present, the inserted HTML is just `<img src="...">`.
+  If the JSON response contains a `width` and/or `height` key, those will be used in the inserted HTML (`<img src="..." width="..." height="...">`), but if those are not present, the inserted HTML is just `<img src="...">`.
 
 ## Internationalization
 
-I18n is taken care of by `tinymce-rails`. This gem includes strings for English, Norwegian and Russian. 
+I18n is taken care of by `tinymce-rails`. This gem includes strings for english, norwegian, russian and portugese.
 To add your own language, create the files `<code>.js` and `<code>_dlg.js` in `vendor/assets/javascripts/tinymce/plugins/uploadimage/langs` in your application,
 or fork the gem and add your own translations there.
 
@@ -82,4 +90,4 @@ The plugin is released under the MIT license.
 
 TinyMCE is released under the LGPL Version 2.1.
 
-The icon used for the button comes from the icon set Silk from famfamfam, released under the [Creative Commons Attribution 3.0 License](http://creativecommons.org/licenses/by/3.0/)
+The icon used for the button comes from the icon set Silk from famfamfam, released under the [Creative Commons Attribution 3.0 License](http://creativecommons.org/licenses/by/3.0/)

data/lib/tinymce-rails-imageupload/rails.rb

@@ -3,7 +3,15 @@ module Tinymce
     module Imageupload
       class Engine < ::Rails::Engine
         initializer 'TinymceRailsImageupload.assets_pipeline' do |app|
-          app.config.assets.precompile << "tinymce/plugins/uploadimage/editor_plugin.js"     
+          app.config.assets.precompile << "tinymce/plugins/uploadimage/editor_plugin.js"
+          app.config.assets.precompile << "tinymce/plugins/uploadimage/langs/en.js"
+          app.config.assets.precompile << "tinymce/plugins/uploadimage/langs/en_dlg.js"
+          app.config.assets.precompile << "tinymce/plugins/uploadimage/langs/nb.js"
+          app.config.assets.precompile << "tinymce/plugins/uploadimage/langs/nb_dlg.js"
+          app.config.assets.precompile << "tinymce/plugins/uploadimage/langs/pt.js"
+          app.config.assets.precompile << "tinymce/plugins/uploadimage/langs/pt_dlg.js"
+          app.config.assets.precompile << "tinymce/plugins/uploadimage/langs/ru.js"
+          app.config.assets.precompile << "tinymce/plugins/uploadimage/langs/ru_dlg.js"
         end
       end
     end

data/lib/tinymce-rails-imageupload/version.rb

@@ -1,7 +1,7 @@
 module Tinymce
   module Rails
     module Imageupload
-      VERSION = "3.5.6.2"
+      VERSION = "3.5.6.3"
     end
   end
 end

data/vendor/assets/javascripts/tinymce/plugins/uploadimage/dialog.html

@@ -39,13 +39,16 @@
       }
 
       var UploadImageDialog = {
+
         init: function() {
-          var f = document.forms[0];
+          this.f = document.forms[0];
+          this.f.action = tinyMCEPopup.getParam("uploadimage_form_url", "/tinymce_assets");
+          document.getElementById("hint").value = tinyMCEPopup.getParam("uploadimage_hint", "");
+          document.getElementById("authenticity_token").value = (window.opener || window.parent).$("meta[name='csrf-token']")[0].content;
         },
 
         insert: function() {
-          document.getElementById("authenticity_token").value = (window.opener || window.parent).$("meta[name='csrf-token']")[0].content;
-          document.forms[0].submit();
+          this.f.submit();
         }
       };
 
@@ -53,9 +56,11 @@
     </script>
   </head>
   <body>
-    <form method="post" enctype='multipart/form-data' accept-charset="UTF-8" target="hidden_upload" action='/tinymce_assets' name="uploadimageForm">
+
+    <form method="post" enctype='multipart/form-data' accept-charset="UTF-8" target="hidden_upload" action='#replaceme' name="uploadimageForm">
       <input type="hidden" name="utf8" value="✓">
-      <input type="hidden" name="authenticity_token" id="authenticity_token" value="">
+      <input type="hidden" name="authenticity_token" id="authenticity_token" value="#replaceme">
+      <input type="hidden" name="hint" id="hint" value="#replaceme">
       <iframe id="hidden_upload" name="hidden_upload" src='' onload='uploadDone("hidden_upload")' style='width:0;height:0;border:0px solid #fff'></iframe>
 
       <h1>{#uploadimage_dlg.header}</h1>

metadata

@@ -1,87 +1,87 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: tinymce-rails-imageupload
-version: !ruby/object:Gem::Version
-  version: 3.5.6.2
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 3
+  - 5
+  - 6
+  - 3
+  version: 3.5.6.3
 platform: ruby
-authors:
+authors: 
 - Per Christian B. Viken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-08-27 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: railties
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: tinymce-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.4.9
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 1
+        version: "3.1"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: tinymce-rails
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 4
+        - 9
         version: 3.4.9
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rails
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 1
+        version: "3.1"
+  type: :development
+  version_requirements: *id004
 description: TinyMCE plugin for taking image uploads in Rails >= 3.1
-email:
+email: 
 - perchr@northblue.org
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - CHANGELOG.markdown
 - Gemfile
@@ -104,28 +104,35 @@ files:
 - vendor/assets/javascripts/tinymce/plugins/uploadimage/langs/pt_dlg.js
 - vendor/assets/javascripts/tinymce/plugins/uploadimage/langs/ru.js
 - vendor/assets/javascripts/tinymce/plugins/uploadimage/langs/ru_dlg.js
+has_rdoc: true
 homepage: http://eastblue.org/oss
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: TinyMCE plugin for taking image uploads in Rails >= 3.1
 test_files: []
+