Merge pull request SpinaCMS#241 from danmitchell-/remove-legacy-assets

Remove legacy assets
Naomarik · Apr 1, 2017 · fa62274 · fa62274
2 parents 1312274 + d83113e
commit fa62274
Show file tree

Hide file tree

Showing 22 changed files with 1 addition and 11,057 deletions.
diff --git a/app/assets/javascripts/spina/admin/application.coffee.erb b/app/assets/javascripts/spina/admin/application.coffee.erb
@@ -17,10 +17,6 @@
 # Misc plugins
 
 #= require spina/sortable
-#= require spina/raphael
-#= require spina/morris
-#= require spina/wysihtml5_parser_rules
-#= require spina/wysihtml5
 #= require spina/trix
 
 # Own code

diff --git a/app/assets/javascripts/spina/admin/trix.coffee.erb b/app/assets/javascripts/spina/admin/trix.coffee.erb
@@ -31,7 +31,7 @@ Trix.config.blockAttributes = $.extend Trix.config.blockAttributes, {
 class Spina.TrixAttachment
   @photoSelect: (e) ->
     editor_id = $(this).closest('trix-toolbar').data('trix-editor-id')
-    $.get("<%= Spina::Engine.routes.url_helpers.wysihtml5_select_admin_photos_path('') %>/#{editor_id}")
+    $.get("<%= Spina::Engine.routes.url_helpers.photo_select_admin_photos_path('') %>/#{editor_id}")
 
   @photoInsert: (e, url) ->
     length = this.editor.getDocument().toString().length

diff --git a/app/assets/stylesheets/spina.sass b/app/assets/stylesheets/spina.sass
@@ -24,14 +24,9 @@
 @import spina/sortable_lists
 @import spina/gallery
 @import spina/login
-@import spina/cards
 @import spina/trix
-@import spina/wizard
 @import spina/notifications
 
-// Plugins
-@import spina/morris
-@import spina/wysihtml5
 
 html
   box-sizing: border-box

diff --git a/app/assets/stylesheets/spina/_cards.sass b/app/assets/stylesheets/spina/_cards.sass
diff --git a/app/assets/stylesheets/spina/_wizard.sass b/app/assets/stylesheets/spina/_wizard.sass
diff --git a/app/assets/stylesheets/spina/_wysihtml5.sass b/app/assets/stylesheets/spina/_wysihtml5.sass
diff --git a/app/assets/stylesheets/spina/wysihtml5_textarea.sass b/app/assets/stylesheets/spina/wysihtml5_textarea.sass
diff --git a/app/controllers/spina/admin/page_parts_controller.rb b/app/controllers/spina/admin/page_parts_controller.rb
diff --git a/app/controllers/spina/admin/photos_controller.rb b/app/controllers/spina/admin/photos_controller.rb
@@ -87,21 +87,6 @@ def insert_photo_collection
         @photos = Photo.find(params[:photo_ids]) if params[:photo_ids].present?
       end
 
-      def wysihtml5_insert
-        @photo = Photo.find(params[:photo_id])
-      end
-
-      def wysihtml5_select
-        @photos = Photo.sorted.page(params[:page])
-        @photo = Photo.new
-
-        if params[:page].present?
-          render :wysihtml5_infinite_scroll
-        else
-          render :wysihtml5_select
-        end
-      end
-
       private
 
       def set_breadcrumbs

diff --git a/app/views/spina/admin/page_parts/_wysihtml5_link.html.haml b/app/views/spina/admin/page_parts/_wysihtml5_link.html.haml
diff --git a/app/views/spina/admin/page_parts/insert_wysihtml5_link.js b/app/views/spina/admin/page_parts/insert_wysihtml5_link.js
diff --git a/app/views/spina/admin/page_parts/wysihtml5_link.js b/app/views/spina/admin/page_parts/wysihtml5_link.js
diff --git a/app/views/spina/admin/photos/_wysihtml5_select.html.haml b/app/views/spina/admin/photos/_wysihtml5_select.html.haml
diff --git a/app/views/spina/admin/photos/wysihtml5_infinite_scroll.js.erb b/app/views/spina/admin/photos/wysihtml5_infinite_scroll.js.erb
diff --git a/app/views/spina/admin/photos/wysihtml5_insert.js.coffee b/app/views/spina/admin/photos/wysihtml5_insert.js.coffee
diff --git a/app/views/spina/admin/photos/wysihtml5_select.js.erb b/app/views/spina/admin/photos/wysihtml5_select.js.erb