glebtv-ckeditor 4.6.0 → 4.7.3

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

@@ -2,8 +2,7 @@ CKEDITOR.editorConfig = function( config ) {
   // Define changes to default configuration here. For example:
   config.language = 'ru';
 
-  // config.uiColor = '#AADC6E';
-  config.skin = 'moono-lisa';
+  config.skin = 'minimalist';
 
   /* Filebrowser routes */
   // The location of an external file browser, that should be launched when "Browse Server" button is pressed.

data/app/assets/javascripts/ckeditor/filebrowser/javascripts/{application.js.erb → application.js}

@@ -199,15 +199,13 @@ qq.extend(qq.FileUploaderInput.prototype, {
             format_created_at: '',
             url_content: "#",
             controller: "assets",
-            url_thumb: "<%= asset_path('ckeditor/filebrowser/images/preloader.gif') %>"
+            url_thumb: ""
           };
 
-          var item = $(this._options.template_id)
-            .tmpl(asset)
-            .attr('qqfileid', id)
-            .prependTo( this._listElement );
+          var item = $(this._options.template_id).tmpl(asset).attr('qqfileid', id)
 
-          item.find('div.img').addClass('preloader');
+          item.find('div.img').html('').addClass('preloader');
+          item.prependTo( this._listElement );
 
           this._bindCancelEvent(item);
         }

data/app/assets/stylesheets/ckeditor/application.css

@@ -2,5 +2,5 @@
  * This is a manifest file that'll automatically include all the stylesheets available in this directory
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require ckeditor/filebrowser/stylesheets/uploader.css
+ *= require ckeditor/filebrowser/uploader
 */

data/app/assets/stylesheets/ckeditor/filebrowser/uploader.scss

@@ -0,0 +1,172 @@
+body {
+  padding: 0;
+  margin: 0;
+  font-family: Arial, Helvetica, sans-serif;
+}
+img {
+  border: 0;
+}
+.gal-holder {
+  display: block;
+  overflow: hidden;
+  padding: 20px;
+}
+.gal-holder .gal-item:first-child {
+    float: left;
+}
+.gal-holder .gal-item {
+    display: inline-block;
+    width: 150px;
+  overflow: hidden;
+  position: relative;
+  margin: 0 12px 12px 0;
+}
+.gal-holder .gal-item .gal-del {
+  display: block;
+  position: absolute;
+  right: 0;
+  top: 0;
+  background: url(image_path('ckeditor/filebrowser/gal_del.png')) no-repeat left center;
+  width: 17px;
+  height: 17px;
+}
+.gal-holder .gal-item .preloader {
+  background: url(image_path('ckeditor/filebrowser/preloader.gif')) no-repeat center center;
+  width: 118px;
+  height: 100px;
+}
+.gal-holder .gal-item .gal-del:hover {
+  -moz-opacity: 0.7;
+  -khtml-opacity: 0.7;
+  opacity: 0.7;
+}
+.gal-holder .gal-item .gal-upload-holder input {
+  height: 162px;
+}
+.gal-holder .gal-item .gal-upload-holder .add:hover {
+  text-decoration: underline;
+}
+.gal-holder .gal-item .gal-inner-holder, .gal-holder .gal-item .gal-upload-holder {
+  display: block;
+  margin: 6px 6px 0 0;
+  overflow: hidden;
+  padding: 12px;
+  background: #fff;
+  border: solid 1px #D3D3D3;
+  min-height: 138px;
+}
+.gal-holder .gal-item .gal-inner-holder.hover {
+    background: #DFF1FF;
+    border: solid 1px #99CCFF;
+}
+.gal-holder .gal-item .gal-inner-holder.selected {
+    background: #B4D9FF;
+    border: solid 1px #6565FE;
+}
+.gal-holder .gal-item .gal-upload-holder .add {
+  display: block;
+  color: #2e5aff;
+  background: url(image_path('ckeditor/filebrowser/gal_add.png')) no-repeat left center;
+  padding-left: 33px;
+  line-height: 25px;
+  text-decoration: none;
+  margin: 50px 0 0 10px;
+  font-size: 14px;
+}
+.gal-holder .gal-item .gal-inner-holder .img {
+  height: 100px;
+  overflow: hidden;
+  cursor:pointer;
+}
+.gal-holder .gal-item .gal-inner-holder .img-data {
+  display: block;
+  overflow: hidden;
+  padding-top: 5px;
+}
+.gal-holder .gal-item .gal-inner-holder .img-data .img-name {
+  display: block;
+  color: #333;
+  padding-bottom: 5px;
+  font-size: 12px;
+  overflow: hidden;
+  width: 500px;
+}
+.img-name {
+  word-wrap: break-word;
+  width: auto !important;
+}
+.gal-holder .gal-item .gal-inner-holder .img-data .time-size {
+  display: block;
+  overflow: hidden;
+  font-size: 10px;
+  color: #666;
+}
+.gal-holder .gal-item .gal-inner-holder .img-data .time-size .time {
+  display: block;
+  float: left;
+}
+.gal-holder .gal-item .gal-inner-holder .img-data .time-size .size {
+  display: block;
+  float: right;
+}
+.gal-more {
+  display: block;
+  overflow: hidden;
+  border-top: dashed 1px #d3d3d3;
+  padding: 20px 0;
+  text-align: center;
+}
+.gal-more a {
+  color: #2e5aff;
+  background: url(image_path('ckeditor/filebrowser/gal_more.gif')) no-repeat left center;
+  padding-left: 15px;
+  font-size: 14px;
+  text-decoration: none;
+}
+.gal-more a:hover {
+  text-decoration: underline;
+}
+
+.pagination {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-weight: inherit;
+  font-style: inherit;
+  height: 40px;
+  text-align: center;
+  vertical-align: middle;
+}
+
+.pagination a {
+  height: 40px;
+  width: 50%;
+  padding-right: 5px;
+  padding-left: 5px;
+  text-decoration: none;
+
+  background: #f8f8f8;
+  border-color: #f5c002;
+  color: #000;
+
+  position: relative;
+  display: inline-block;
+  vertical-align: middle;
+  line-height: 40px;
+  font-weight: 400;
+  font-size: 13px;
+
+  padding: 0 20px;
+
+  box-sizing: border-box;
+  border: 1px solid #bcbcbc;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  -ms-border-radius: 2px;
+  -o-border-radius: 2px;
+  border-radius: 2px;
+}
+
+.pagination a:hover {
+  background: #fff;
+}

data/app/controllers/ckeditor/application_controller.rb

@@ -1,20 +1,19 @@
 class Ckeditor::ApplicationController < Ckeditor.parent_controller.constantize
-  layout 'ckeditor/application'
+  layout Ckeditor.controller_layout
 
-  before_action :find_asset, :only => [:destroy]
+  before_action :find_asset, only: [:destroy]
   before_action :ckeditor_authorize!
   before_action :authorize_resource
 
   protected
 
-    def respond_with_asset(asset)
-      _response = Ckeditor::AssetResponse.new(asset, request)
-      _callback = ckeditor_before_create_asset(asset)
+  def respond_with_asset(asset)
+    asset_response = Ckeditor::AssetResponse.new(asset, request)
 
-      if _callback && asset.save
-        render _response.success(config.relative_url_root)
-      else
-        render _response.errors
-      end
+    if asset.save
+      render asset_response.success(config.relative_url_root)
+    else
+      render asset_response.errors
     end
+  end
 end

data/app/controllers/ckeditor/attachment_files_controller.rb

@@ -1,12 +1,12 @@
 class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
-  skip_before_action :verify_authenticity_token, only: :create
-  
+  skip_before_action :verify_authenticity_token, only: :create, raise: false
+
   def index
     @attachments = Ckeditor.attachment_file_adapter.find_all(ckeditor_attachment_files_scope)
     @attachments = Ckeditor::Paginatable.new(@attachments).page(params[:page])
 
     respond_to do |format|
-      format.html { render :layout => @attachments.first_page? }
+      format.html { render layout: @attachments.first_page? }
     end
   end
 
@@ -16,23 +16,22 @@ class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
   end
 
   def destroy
-    return false unless Ckeditor.can_delete
     @attachment.destroy
 
     respond_to do |format|
       format.html { redirect_to attachment_files_path }
-      format.json { render :nothing => true, :status => 204 }
+      format.json { render json: @attachment, status: 204 }
     end
   end
 
   protected
 
-    def find_asset
-      @attachment = Ckeditor.attachment_file_adapter.get!(params[:id])
-    end
+  def find_asset
+    @attachment = Ckeditor.attachment_file_adapter.get!(params[:id])
+  end
 
-    def authorize_resource
-      model = (@attachment || Ckeditor.attachment_file_model)
-      @authorization_adapter.try(:authorize, params[:action], model)
-    end
+  def authorize_resource
+    model = (@attachment || Ckeditor.attachment_file_model)
+    @authorization_adapter.try(:authorize, params[:action], model)
+  end
 end

data/app/controllers/ckeditor/pictures_controller.rb

@@ -1,12 +1,12 @@
 class Ckeditor::PicturesController < Ckeditor::ApplicationController
-  skip_before_action :verify_authenticity_token, only: :create
+  skip_before_action :verify_authenticity_token, only: :create, raise: false
 
   def index
     @pictures = Ckeditor.picture_adapter.find_all(ckeditor_pictures_scope)
     @pictures = Ckeditor::Paginatable.new(@pictures).page(params[:page])
 
     respond_to do |format|
-      format.html { render :layout => @pictures.first_page? }
+      format.html { render layout: @pictures.first_page? }
     end
   end
 
@@ -16,24 +16,22 @@ class Ckeditor::PicturesController < Ckeditor::ApplicationController
   end
 
   def destroy
-    return false unless Ckeditor.can_delete
-
     @picture.destroy
 
     respond_to do |format|
       format.html { redirect_to pictures_path }
-      format.json { render :nothing => true, :status => 204 }
+      format.json { render json: @picture, status: 204 }
     end
   end
 
   protected
 
-    def find_asset
-      @picture = Ckeditor.picture_adapter.get!(params[:id])
-    end
+  def find_asset
+    @picture = Ckeditor.picture_adapter.get!(params[:id])
+  end
 
-    def authorize_resource
-      model = (@picture || Ckeditor.picture_model)
-      @authorization_adapter.try(:authorize, params[:action], model)
-    end
+  def authorize_resource
+    model = (@picture || Ckeditor.picture_model)
+    @authorization_adapter.try(:authorize, params[:action], model)
+  end
 end

data/app/helpers/ckeditor/application_helper.rb

@@ -1,11 +1,2 @@
 module Ckeditor::ApplicationHelper
-  def assets_pipeline_enabled?
-    if Gem::Version.new(::Rails.version.to_s) >= Gem::Version.new('4.0.0')
-      defined?(Sprockets::Rails)
-    elsif Gem::Version.new(::Rails.version.to_s) >= Gem::Version.new('3.0.0')
-      Rails.application.config.assets.enabled
-    else
-      false
-    end
-  end
-end
+end

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

@@ -1,17 +1,17 @@
 <div id="fileupload" class="gal-holder">
   <div class="gal-item">
     <div class="fileupload-button gal-upload-holder">
-  		<%= link_to I18n.t(:upload, :scope => [:ckeditor, :buttons]), 'javascript:void(0)', :class => "add" %>
-		</div>
-	</div>
+      <%= link_to I18n.t(:upload, scope: [:ckeditor, :buttons]), 'javascript:void(0)', class: "add" %>
+    </div>
+  </div>
 
   <div class="fileupload-list">
-    <%= render :partial => 'ckeditor/shared/asset', :collection => @attachments.scoped %>
+    <%= render partial: 'ckeditor/shared/asset', collection: @attachments %>
   </div>
 
   <% unless @attachments.last_page? %>
     <div class="pagination">
-      <%= link_to I18n.t("ckeditor.buttons.next"), ckeditor.attachment_files_path(params.merge(:page => @attachments.next_page)), :class => "next", :rel => "next" %>
+      <%= link_to I18n.t("ckeditor.buttons.next"), ckeditor.attachment_files_path(page: @attachments.next_page), class: "next", rel: "next" %>
     </div>
   <% end -%>
 

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

@@ -1,17 +1,17 @@
 <div id="fileupload" class="gal-holder">
   <div class="gal-item">
     <div class="fileupload-button gal-upload-holder">
-  		<%= link_to I18n.t(:upload, :scope => [:ckeditor, :buttons]), 'javascript:void(0)', :class => "add" %>
-		</div>
-	</div>
+      <%= link_to I18n.t(:upload, scope: [:ckeditor, :buttons]), 'javascript:void(0)', class: "add" %>
+    </div>
+  </div>
 
   <div class="fileupload-list" data-endless="true">
-    <%= render :partial => 'ckeditor/shared/asset', :collection => @pictures.scoped %>
+    <%= render partial: 'ckeditor/shared/asset', collection: @pictures.scoped %>
   </div>
 
   <% unless @pictures.last_page? %>
     <div class="pagination">
-      <%= link_to I18n.t("ckeditor.buttons.next"), ckeditor.pictures_path(params.merge(:page => @pictures.next_page)), :class => "next", :rel => "next" %>
+      <%= link_to I18n.t("ckeditor.buttons.next"), ckeditor.pictures_path(page: @pictures.next_page), class: "next", rel: "next" %>
     </div>
   <% end -%>
 

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

@@ -1,22 +1,19 @@
-<%= content_tag(:div, :id => dom_id(asset), :class => "gal-item", :"data-url" => image_path(asset.url_content)) do %>
-  <% if Ckeditor.can_delete then %>
-  <%= 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, 
-          :data => {:confirm => t('ckeditor.confirm_delete')},
-          :class => "fileupload-cancel gal-del" %>
-  <% end %>
-	
-	<div class="fileupload-file gal-inner-holder">
-		<div class="img"><%= image_tag(asset.url_thumb, :title => asset.filename) %></div>
-		<div class="img-data">
-			<div class="img-name"><%= asset.filename %></div>
-			<div class="time-size">
-				<div class="time"><%= asset.format_created_at %></div>
-				<div class="fileupload-size size"><%= number_to_human_size(asset.size) if asset.size %></div>
-			</div>
-		</div>
-	</div>
+<%= content_tag(:div, id: dom_id(asset), class: "gal-item", data: { url: image_path(asset.url_content) }) do %>
+  <%= link_to '', polymorphic_path(asset, format: :json),
+          remote: true,
+          method: :delete,
+          title: I18n.t('ckeditor.buttons.delete'),
+          data: { confirm: t('ckeditor.confirm_delete') },
+          class: "fileupload-cancel gal-del" %>
+
+  <div class="fileupload-file gal-inner-holder">
+    <div class="img"><%= image_tag(asset.url_thumb, title: asset.filename) %></div>
+    <div class="img-data">
+      <div class="img-name"><%= asset.filename %></div>
+      <div class="time-size">
+        <div class="time"><%= asset.format_created_at %></div>
+        <div class="fileupload-size size"><%= number_to_human_size(asset.size) if asset.size %></div>
+      </div>
+    </div>
+  </div>
 <% end %>