lib/ckeditor/utils.rb in glebtv-ckeditor-4.2.1.5 vs lib/ckeditor/utils.rb in glebtv-ckeditor-4.3.2.0

@@ -1,34 +1,24 @@
 # encoding: utf-8
 require 'active_support/json/encoding'
 
 module Ckeditor
   module Utils
-    class JavascriptCode < String
-      def to_json(options = nil)
-        self
-      end
-      
-      def as_json(options = nil)
-        ActiveSupport::JSON::Variable.new(to_s).freeze
-      end
-    end
-
     class << self
       def escape_single_quotes(str)
         str.gsub('\\','\0\0').gsub('</','<\/').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
       end
-      
+
       def parameterize_filename(filename)
         return filename unless Ckeditor.parameterize_filenames
 
         extension = File.extname(filename)
         basename = filename.gsub(/#{extension}$/, "")
-        
+
         [basename.parameterize('_'), extension].join.downcase
       end
-      
+
       def js_replace(dom_id, options = nil)
         js = ["if (typeof CKEDITOR != 'undefined') {"]
 
         if options && !options.keys.empty?
           js_options = ActiveSupport::JSON.encode(options)
@@ -38,50 +28,78 @@
         end
 
         js << "}"
         js.join(" ").html_safe
       end
-      
+
       def js_fileuploader(uploader_type, options = {})
         options = { :multiple => true, :element => "fileupload" }.merge(options)
-        
+
         case uploader_type.to_s.downcase
           when "image" then
-            options[:action] = JavascriptCode.new("EDITOR.config.filebrowserImageUploadUrl")
+            options[:action] = "EDITOR.config.filebrowserImageUploadUrl"
             options[:allowedExtensions] = Ckeditor.image_file_types
           when "flash" then
-            options[:action] = JavascriptCode.new("EDITOR.config.filebrowserFlashUploadUrl")
+            options[:action] = "EDITOR.config.filebrowserFlashUploadUrl"
             options[:allowedExtensions] = ["swf"]
           else
-            options[:action] = JavascriptCode.new("EDITOR.config.filebrowserUploadUrl")
+            options[:action] = "EDITOR.config.filebrowserUploadUrl"
             options[:allowedExtensions] = Ckeditor.attachment_file_types
         end
-        
-        js_options = ActiveSupport::JSON.encode(options)
-        
+
+        js_options = ActiveSupport::JSON.encode(options).gsub /"EDITOR.config.filebrowser(.*)UploadUrl"/, 'EDITOR.config.filebrowser\1UploadUrl'
+
         "(function() { new qq.FileUploaderInput(#{js_options}); }).call(this);".html_safe
       end
-      
+
       def filethumb(filename)
         extname = filename.blank? ? "unknown" : File.extname(filename).gsub(/^\./, '')
-	      image = "#{extname}.gif"
-	      source = Ckeditor.root_path.join("app/assets/javascripts/ckeditor/filebrowser/images/thumbs")
-	      
-	      unless File.exists?(File.join(source, image))
-	        image = "unknown.gif"
-	      end
-	      
-	      File.join(Ckeditor.relative_path, "filebrowser/images/thumbs", image)
+        image = "#{extname}.gif"
+        source = Ckeditor.root_path.join("app/assets/javascripts/ckeditor/filebrowser/images/thumbs")
+
+        unless File.exists?(File.join(source, image))
+          image = "unknown.gif"
+        end
+
+        File.join(Ckeditor.relative_path, "filebrowser/images/thumbs", image)
       end
 
       def select_assets(path, relative_path)
-        folder = File.join(relative_path, path, '**')
-        relative_folder = Ckeditor.root_path.join(relative_path)
-      
-        Dir[Ckeditor.root_path.join(folder, '*.{js,css}')].inject([]) do |list, file|
-          list << Pathname.new(file).relative_path_from(relative_folder).to_s
-          list
+        relative_folder = Ckeditor.root_path.join relative_path
+        folder = relative_folder.join path
+        extensions = '*.{js,css,png,gif,jpg,scss}'
+
+        # Files at root
+        files = Dir[folder.join(extensions)]
+
+        # Plugins
+        if Ckeditor.assets_plugins.nil?
+          files += Dir[folder.join('plugins', '**', extensions)]
+        else
+          Ckeditor.assets_plugins.each do |plugin|
+            files += Dir[folder.join('plugins', plugin, '**', extensions)]
+          end
         end
+
+        # Other folders
+        Dir[folder.join('*/')].each do |subfolder|
+          path = Pathname.new(subfolder)
+          unless path.basename.to_s == 'plugins'
+            files += Dir[path.join('**', extensions)]
+          end
+        end
+
+        paths = files.map { |file| Pathname.new(file) }
+
+        # Filter languages
+        if Ckeditor.assets_languages.present?
+          paths.select! do |path|
+            path.dirname.basename.to_s != 'lang' ||
+            Ckeditor.assets_languages.include?(path.basename.to_s.split('.')[0])
+          end
+        end
+
+        paths.map { |path| path.relative_path_from(relative_folder).to_s.gsub('.scss', '') }.select { |path| path != 'ckeditor/ckeditor.js' }
       end
     end
   end
 end