From f9b20af91abfb155d60675308737005f3cf9ebb0 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Wed, 11 Mar 2015 11:13:56 -0300 Subject: [PATCH] Move block store javascript into a separated file --- app/helpers/boxes_helper.rb | 6 +++--- app/views/box_organizer/index.html.erb | 27 --------------------------- app/views/layouts/_javascript.html.erb | 2 +- public/javascripts/block-store.js | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 31 deletions(-) create mode 100644 public/javascripts/block-store.js diff --git a/app/helpers/boxes_helper.rb b/app/helpers/boxes_helper.rb index c660eb9..9833729 100644 --- a/app/helpers/boxes_helper.rb +++ b/app/helpers/boxes_helper.rb @@ -203,7 +203,7 @@ module BoxesHelper def block_handle(block) return "" unless modifiable?(block) block_draggable("block-#{block.id}", - :helper => "function(){$(this).addClass('ui-draggable-dragging'); return '#{display_icon(block.class)}'}") + :helper => "function() {return cloneDraggableBlock($(this), '#{display_icon(block.class)}')}") end def block_draggable(element_id, options={}) @@ -213,8 +213,8 @@ module BoxesHelper :helper => '"clone"', :revertDuration => 200, :scroll => false, - :start => "function() {$('#box-organizer').addClass('shadow')}", - :stop => "function() {$('#box-organizer').removeClass('shadow'); $('.ui-draggable-dragging').removeClass('ui-draggable-dragging')}" + :start => "startDragBlock", + :stop => "stopDragBlock", }.merge(options) draggable_element(element_id, draggable_options) end diff --git a/app/views/box_organizer/index.html.erb b/app/views/box_organizer/index.html.erb index 9027009..5f3630a 100644 --- a/app/views/box_organizer/index.html.erb +++ b/app/views/box_organizer/index.html.erb @@ -26,30 +26,3 @@
- - diff --git a/app/views/layouts/_javascript.html.erb b/app/views/layouts/_javascript.html.erb index 5ea9b7c..3ae9c4c 100644 --- a/app/views/layouts/_javascript.html.erb +++ b/app/views/layouts/_javascript.html.erb @@ -5,7 +5,7 @@ 'jquery-timepicker-addon/dist/jquery-ui-timepicker-addon', 'inputosaurus.js', 'select-or-die/_src/selectordie', 'slick.js', # noosfero libraries - 'application.js', 'modal.js', + 'application.js', 'modal.js', 'block-store.js', 'add-and-join', 'report-abuse', 'catalog', 'manage-products', 'autogrow', :cache => 'cache/application' %> diff --git a/public/javascripts/block-store.js b/public/javascripts/block-store.js new file mode 100644 index 0000000..36d3e57 --- /dev/null +++ b/public/javascripts/block-store.js @@ -0,0 +1,40 @@ +function cloneDraggableBlock(el, blockIcon) { + el.addClass('ui-draggable-dragging'); + return blockIcon; +} + +function startDragBlock() { + $('#box-organizer').addClass('shadow'); +} + +function stopDragBlock() { + $('#box-organizer').removeClass('shadow'); + $('.ui-draggable-dragging').removeClass('ui-draggable-dragging'); +} + +jQuery(document).ready(function($) { + var store = $('#block-store #block-types').slick({ + infinite: true, + dots: true, + draggable: false, + respondTo: 'slider', + slidesToShow: 7, + slidesToScroll: 4, + responsive: [ + { + breakpoint: 2048, + settings: { + slidesToShow: 10, + slidesToScroll: 4, + } + }, + { + breakpoint: 1024, + settings: { + slidesToShow: 8, + slidesToScroll: 4, + } + } + ] + }); +}); -- libgit2 0.21.2