tinymce-rails-imageupload 3.4.8 → 3.4.8.1

data/CHANGELOG.markdown

@@ -0,0 +1,7 @@
+## 3.4.8.1 (March 7, 2012)
+
+* Added support for setting height and width for the inserted image
+
+## 3.4.8 (February 29, 2012)
+
+* Initial release

data/README.markdown

@@ -10,7 +10,7 @@ The icon used for the button comes from the icon set [Silk by famfamfam](http://
 ## Requirements
 
   * Rails >= 3.1
-  * TinyMCE using the advanced theme
+  * TinyMCE using the advanced theme and jQuery
 
 ## Setup
 
@@ -44,6 +44,8 @@ This action gets called with a file parameter creatively called `file`, and must
       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="...">`.
+
 ## Versioning
 
 The version of this gem will be mirroring the release of `tinymce-rails` it is tested against.

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

@@ -1,7 +1,7 @@
 module Tinymce
   module Rails
     module Imageupload
-      VERSION = "3.4.8"
+      VERSION = "3.4.8.1"
     end
   end
 end

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

@@ -23,7 +23,16 @@
 
           if(ret.length) {
             var json = JSON.parse(ret);
-            tinyMCE.execCommand('mceInsertContent', false, '<br><img src=\'' + json["image"]["url"] + '\' />');
+            var imgstr = "<br><img src='" + json["image"]["url"] + "'";
+
+            if(json["image"]["height"])
+              imgstr += " height='" + json["image"]["height"] + "'";
+            if(json["image"]["width"])
+              imgstr += " width='"  + json["image"]["width"]  + "'";
+
+            imgstr += "/>";
+
+            tinyMCE.execCommand('mceInsertContent', false, imgstr);
             tinyMCEPopup.close();
           }
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tinymce-rails-imageupload
 version: !ruby/object:Gem::Version
-  version: 3.4.8
+  version: 3.4.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000 Z
+date: 2012-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &8464640 !ruby/object:Gem::Requirement
+  requirement: &10124560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *8464640
+  version_requirements: *10124560
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
-  requirement: &8463960 !ruby/object:Gem::Requirement
+  requirement: &10124060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.4.8
   type: :runtime
   prerelease: false
-  version_requirements: *8463960
+  version_requirements: *10124060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &8463280 !ruby/object:Gem::Requirement
+  requirement: &10123600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *8463280
+  version_requirements: *10123600
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &8462580 !ruby/object:Gem::Requirement
+  requirement: &10123140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *8462580
+  version_requirements: *10123140
 description: TinyMCE plugin for taking image uploads in Rails >= 3.1
 email:
 - perchr@northblue.org
@@ -63,6 +63,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.markdown
 - Gemfile
 - LICENSE
 - README.markdown