glebtv-ckeditor 4.2.1.5 → 4.3.2.0

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

@@ -1,8 +1,3 @@
-//= require_self
+//= require ckeditor/override
 //= require ckeditor/ckeditor
 
-(function() {
-  if (typeof window['CKEDITOR_BASEPATH'] === "undefined" || window['CKEDITOR_BASEPATH'] === null) {
-    window['CKEDITOR_BASEPATH'] = "<%= config.relative_url_root %>/assets/ckeditor/";
-  }
-}).call(this);

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

@@ -0,0 +1,22 @@
+<%#window['CKEDITOR_BASEPATH'] = "/assets/ckeditor/";%>
+window['CKEDITOR_BASEPATH'] = "<%= asset_path(Ckeditor.asset_path) %>/";
+
+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' }) do |asset| %>
+  "<%= asset %>": "<%= asset_path(asset) %>",
+<% end %>
+}
+
+window.CKEDITOR_GETURL = function( resource ) {
+  // If this is not a full or absolute path.
+  if ( resource.indexOf( ':/' ) == -1 && resource.indexOf( '/' ) !== 0 )
+    resource = this.basePath + resource;
+
+  // Add the timestamp, except for directories.
+  if ( resource.charAt( resource.length - 1 ) != '/'  ){
+    var url = resource.match( /^(.*?:\/\/[^\/]*)\/assets\/(.+)/ );
+    if(url) resource = (CKEDITOR_ASSETS_MAPPING[url[2]] || '/assets/' + url[2]);
+  }
+
+  return resource;
+}

data/app/assets/stylesheets/ckcontent.css

@@ -0,0 +1,103 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+
+body
+{
+	/* Font */
+	font-family: sans-serif, Arial, Verdana, "Trebuchet MS";
+	font-size: 12px;
+
+	/* Text color */
+	color: #333;
+
+	/* Remove the background color to make it transparent */
+	background-color: #fff;
+
+	margin: 20px;
+}
+
+.cke_editable
+{
+	font-size: 13px;
+	line-height: 1.6em;
+}
+
+blockquote
+{
+	font-style: italic;
+	font-family: Georgia, Times, "Times New Roman", serif;
+	padding: 2px 0;
+	border-style: solid;
+	border-color: #ccc;
+	border-width: 0;
+}
+
+.cke_contents_ltr blockquote
+{
+	padding-left: 20px;
+	padding-right: 8px;
+	border-left-width: 5px;
+}
+
+.cke_contents_rtl blockquote
+{
+	padding-left: 8px;
+	padding-right: 20px;
+	border-right-width: 5px;
+}
+
+a
+{
+	color: #0782C1;
+}
+
+ol,ul,dl
+{
+	/* IE7: reset rtl list margin. (#7334) */
+	*margin-right: 0px;
+	/* preserved spaces for list items with text direction other than the list. (#6249,#8049)*/
+	padding: 0 40px;
+}
+
+h1,h2,h3,h4,h5,h6
+{
+	font-weight: normal;
+	line-height: 1.2em;
+}
+
+hr
+{
+	border: 0px;
+	border-top: 1px solid #ccc;
+}
+
+img.right {
+    border: 1px solid #ccc;
+    float: right;
+    margin-left: 15px;
+    padding: 5px;
+}
+
+img.left {
+    border: 1px solid #ccc;
+    float: left;
+    margin-right: 15px;
+    padding: 5px;
+}
+
+img:hover {
+	opacity: .9;
+	filter: alpha(opacity = 90);
+}
+
+pre
+{
+	white-space: pre-wrap; /* CSS 2.1 */
+	word-wrap: break-word; /* IE7 */
+}
+
+.marker {
+    background-color: Yellow;
+}

data/app/controllers/ckeditor/application_controller.rb

@@ -1,12 +1,13 @@
 class Ckeditor::ApplicationController < ::ApplicationController
   respond_to :html, :json
-  
+  layout 'ckeditor/application'
+
   before_filter :find_asset, :only => [:destroy]
   before_filter :ckeditor_authorize!
   before_filter :authorize_resource
 
   protected
-    
+
     def respond_with_asset(asset)
       file = params[:CKEditor].blank? ? params[:qqfile] : params[:upload]
       asset.data = Ckeditor::Http.normalize_param(file, request)
@@ -15,9 +16,9 @@ class Ckeditor::ApplicationController < ::ApplicationController
 
       if callback && asset.save
         body = params[:CKEditor].blank? ? asset.to_json(:only=>[:id, :type]) : %Q"<script type='text/javascript'>
-          window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, '#{Ckeditor::Utils.escape_single_quotes(asset.url_content)}');
+          window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, '#{config.relative_url_root}#{Ckeditor::Utils.escape_single_quotes(asset.url_content)}');
         </script>"
-        
+
         render :text => body
       else
         render :nothing => true

data/app/controllers/ckeditor/attachment_files_controller.rb

@@ -1,28 +1,30 @@
 class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
 
   def index
-    @attachments = Ckeditor.attachment_file_model.find_all(ckeditor_attachment_files_scope)
-    respond_with(@attachments)
+    @attachments = Ckeditor.attachment_file_adapter.find_all(ckeditor_attachment_files_scope)
+    @attachments = Ckeditor::Paginatable.new(@attachments).page(params[:page])
+
+    respond_with(@attachments, :layout => @attachments.first_page?)
   end
-  
+
   def create
-    @attachment = Ckeditor::AttachmentFile.new
-	  respond_with_asset(@attachment)
+    @attachment = Ckeditor.attachment_file_model.new
+    respond_with_asset(@attachment)
   end
-  
+
   def destroy
     @attachment.destroy
     respond_with(@attachment, :location => attachment_files_path)
   end
-  
+
   protected
-  
+
     def find_asset
-      @attachment = Ckeditor.attachment_file_model.get!(params[:id])
+      @attachment = Ckeditor.attachment_file_adapter.get!(params[:id])
     end
 
     def authorize_resource
-      model = (@attachment || Ckeditor::AttachmentFile)
+      model = (@attachment || Ckeditor.attachment_file_model)
       @authorization_adapter.try(:authorize, params[:action], model)
     end
 end

data/app/controllers/ckeditor/pictures_controller.rb

@@ -1,28 +1,30 @@
 class Ckeditor::PicturesController < Ckeditor::ApplicationController
 
   def index
-    @pictures = Ckeditor.picture_model.find_all(ckeditor_pictures_scope)
-    respond_with(@pictures) 
+    @pictures = Ckeditor.picture_adapter.find_all(ckeditor_pictures_scope)
+    @pictures = Ckeditor::Paginatable.new(@pictures).page(params[:page])
+
+    respond_with(@pictures, :layout => @pictures.first_page?)
   end
-  
+
   def create
-    @picture = Ckeditor::Picture.new
-	  respond_with_asset(@picture)
+    @picture = Ckeditor.picture_model.new
+    respond_with_asset(@picture)
   end
-  
+
   def destroy
     @picture.destroy
     respond_with(@picture, :location => pictures_path)
   end
-  
+
   protected
-  
+
     def find_asset
-      @picture = Ckeditor.picture_model.get!(params[:id])
+      @picture = Ckeditor.picture_adapter.get!(params[:id])
     end
 
     def authorize_resource
-      model = (@picture || Ckeditor::Picture)
+      model = (@picture || Ckeditor.picture_model)
       @authorization_adapter.try(:authorize, params[:action], model)
     end
 end

data/app/helpers/ckeditor/application_helper.rb

@@ -8,4 +8,4 @@ module Ckeditor::ApplicationHelper
       false
     end
   end
-end
+end

data/app/views/ckeditor/attachment_files/index.html.erb

@@ -6,10 +6,16 @@
 	</div>
   
   <div class="fileupload-list">
-    <%= render :partial => 'ckeditor/shared/asset', :collection => @attachments %>		
+    <%= render :partial => 'ckeditor/shared/asset', :collection => @attachments.scoped %>		
   </div>
-</div>
 
-<script type="text/javascript">
-  <%= Ckeditor::Utils.js_fileuploader('attachments') %>
-</script>
+  <% unless @attachments.last_page? %>
+    <div class="pagination">
+      <%= link_to I18n.t("ckeditor.buttons.next"), params.merge(:page => @attachments.next_page), :class => "next", :rel => "next" %>
+    </div>
+  <% end -%>
+
+  <script type="text/javascript">
+    <%= Ckeditor::Utils.js_fileuploader('attachments') %>
+  </script>
+</div>

data/app/views/ckeditor/pictures/index.html.erb

@@ -5,11 +5,17 @@
 		</div>
 	</div>
   
-  <div class="fileupload-list">
-    <%= render :partial => 'ckeditor/shared/asset', :collection => @pictures %>		
+  <div class="fileupload-list" data-endless="true">
+    <%= render :partial => 'ckeditor/shared/asset', :collection => @pictures.scoped %>		
   </div>
-</div>
 
-<script type="text/javascript">
-  <%= Ckeditor::Utils.js_fileuploader('image') %>
-</script>
+  <% unless @pictures.last_page? %>
+    <div class="pagination">
+      <%= link_to I18n.t("ckeditor.buttons.next"), params.merge(:page => @pictures.next_page), :class => "next", :rel => "next" %>
+    </div>
+  <% end -%>
+
+  <script type="text/javascript">
+    <%= Ckeditor::Utils.js_fileuploader('image') %>
+  </script>
+</div>

data/app/views/ckeditor/shared/_asset.html.erb

@@ -1,10 +1,10 @@
 <%= content_tag(:div, :id => dom_id(asset), :class => "gal-item", :"data-url" => image_path(asset.url_content)) do %>
-  <%= link_to image_tag("/assets/ckeditor/filebrowser/images/gal_del.png",
+  <%= link_to image_tag('ckeditor/filebrowser/images/gal_del.png',
     :title => I18n.t('ckeditor.buttons.delete')),
           polymorphic_path(asset, :format => :json),
           :remote => true,
           :method => :delete, 
-          :confirm => t('ckeditor.confirm_delete'),
+          :data => {:confirm => t('ckeditor.confirm_delete')},
           :class => "fileupload-cancel gal-del" %>
 	
 	<div class="fileupload-file gal-inner-holder">

data/app/views/ckeditor/shared/_asset_tmpl.html.erb

@@ -1,15 +1,15 @@
 <script id="fileupload_tmpl" type="text/x-jquery-tmpl">
 <div id="asset_${id}" class="gal-item" data-url="${url_content}">
-  <%= link_to image_tag("/assets/ckeditor/filebrowser/images/gal_del.png", 
+  <%= link_to image_tag('ckeditor/filebrowser/images/gal_del.png',
     :title => I18n.t('ckeditor.buttons.delete')), 
           "/ckeditor/${controller}/${id}.json", 
           :remote => true,
           :method => :delete, 
-          :confirm => t('ckeditor.confirm_delete'),
+          :data => {:confirm => t('ckeditor.confirm_delete')},
           :class => "fileupload-cancel gal-del" %>
 	
 	<div class="fileupload-file gal-inner-holder">
-		<div class="img"><img src="<%= Rails.configuration.action_controller.asset_host %>${url_thumb}" title="${filename}"></div>
+		<div class="img"><img src="${url_thumb}" title="${filename}"></div>
 		<div class="img-data">
 			<div class="img-name">${filename}</div>
 			<div class="time-size">

data/app/views/layouts/ckeditor/application.html.erb

@@ -4,7 +4,6 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <meta name="robots" content="noindex, nofollow">
   <%= csrf_meta_tag %>
-  <%= tag(:meta, :name => "ckeditor-path", :content => Ckeditor.relative_path) %>
   <title><%= I18n.t('page_title', :scope => [:ckeditor]) %></title>
 
   <% if assets_pipeline_enabled? -%>

data/config/locales/cs.ckeditor.yml

@@ -6,3 +6,4 @@ cs:
       cancel: "Zrušit"
       upload: "Nahrát"
       delete: "Smazat"
+      next: "Next"

data/config/locales/de.ckeditor.yml

@@ -0,0 +1,9 @@
+de:
+  ckeditor:
+    page_title: "CKEditor Dateimanager"
+    confirm_delete: "Datei löschen?"
+    buttons:
+      cancel: "Abbrechen"
+      upload: "Hochladen"
+      delete: "Löschen"
+      next: "Next"

data/config/locales/el-GR.cdkeditor.yml

@@ -0,0 +1,9 @@
+"el-GR":
+  ckeditor:
+    page_title: "CKEditor Διαχείρηση Αρχείων"
+    confirm_delete: "Διαγραφή αρχείου;"
+    buttons:
+      cancel: "Ακύρωση"
+      upload: "Μεταφόρτωση"
+      delete: "Διαγραφή"
+      next: "Next"

data/config/locales/en.ckeditor.yml

@@ -6,3 +6,4 @@ en:
       cancel: "Cancel"
       upload: "Upload"
       delete: "Delete"
+      next: "Next"

data/config/locales/es.ckeditor.yml

@@ -6,3 +6,4 @@ es:
       cancel: "Cancelar"
       upload: "Subir"
       delete: "Borrar"
+      next: "Next"

data/config/locales/fr.ckeditor.yml

@@ -6,3 +6,4 @@ fr:
       cancel: "Annuler"
       upload: "Ajouter"
       delete: "Supprimer"
+      next: "Next"

data/config/locales/hu.ckeditor.yml

@@ -0,0 +1,9 @@
+hu:
+  ckeditor:
+    page_title: "CKEditor fájlkezelő"
+    confirm_delete: "Biztosan töröljük a fájlt?"
+    buttons:
+      cancel: "Mégsem"
+      upload: "Feltöltés"
+      delete: "Törlés"
+      next: "Next"

data/config/locales/it.ckeditor.yml

@@ -6,3 +6,4 @@ it:
       cancel: "Annulla"
       upload: "Carica"
       delete: "Elimina"
+      next: "Next"

data/config/locales/nl.ckeditor.yml

@@ -5,4 +5,5 @@ nl:
     buttons:
       cancel: "Cancel"
       upload: "Upload"
-      delete: "Delete"
+      delete: "Delete"
+      next: "Next"

data/config/locales/pl.ckeditor.yml

@@ -6,3 +6,4 @@ pl:
       cancel: "Anuluj"
       upload: "Wyślij"
       delete: "Skasuj"
+      next: "Next"

data/config/locales/pt-BR.ckeditor.yml

@@ -5,4 +5,5 @@
     buttons:
       cancel: "Cancelar"
       upload: "Enviar"
-      delete: "Apagar"
+      delete: "Apagar"
+      next: "Next"

data/config/locales/pt-PT.ckeditor.yml

@@ -0,0 +1,9 @@
+"pt-PT":
+  ckeditor:
+    page_title: "Gestor de arquivos do CKEditor"
+    confirm_delete: "Apagar arquivo?"
+    buttons:
+      cancel: "Cancelar"
+      upload: "Enviar"
+      delete: "Apagar"
+      next: "Next"