glebtv-ckeditor 4.4.3.0 → 4.4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 445a2b6e3f8ed06bf67e2fd3a2d13bed8012428d
-  data.tar.gz: 822b86009005d41ce004e127f167b799c559c86e
+  metadata.gz: 0c8059af0d8248454c8d2e84caeb926c47b129e9
+  data.tar.gz: e07c5c3b471a43e2d4afb77b43c726a916f5ffe6
 SHA512:
-  metadata.gz: f7b471389dfb0558b3295b49b87660ca8989b0ed6271b3019e0af1719802e3ed6562616a13b07d8bf4967de1b39473bc410987b91ee7258e878283bb637b42c6
-  data.tar.gz: 4c7db2fe65737c08f028e1c4a1c042894c04c1fa7bfb6cef6cf3ff9f88b3a92374bf23c4727f6bb50c931f0cf6c081b3a42822c807dd773e1e497e1b41e93710
+  metadata.gz: b0e434d198360a3e60f3099b5730a72211f4a033a30ac0adfd8008e2af10f653b261c7c6cfd6df9fc6a5010d87a983e0c479d6a7bba4b5f7ff5fffc3d6a9ec67
+  data.tar.gz: 0cdea1bd9d96d5d0118265a8a85a168514a788f5deacc1452a3a67ba6876d7713b8936e1e15ece1f11f550f2647a3d3aeb56e905dfbb75ef377f62ee5543a60f

data/app/assets/javascripts/ckeditor/override.js.erb

@@ -2,7 +2,7 @@ window['CKEDITOR_BASEPATH'] = "/assets/ckeditor/";
 
 window.CKEDITOR_ASSETS_MAPPING = {
 <% Rails.application.assets.each_logical_path( ->(path) {
-  path =~ /ckeditor/ && path != 'ckeditor/override.js' && path != 'ckeditor/init.js' && path != 'ckeditor/ckeditor.js' && path.index('ckeditor/filebrowser').nil? && path.index('.md').nil? && path.index('.html').nil?
+  path =~ /ckeditor/ && path != 'ckeditor/override.js' && path != 'ckeditor/init.js' && path != 'ckeditor/ckeditor.js' && path.index('ckeditor/filebrowser').nil? && path.index('.md').nil? && (path.index('.html').nil? || !path.index('.htmlm').nil?)
 }) do |asset| %>
   "<%= asset %>": "<%= asset_path(asset) %>",
 <% end %>

data/lib/ckeditor/version.rb

@@ -1,4 +1,4 @@
 module Ckeditor
-  VERSION="4.4.3.0".freeze
+  VERSION="4.4.3.1".freeze
 end
 

data/vendor/assets/javascripts/ckeditor/plugins/codemirror/plugin.js

@@ -195,13 +195,13 @@
 
                             if (typeof (CodeMirror) == 'undefined') {
 
-                                CKEDITOR.document.appendStyleSheet(rootPath + 'css/codemirror.min.css');
+                                CKEDITOR.document.appendStyleSheet(CKEDITOR.getUrl('plugins/codemirror/css/codemirror.min.css'));
 
                                 if (config.theme.length && config.theme != 'default') {
-                                    CKEDITOR.document.appendStyleSheet(rootPath + 'theme/' + config.theme + '.css');
+                                    CKEDITOR.document.appendStyleSheet(CKEDITOR.getUrl('plugins/codemirror/theme/' + config.theme + '.css'));
                                 }
 
-                                CKEDITOR.scriptLoader.load(rootPath + 'js/codemirror.min.js', function () {
+                                CKEDITOR.scriptLoader.load(CKEDITOR.getUrl('plugins/codemirror/js/codemirror.min.js'), function () {
 
                                     CKEDITOR.scriptLoader.load(getCodeMirrorScripts(), function () {
                                         loadCodeMirrorInline(editor, textArea);
@@ -525,13 +525,13 @@
             editor.addMode('source', function(callback) {
                 if (typeof (CodeMirror) == 'undefined') {
                     
-                    CKEDITOR.document.appendStyleSheet(rootPath + 'css/codemirror.min.css');
+                    CKEDITOR.document.appendStyleSheet(CKEDITOR.getUrl('plugins/codemirror/css/codemirror.min.css'));
                     
                     if (config.theme.length && config.theme != 'default') {
-                        CKEDITOR.document.appendStyleSheet(rootPath + 'theme/' + config.theme + '.css');
+                        CKEDITOR.document.appendStyleSheet(CKEDITOR.getUrl('plugins/codemirror/theme/' + config.theme + '.css'));
                     }
 
-                    CKEDITOR.scriptLoader.load(rootPath + 'js/codemirror.min.js', function() {
+                    CKEDITOR.scriptLoader.load(CKEDITOR.getUrl('plugins/codemirror/js/codemirror.min.js'), function() {
 
                         CKEDITOR.scriptLoader.load(getCodeMirrorScripts(), function() {
                             loadCodeMirror(editor);
@@ -547,55 +547,55 @@
             });
 
             function getCodeMirrorScripts() {
-                var scriptFiles = [rootPath + 'js/codemirror.addons.min.js'];
+                var scriptFiles = [CKEDITOR.getUrl('plugins/codemirror/js/codemirror.addons.min.js')];
 
                 switch (config.mode) {
                 case "bbcode":
                     {
-                        scriptFiles.push(rootPath + 'js/codemirror.mode.bbcode.min.js');
+                        scriptFiles.push(CKEDITOR.getUrl('plugins/codemirror/js/codemirror.mode.bbcode.min.js'));
                     }
 
                     break;
                 case "bbcodemixed":
                         {
-                            scriptFiles.push(rootPath + 'js/codemirror.mode.bbcodemixed.min.js');
+                            scriptFiles.push(CKEDITOR.getUrl('plugins/codemirror/js/codemirror.mode.bbcodemixed.min.js'));
                         }
 
                         break;
                 case "htmlmixed":
                     {
-                        scriptFiles.push(rootPath + 'js/codemirror.mode.htmlmixed.min.js');
+                        scriptFiles.push(CKEDITOR.getUrl('plugins/codemirror/js/codemirror.mode.htmlmixed.min.js'));
                     }
 
                     break;
                 case "text/html":
                     {
-                        scriptFiles.push(rootPath + 'js/codemirror.mode.htmlmixed.min.js');
+                        scriptFiles.push(CKEDITOR.getUrl('plugins/codemirror/js/codemirror.mode.htmlmixed.min.js'));
                     }
 
                     break;
                 case "application/x-httpd-php":
                     {
-                        scriptFiles.push(rootPath + 'js/codemirror.mode.php.min.js');
+                        scriptFiles.push(CKEDITOR.getUrl('plugins/codemirror/js/codemirror.mode.php.min.js'));
                     }
 
                     break;
                 case "text/javascript":
                     {
-                        scriptFiles.push(rootPath + 'js/codemirror.mode.javascript.min.js');
+                        scriptFiles.push(CKEDITOR.getUrl('plugins/codemirror/js/codemirror.mode.javascript.min.js'));
                     }
 
                     break;
                 default:
-                    scriptFiles.push(rootPath + 'js/codemirror.mode.htmlmixed.min.js');
+                    scriptFiles.push(CKEDITOR.getUrl('plugins/codemirror/js/codemirror.mode.htmlmixed.min.js'));
                 }
 
                 if (config.useBeautify) {
-                    scriptFiles.push(rootPath + 'js/beautify.min.js');
+                    scriptFiles.push(CKEDITOR.getUrl('plugins/codemirror/js/beautify.min.js'));
                 }
 
                 if (config.enableSearchTools) {
-                    scriptFiles.push(rootPath + 'js/codemirror.addons.search.min.js');
+                    scriptFiles.push(CKEDITOR.getUrl('plugins/codemirror/js/codemirror.addons.search.min.js'));
                 }
                 return scriptFiles;
             }

data/vendor/assets/javascripts/ckeditor/plugins/wordcount/plugin.js

@@ -4,7 +4,7 @@
  */
 
 CKEDITOR.plugins.add('wordcount', {
-    lang: 'ca,de,en,es,fr,it,jp,nl,no,pl,pt-br,ru,sv', // %REMOVE_LINE_CORE%
+    lang: ['en', 'ru'],
     version: 1.10,
     init: function(editor) {
         if (editor.elementMode === CKEDITOR.ELEMENT_MODE_INLINE) {
@@ -57,7 +57,7 @@ CKEDITOR.plugins.add('wordcount', {
 
         var format = defaultFormat;
 
-        CKEDITOR.document.appendStyleSheet(this.path + 'css/wordcount.css');
+        CKEDITOR.document.appendStyleSheet(CKEDITOR.getUrl('plugins/wordcount/css/wordcount.css'));
 
         function counterId(editorInstance) {
             return 'cke_wordcount_' + editorInstance.name;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-ckeditor
 version: !ruby/object:Gem::Version
-  version: 4.4.3.0
+  version: 4.4.3.1
 platform: ruby
 authors:
 - Igor Galeta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails