tinymce-rails-imageupload 4.0.16.beta → 4.0.17.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d5dcfd7e60f10e0a26e45843ac5c648c95ce294
-  data.tar.gz: c187795f946b3a370fd7c721e9f80f46dd67db2f
+  metadata.gz: 70e354fe03dda083a0a20eb576a64086c5aa171a
+  data.tar.gz: c87f8e61f3835e3432bd7a79ea730e793efe5124
 SHA512:
-  metadata.gz: 9c301208b269f59e0b2836ce80958df93a266d90e8c96684405ac796e20b06de39dff928de3672d8f5ef34dc10226807cc2aeb22cc65d2b727fbd28c6c14fbbf
-  data.tar.gz: 0ca6207e817adf957a60cf0f3e0afde1577fe4cb74c95c9c47b6838f1a3824320bde9ed4245bf21cb5f4cbf9798cb80e534c07619beef4eff61975958b6215b3
+  metadata.gz: 43d24d9d17e0e8b01957cd1893bba0265156202366c58cee4217d93f29671cb0dbe6b231a1268169140fae2dac830da0df5c282db9dcca3d53d7daf76900465b
+  data.tar.gz: 37165aa4548ea84b3ad308055056848a50b130d8dd1be50f68e421b9441880db204054e260a908a468aa1d628d0b92fa5f473c1fb5a4a4e2ce3eab152485f630

data/README.md

@@ -1,6 +1,6 @@
 # IMPORTANT NOTE:
 This version is being rewritten to work with TinyMCE 4.x, and is
-currently **not usable**. For the stable version targetting TinyMCE 3, see
+currently not very tested. Use at your own risk, feedback welcome. For the stable version targetting TinyMCE 3, see
 the [tinymce3 branch](https://github.com/PerfectlyNormal/tinymce-rails-imageupload/tree/tinymce3)
 
 # tinymce-rails-imageupload
@@ -15,6 +15,9 @@ but has since mutated into something entirely different.
 Support for TinyMCE 3 is currently available in the [tinymce3 branch](https://github.com/PerfectlyNormal/tinymce-rails-imageupload/tree/tinymce3).
 The master branch is targetting TinyMCE 4.x.
 
+## Demo
+
+A small demo app demonstrating a working setup for Rails 3.2 ([demo](http://murmuring-lowlands-1342.herokuapp.com/), [source](https://github.com/PerfectlyNormal/tinymce-rails-imageupload-demo3)), and for Rails 4 ([demo](http://murmuring-lowlands-7502.herokuapp.com/), [source](https://github.com/PerfectlyNormal/tinymce-rails-imageupload-demo)) is available for study.
 
 ## Requirements
 
@@ -25,7 +28,11 @@ The master branch is targetting TinyMCE 4.x.
 
 ### Add the gem to your Gemfile
 
-    gem 'tinymce-rails-imageupload', '~> 4.0.0'
+    gem 'tinymce-rails-imageupload', '~> 4.0.0.beta'
+    
+    # or use git
+    
+    gem 'tinymce-rails-imageupload', github: 'PerfectlyNormal/tinymce-rails-imageupload'
 
 ### Set up TinyMCE as you would normally, but in the call to `.tinymce()`, add
 
@@ -82,6 +89,18 @@ option in the call to `.tinymce()`.
 `class="..."` will only be added to the img tag if a default is specified.
 Otherwise the inserted HTML is just `<img src="...">`.
 
+## Asset Pipeline
+
+Several people have had trouble with asset precompilation using the asset pipeline, both for the locales, and the plugin itself.
+
+Depending on your version of Rails, and the alignment of the moon, it might work out of the box, or you'll have to add something like this in your configuration:
+
+`config.assets.precompile += %w( tinymce/plugins/uploadimage/plugin.js tinymce/plugins/uploadimage/langs/en.js )`
+
+Obviously adjust depending on the language or languages you want to use.
+
+Since TinyMCE doesn't know about the asset pipeline however, you could just place it under `public/`, and that should probably work as well. As with all things Rails and assets related, YMMV.
+
 ## Error handling
 
 To notify the uploader that an error occurred, return JSON containing an

data/app/assets/javascripts/tinymce/plugins/uploadimage/langs/fr_FR.js

@@ -0,0 +1,11 @@
+tinyMCE.addI18n('fr_FR', {
+  'Insert an image from your computer': "Envoyer une image de votre ordinateur",
+  'Insert image': "Insérer une image",
+  'Choose an image': "Choisissez une image",
+  'You must choose a file': "Vous devez sélectionner un fichier",
+  'Got a bad response from the server': "Le serveur a envoyé une réponse erronée",
+  "Didn't get a response from the server": "Le serveur n'a pas renvoyé de réponse",
+  'Insert': "Insérer",
+  'Cancel': "Annuler",
+  'Image description': "Description de l'image",
+});

data/app/assets/javascripts/tinymce/plugins/uploadimage/langs/pl.js

@@ -0,0 +1,11 @@
+tinyMCE.addI18n('pl', {
+  'Insert an image from your computer': 'Wstaw zdjęcie z komputera',
+  'Insert image': 'Wstaw zdjęcie',
+  'Choose an image': "Wybierz zdjęcie",
+  'You must choose a file': "Musisz wybrać plik",
+  'Got a bad response from the server': "Niepoprawna odpowiedź serwera",
+  "Didn't get a response from the server": "Brak odpowiedzi z serwera",
+  'Insert': "Wstaw",
+  'Cancel': "Anuluj",
+  'Image description': "Opis grafiki",
+});

data/app/assets/javascripts/tinymce/plugins/uploadimage/langs/pt_BR.js

@@ -7,5 +7,5 @@ tinyMCE.addI18n('pt_BR', {
   "Didn't get a response from the server": "Servidor não está respondendo",
   'Insert': "Inserir",
   'Cancel': "Cancelar",
-  'Image description': "Image description",
+  'Image description': "Descrição da imagem",
 });

data/app/assets/javascripts/tinymce/plugins/uploadimage/langs/ru.js

@@ -1,11 +1,11 @@
 tinyMCE.addI18n('ru', {
   'Insert an image from your computer': 'Вставить изображение с вашего компьютера',
   'Insert image': "Вставить изображение",
-  'Choose an image': "Выберите изображение",
+  'Choose an image': "Изображение",
   'You must choose a file': "Необходимо выбрать файл",
   'Got a bad response from the server': "Получен некорректный ответ с сервера",
   "Didn't get a response from the server": "Не получен ответ с сервера",
   'Insert': "Вставить",
   'Cancel': "Отмена",
-  'Image description': "Информация об изображении",
+  'Image description': "Информация",
 });

data/app/assets/javascripts/tinymce/plugins/uploadimage/langs/zh_TW.js

@@ -0,0 +1,11 @@
+tinyMCE.addI18n("zh-TW", {
+  "Insert an image from your computer": "上傳圖片",
+  "Insert image": "插入圖片",
+  "Choose an image": "選擇圖片",
+  "You must choose a file": "須選擇一張圖片",
+  "Got a bad response from the server": "伺服器回傳錯誤",
+  "Didn't get a response from the server": "伺服器沒有回應",
+  "Insert": "插入",
+  "Cancel": "取消",
+  "Image description": "圖片敘述",
+});

data/app/assets/javascripts/tinymce/plugins/uploadimage/plugin.js

@@ -19,6 +19,9 @@
             {type: 'textbox', name: 'file', label: ed.translate('Choose an image'), subtype: 'file'},
             {type: 'textbox', name: 'alt',  label: ed.translate('Image description')},
             {type: 'container', classes: 'error', html: "<p style='color: #b94a48;'>&nbsp;</p>"},
+
+            // Trick TinyMCE to add a empty div that "preloads" the throbber image
+            {type: 'container', classes: 'throbber'},
           ],
           buttons: [
             {
@@ -73,7 +76,18 @@
           var ctrl = inputs[i];
 
           if(ctrl.tagName.toLowerCase() == 'input' && ctrl.type != "hidden") {
-            ctrl.name = ctrl.type == "file" ? "file" : "alt";
+            if(ctrl.type == "file") {
+              ctrl.name = "file";
+
+              // Hack styles
+              tinymce.DOM.setStyles(ctrl, {
+                'border': 0,
+                'boxShadow': 'none',
+                'webkitBoxShadow': 'none',
+              });
+            } else {
+              ctrl.name = "alt";
+            }
           }
         }
 
@@ -121,25 +135,18 @@
       }
 
       function handleResponse(ret) {
-        console.group("Handling response");
-        console.log("Raw", ret)
         try {
           var json = tinymce.util.JSON.parse(ret);
-          console.log("Parsed", json);
 
           if(json["error"]) {
-            console.log("It has an error!", json["error"]["message"]);
             handleError(json["error"]["message"]);
           } else {
-            console.log("Inserting", buildHTML(json));
             ed.execCommand('mceInsertContent', false, buildHTML(json));
             ed.windowManager.close();
           }
         } catch(e) {
-          console.log("Bad response :(", e);
           handleError('Got a bad response from the server');
         }
-        console.groupEnd();
       }
 
       function clearErrors() {
@@ -150,7 +157,6 @@
       }
 
       function handleError(error) {
-        console.log("Handling error", error);
         var message = win.find(".error")[0].getEl();
 
         if(message)
@@ -170,6 +176,7 @@
 
       function buildHTML(json) {
         var default_class = ed.getParam("uploadimage_default_img_class", "");
+        var figure = ed.getParam("uploadimage_figure", false);
         var alt_text = getInputValue("alt");
 
         var imgstr = "<img src='" + json["image"]["url"] + "'";
@@ -184,7 +191,25 @@
 
         imgstr += " alt='" + alt_text + "'/>";
 
-        return imgstr;
+        if(figure) {
+          var figureClass = ed.getParam("uploadimage_figure_class", "figure");
+          var figcaptionClass = ed.getParam("uploadimage_figcaption_class", "figcaption");
+
+          var figstr = "<figure";
+
+          if (figureClass !== "")
+            figstr += " class='" + figureClass + "'";
+          figstr += ">" + imgstr;
+          figstr += "<figcaption";
+          if (figcaptionClass != "")
+            figstr += " class='" + figcaptionClass + "'";
+          figstr += ">" + alt_text + "</figcaption>";
+          figstr += "</figure>";
+
+          return figstr;
+        } else {
+          return imgstr;
+        }
       }
 
       function getInputValue(name) {

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

@@ -1,7 +1,7 @@
 module Tinymce
   module Rails
     module Imageupload
-      VERSION = "4.0.16.beta"
+      VERSION = "4.0.17.beta"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinymce-rails-imageupload
 version: !ruby/object:Gem::Version
-  version: 4.0.16.beta
+  version: 4.0.17.beta
 platform: ruby
 authors:
 - Per Christian B. Viken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2016-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -19,7 +19,7 @@ dependencies:
         version: '3.2'
     - - <
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.2'
     - - <
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
   requirement: !ruby/object:Gem::Requirement
@@ -84,11 +84,14 @@ files:
 - app/assets/javascripts/tinymce/plugins/uploadimage/langs/en.js
 - app/assets/javascripts/tinymce/plugins/uploadimage/langs/es.js
 - app/assets/javascripts/tinymce/plugins/uploadimage/langs/fr.js
+- app/assets/javascripts/tinymce/plugins/uploadimage/langs/fr_FR.js
 - app/assets/javascripts/tinymce/plugins/uploadimage/langs/nb.js
+- app/assets/javascripts/tinymce/plugins/uploadimage/langs/pl.js
 - app/assets/javascripts/tinymce/plugins/uploadimage/langs/pt.js
 - app/assets/javascripts/tinymce/plugins/uploadimage/langs/pt_BR.js
 - app/assets/javascripts/tinymce/plugins/uploadimage/langs/ru.js
 - app/assets/javascripts/tinymce/plugins/uploadimage/langs/zh-cn.js
+- app/assets/javascripts/tinymce/plugins/uploadimage/langs/zh_TW.js
 - app/assets/javascripts/tinymce/plugins/uploadimage/plugin.js
 - lib/tinymce-rails-imageupload/rails.rb
 - lib/tinymce-rails-imageupload/version.rb
@@ -117,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: TinyMCE plugin for taking image uploads in Rails >= 3.2

checksums.yaml.gz.asc

@@ -1,18 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
-Comment: GPGTools - http://gpgtools.org
-
-iQIcBAABAgAGBQJTB0BaAAoJEH1ncb0Txu7XQwsP/1NseaDvnBek45KXo8LDZn1a
-VHAPgAedA6Pd+Q4pAA0KEnB0+SmwAQuTnbsb2npsEOitLq/Nu5lm4OVNfIXFi67m
-kVksc3LlIdlGH2BybYZPXVFT7KH0D65g40nlO1pgjaAWEtreQlZHoZd9neBZAhIQ
-lzEFuvP8CdeI6HzyQzq7/Oxcq0vAFjk2DwNiggoQwf9c759tmdvzeHlv4n9yohab
-KvEz7rxEr2pAgBtW+B3t45y+s84JuLadbgR+Eu3zyMyP+QNiWBd3rXxJhlZ9oEDw
-JWguDvgkBn9syLNw9Nu6Zp7Nlo0Y+y9HR2sB52bglYN8V3SKGT8ca35GHi+Fmhwc
-/i2aFOy8EG3+IgmVijuowk4tJIs97NPnIrXGFgPVnBLuy5kSeIq0THFUm6K3Ah1Z
-0hb7jtleMdJ9DQX2c9gUVw3ISttm3PT10dWDqPdVShdC5Tvx07OJmmGvoeU07Ys0
-mpRzHqkHePxC3EjWyF5AE4a0o+u7x++AFG11i8dPFu0Qh4Eluei/9KkaeJ3Mp59d
-3HRZH59L9p+d6s1tMZo1DCkyUu8qG4vWs+nl8SLLHtFt4Xy7Z7uQ37ikPkm0+MgH
-5y+FfhCdk4nty0KGA1wtMTwgTxR59+nP9R1xu/j2Z5MvqHvvxDWjzGCDNBS3JOSq
-aU9E6mjRXTSMWhHyDeDZ
-=gfFY
------END PGP SIGNATURE-----

data.tar.gz.asc

@@ -1,18 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
-Comment: GPGTools - http://gpgtools.org
-
-iQIcBAABAgAGBQJTB0BaAAoJEH1ncb0Txu7X6SsP/1q1Hqds47vm5eh6tLgZ8jAd
-heSSpaYLdXH0FrXO6a3SN37IUFUz3ELhBgrmL97rwcYLoJQD8c9D/lvJox2H6Cut
-+dzMiFYmNlnoBXKvfaBTY17jOfosltsilQSZqjq+D+EIIeWsPinWGjgjfjZb7No9
-akuZdD0YMSW75zjtriLRoOqEHJGa9ifrOG7Rbaun/sY+0c1jIP2orr5MpTMSW0V5
-1PfdVJdcTw+gz0xk0pwcjNsY6+p07KDmr/wxMuLP6vAb5smIAdaSMsUiGs3E0FU2
-YBDaC2S8WLkWaAEwlOsURocUmjtFfdkJ6pGZMts4qZ2FX5S3XWKRHG7kNzveHNzh
-1/ZHA7fRS6NOkSZ0GlQ0HTxtdCEflnncYmZM7E2KlE4FdZxZHueDTv0f37oAXKu2
-oo2D0l2xf3PGdsYdjns4go5jV4l+5Jqwii7ASiJ+wzh/EulMeKSXq0sCn71vx8ZI
-c+JkoW0ewasLIPhxKpjRi0LJcy6tP2NHm7y9QneZmng31r8sj9KTZ+LlYanMGks2
-axlkKUuOqMkAmfcW5i/9tBHv8iobu2R/Fn4iy5WPY7myraJEeVeB6n56xeaTkpmq
-MWVJzIXFFKSLHrmu7qaRArBUeWkAskakMO21rHYvkOellaG9q9EE9Po3bjLbOO1k
-QlEKSRxWy+s1Zjq2c2pq
-=Ybtc
------END PGP SIGNATURE-----

metadata.gz.asc

@@ -1,18 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
-Comment: GPGTools - http://gpgtools.org
-
-iQIcBAABAgAGBQJTB0BaAAoJEH1ncb0Txu7XNLkP/ia88CVlQT8/RYgTJJAS2IKH
-0gZ9efK4ePTBRxRjD7eG/2oCnoApsHZkMEZHHmoUOSYQ75LB+zucMgOjO3wp2TF9
-n7GrW5r03PreR94dDlZPOXKvwMbD9pr+j4NTy/BNw02AI8BiUODQosjhFD9PFveO
-9xsovwLOHA0SJGaIytntr/3UAT2s6yus29C16BKeUiGWlE7B5jMyirnV0UepOOkh
-hVrmLz3ltN2F2Bx33Yadl5Q9pf/S7Zn6zfcY2oUm7r2KSJGDwECzJePsx/3jS2nE
-JYqAA4zTmvRXAKRJnhPmGeFnJJEI2FqR/2I1GICdKrqTpRGFtiJxX9CYDenF+PLk
-FyXVu+3nFTC3cG7dQ2f/wNDlGyfhqv1l9LqRbtyrBN/rAZSOjSJojGa3wTkDRIXw
-eEN3n+vpya3AmbJguxbC2/GR+Clslq9BS2TvcR5et0DWL8MOr/TLf8UVe/Z9c48u
-m1bCQVqFhAXvK7JsYYFDW+6sKk+uBiKyvubN89cDgIjYLCVJfAo5vpIIxZjKVG1x
-m78OY7jQ3UEoASHV8uvzc3JYWA6Y095QgN7j+2q2H0V7rH7a6+6ry41QwoDChxQ+
-x5SEMLoxMmpt7urRqZxCJVRgWRuXQxLCNMWpJAZDwpM78bsz9t+qa9TXScsmyKzL
-fqKEfcX+5glqAnsR92tP
-=YtUg
------END PGP SIGNATURE-----