guts 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ebd28095fc97a22a4de4b78ea0f91540ca8ad41
-  data.tar.gz: f1d6f6126e1b67fe3777f24b27a7da0ba3679d53
+  metadata.gz: b7b4c7de67e67a75f5f5426d6b239163120d8e9e
+  data.tar.gz: 6e385290b8d461987e65f287d4cfa358f9dde625
 SHA512:
-  metadata.gz: fb94a7714a4d0b3d8c1cfddbfaa9fda072cd4e9a9cef7405f34b0c5b61bf5b3108c5fb618b26994b9746d1d8737723f50fccf735eec6217cc8c1839e72998a91
-  data.tar.gz: 77d6c306916992e32d71b6cb284a1527a7831276105a4dce2e055e4ecbbb6f05b882aaa30e2266dfc60faa58099d8002274187c9c7ce09e507c255d060a08a6f
+  metadata.gz: a5cb35511239bd243e9ee8b900a1bb854692bb004dd701adfad09f8d94941297968f80104558128246820c905f498b59dd9af013977db65f0eec681c96a54bee
+  data.tar.gz: 44cf2b8af0889687c6746cb6347ed37fdf71b4f1f862180c2ca85e4dc301ebc2ef4950c78c794c040b9f7237b9868f00c39a1b8683f8db88a36a0eb8f05e7da0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# Version 1.3.5
+
++ Added ENV var for TravisCI to surpress unneeded Ruby warnings
++ Sortable navigation items is now in place (drag and drop to reorder)
+
 # Version 1.3.4
 
 + Fix for issue #3 where navigation items were showing wrong results

data/app/assets/javascripts/guts/application.js.erb

@@ -2,40 +2,53 @@
 //= require ./vendor/foundation
 //= require ./vendor/handlebars
 //= require ./vendor/sweetalert
+//= require ./vendor/sortable
 //= require tinymce-jquery
 //= require_directory .
 
+(function() {
+  var token = $('meta[name="csrf-token"]').attr('content');
+
+  $.ajaxSetup({
+    beforeSend: function(xhr) {
+      xhr.setRequestHeader('X-CSRF-Token', token);
+    }
+  });
+
+  return token;
+})();
+
 jQuery(document).foundation();
 
 jQuery(document).ready(function($) {
-  $("#menu-toggle").click(function(e) {
+  $('#menu-toggle').click(function(e) {
     e.preventDefault();
-    $("#wrapper").toggleClass("toggled");
+    $('#wrapper').toggleClass('toggled');
 
-    if ($("#wrapper").hasClass("toggled")) {
-      $(this).find("i").removeClass("fa-angle-left");
-      $(this).find("i").addClass("fa-angle-right");
+    if ($('#wrapper').hasClass('toggled')) {
+      $(this).find('i').removeClass('fa-angle-left');
+      $(this).find('i').addClass('fa-angle-right');
     } else {
-      $(this).find("i").removeClass("fa-angle-right");
-      $(this).find("i").addClass("fa-angle-left");
+      $(this).find('i').removeClass('fa-angle-right');
+      $(this).find('i').addClass('fa-angle-left');
     }
   });
-  
-  $(".destroy_resource").on("click", function(e) {
+
+  $('.destroy_resource').on('click', function(e) {
     e.preventDefault();
-    
+
     $that = $(this);
-    
+
     swal({
-      title: "Are you sure?",
-      text: "You will not be able to recover this after deleting...",
-      type: "warning",
+      title: 'Are you sure?',
+      text: 'You will not be able to recover this after deleting...',
+      type: 'warning',
       showCancelButton: true,
-      confirmButtonColor: "#DD6B55",
-      confirmButtonText: "Yes, delete it!",
+      confirmButtonColor: '#DD6B55',
+      confirmButtonText: 'Yes, delete it!',
       closeOnConfirm: true
     }, function() {
-      $that.parent().find("form").trigger("submit");
+      $that.parent().find('form').trigger('submit');
     });
   });
 });

data/app/assets/javascripts/guts/media.js

@@ -1,53 +1,53 @@
 jQuery(document).ready(function($) {
-  $(".media_add").on("click", function() {
+  $('.media_add').on('click', function() {
     $(this).remove();
-    $(".media_add_new").show();
+    $('.media_add_new').show();
   });
-  
-  $(".media_destroy").on("click", function(e) {
+
+  $('.media_destroy').on('click', function(e) {
     e.preventDefault();
-    
+
     var $that = $(this);
-    
+
     swal({
-      title: "Are you sure?",
-      text: "You will not be able to recover this attachment after deletion.",
-      type: "warning",
+      title: 'Are you sure?',
+      text: 'You will not be able to recover this attachment after deletion.',
+      type: 'warning',
       showCancelButton: true,
-      confirmButtonColor: "#DD6B55",
-      confirmButtonText: "Yes, delete it!",
+      confirmButtonColor: '#DD6B55',
+      confirmButtonText: 'Yes, delete it!',
       closeOnConfirm: false
     }, function() {
       swal.close();
-      
-      $that.parents(".media_block").find("input[type=checkbox]").trigger("click");
-      $that.parents(".media_block").fadeOut("slow");
+
+      $that.parents('.media_block').find('input[type=checkbox]').trigger('click');
+      $that.parents('.media_block').fadeOut('slow');
     });
   });
-  
+
   if (window.top.tinymce && window.top != window) {
-    $(".media_insert").css("display", "inline");
-    
-    $(document).on("click", "#media_insert_size", function() {
-      var size = $(this).parent().find("select").val();
-      var file = $(this).parent().find("#media_insert_file_link");
-      
+    $('.media_insert').css('display', 'inline');
+
+    $(document).on('click', '#media_insert_size', function() {
+      var size = $(this).parent().find('select').val();
+      var file = $(this).parent().find('#media_insert_file_link');
+
       var editor = window.top.tinymce.editors[0];
-      editor.insertContent('<img src="'+file.val().replace("original", size)+'" alt="Image">');
+      editor.insertContent('<img src="'+file.val().replace('original', size)+'" alt="Image">');
       editor.windowManager.close();
     });
-    
-    $(".media_insert").on("click", function(e) {
+
+    $('.media_insert').on('click', function(e) {
       e.preventDefault();
 
-      if ($(this).data("type").indexOf("image") != -1) {
-        var modal = $("#media_insert_modal");
-        $.get($(this).attr("href"), function(resp) { modal.html(resp).foundation("open"); });
+      if ($(this).data('type').indexOf('image') != -1) {
+        var modal = $('#media_insert_modal');
+        $.get($(this).attr('href'), function(resp) { modal.html(resp).foundation('open'); });
       } else {
         var editor = window.top.tinymce.editors[0];
-        editor.insertContent('<a href="'+$(this).data("url")+'" target="_blank">'+$(this).data("title")+'</a>');
+        editor.insertContent('<a href="'+$(this).data('url')+'" target="_blank">'+$(this).data('title')+'</a>');
         editor.windowManager.close();
       }
     })
   }
-});
+});

data/app/assets/javascripts/guts/navigation.js

@@ -1,44 +1,59 @@
 jQuery(document).ready(function($) {
-  if ($("body").attr("id").indexOf("guts_navigation_items") == -1) { return; }
-  
-  $(window).on("load", function() {
-    if ($("body").attr("id").indexOf("guts_navigation_items_edit") == -1) { return; }
-    
+  if ($('body').attr('id').indexOf('guts_navigation') == -1) { return; }
+
+  $(window).on('load', function() {
+    if ($('body').attr('id').indexOf('guts_navigation_items_edit') == -1) { return; }
+
     // Trigger change for edit to run
-    $("#navigation_item_navigatable_type").trigger("change");
+    $('#navigation_item_navigatable_type').trigger('change');
   });
-  
-  $("#navigation_item_navigatable_type").on("change", function() {
+
+  $('#navigation_item_navigatable_type').on('change', function() {
     var value = $(this).val();
-    if (value === "") {
+    if (value === '') {
       // Show custom entry
-      $("#navigation_item_navigatable_id").html("").hide();
-      $("#navigation_item_custom").show();
+      $('#navigation_item_navigatable_id').html('').hide();
+      $('#navigation_item_custom').show();
     } else {
       // Show dynamic navigatable entries
-      $("#navigation_item_navigatable_id").html("").show();
-      $("#navigation_item_custom").hide();
+      $('#navigation_item_navigatable_id').html('').show();
+      $('#navigation_item_custom').hide();
 
       $.ajax({
-        url: $(this).data("callback-url"),
+        url: $(this).data('callback-url'),
         data: {model: $(this).val()},
-        dataType: "json",
+        dataType: 'json',
       }).done(function(data) {
         $.each(data, function() {
           // Populate the navigatable objects
-          $("#navigation_item_navigatable_id").append('<option value="'+this.id+'">'+this.format+'</option>');
+          $('#navigation_item_navigatable_id').append('<option value="'+this.id+'">'+this.format+'</option>');
         });
-        
-        var initial = $("#navigation_item_navigatable_id").data("initial");
+
+        var initial = $('#navigation_item_navigatable_id').data('initial');
         if (initial) {
           // Edit screen, re-select the initial after the AJAX call
-          $("#navigation_item_navigatable_id option").each(function() {
+          $('#navigation_item_navigatable_id option').each(function() {
             if ($(this).val() == initial) {
-              $("#navigation_item_navigatable_id").val($(this).val()).trigger("change");
+              $('#navigation_item_navigatable_id').val($(this).val()).trigger('change');
             }
           });
         }
       });
     }
   });
-});
+
+  $('.sortable').each(function() {
+    var url    = $(this).data('url');
+    var target = this;
+
+    Sortable.create(target, {
+      handle: '.handle',
+      onEnd: function() {
+        var ids = { };
+        $(target).find('.item').each(function() { ids[$(this).index()] = $(this).data('id'); });
+
+        $.post(url, { order: ids });
+      }
+    });
+  });
+});

data/app/assets/javascripts/guts/vendor/sortable.js

@@ -0,0 +1,2 @@
+/*! Sortable 1.4.2 - MIT | git://github.com/rubaxa/Sortable.git */
+!function(a){"use strict";"function"==typeof define&&define.amd?define(a):"undefined"!=typeof module&&"undefined"!=typeof module.exports?module.exports=a():"undefined"!=typeof Package?Sortable=a():window.Sortable=a()}(function(){"use strict";function a(a,b){if(!a||!a.nodeType||1!==a.nodeType)throw"Sortable: `el` must be HTMLElement, and not "+{}.toString.call(a);this.el=a,this.options=b=s({},b),a[M]=this;var c={group:Math.random(),sort:!0,disabled:!1,store:null,handle:null,scroll:!0,scrollSensitivity:30,scrollSpeed:10,draggable:/[uo]l/i.test(a.nodeName)?"li":">*",ghostClass:"sortable-ghost",chosenClass:"sortable-chosen",ignore:"a, img",filter:null,animation:0,setData:function(a,b){a.setData("Text",b.textContent)},dropBubble:!1,dragoverBubble:!1,dataIdAttr:"data-id",delay:0,forceFallback:!1,fallbackClass:"sortable-fallback",fallbackOnBody:!1};for(var d in c)!(d in b)&&(b[d]=c[d]);W(b);for(var f in this)"_"===f.charAt(0)&&(this[f]=this[f].bind(this));this.nativeDraggable=b.forceFallback?!1:Q,e(a,"mousedown",this._onTapStart),e(a,"touchstart",this._onTapStart),this.nativeDraggable&&(e(a,"dragover",this),e(a,"dragenter",this)),U.push(this._onDragOver),b.store&&this.sort(b.store.get(this))}function b(a){w&&w.state!==a&&(h(w,"display",a?"none":""),!a&&w.state&&x.insertBefore(w,t),w.state=a)}function c(a,b,c){if(a){c=c||O;do if(">*"===b&&a.parentNode===c||q(a,b))return a;while(a!==c&&(a=a.parentNode))}return null}function d(a){a.dataTransfer&&(a.dataTransfer.dropEffect="move"),a.preventDefault()}function e(a,b,c){a.addEventListener(b,c,!1)}function f(a,b,c){a.removeEventListener(b,c,!1)}function g(a,b,c){if(a)if(a.classList)a.classList[c?"add":"remove"](b);else{var d=(" "+a.className+" ").replace(L," ").replace(" "+b+" "," ");a.className=(d+(c?" "+b:"")).replace(L," ")}}function h(a,b,c){var d=a&&a.style;if(d){if(void 0===c)return O.defaultView&&O.defaultView.getComputedStyle?c=O.defaultView.getComputedStyle(a,""):a.currentStyle&&(c=a.currentStyle),void 0===b?c:c[b];b in d||(b="-webkit-"+b),d[b]=c+("string"==typeof c?"":"px")}}function i(a,b,c){if(a){var d=a.getElementsByTagName(b),e=0,f=d.length;if(c)for(;f>e;e++)c(d[e],e);return d}return[]}function j(a,b,c,d,e,f,g){var h=O.createEvent("Event"),i=(a||b[M]).options,j="on"+c.charAt(0).toUpperCase()+c.substr(1);h.initEvent(c,!0,!0),h.to=b,h.from=e||b,h.item=d||b,h.clone=w,h.oldIndex=f,h.newIndex=g,b.dispatchEvent(h),i[j]&&i[j].call(a,h)}function k(a,b,c,d,e,f){var g,h,i=a[M],j=i.options.onMove;return g=O.createEvent("Event"),g.initEvent("move",!0,!0),g.to=b,g.from=a,g.dragged=c,g.draggedRect=d,g.related=e||b,g.relatedRect=f||b.getBoundingClientRect(),a.dispatchEvent(g),j&&(h=j.call(i,g)),h}function l(a){a.draggable=!1}function m(){S=!1}function n(a,b){var c=a.lastElementChild,d=c.getBoundingClientRect();return(b.clientY-(d.top+d.height)>5||b.clientX-(d.right+d.width)>5)&&c}function o(a){for(var b=a.tagName+a.className+a.src+a.href+a.textContent,c=b.length,d=0;c--;)d+=b.charCodeAt(c);return d.toString(36)}function p(a,b){var c=0;if(!a||!a.parentNode)return-1;for(;a&&(a=a.previousElementSibling);)"TEMPLATE"!==a.nodeName.toUpperCase()&&q(a,b)&&c++;return c}function q(a,b){if(a){b=b.split(".");var c=b.shift().toUpperCase(),d=new RegExp("\\s("+b.join("|")+")(?=\\s)","g");return!(""!==c&&a.nodeName.toUpperCase()!=c||b.length&&((" "+a.className+" ").match(d)||[]).length!=b.length)}return!1}function r(a,b){var c,d;return function(){void 0===c&&(c=arguments,d=this,setTimeout(function(){1===c.length?a.call(d,c[0]):a.apply(d,c),c=void 0},b))}}function s(a,b){if(a&&b)for(var c in b)b.hasOwnProperty(c)&&(a[c]=b[c]);return a}if("undefined"==typeof window||"undefined"==typeof window.document)return function(){throw new Error("Sortable.js requires a window with a document")};var t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K={},L=/\s+/g,M="Sortable"+(new Date).getTime(),N=window,O=N.document,P=N.parseInt,Q=!!("draggable"in O.createElement("div")),R=function(a){return a=O.createElement("x"),a.style.cssText="pointer-events:auto","auto"===a.style.pointerEvents}(),S=!1,T=Math.abs,U=([].slice,[]),V=r(function(a,b,c){if(c&&b.scroll){var d,e,f,g,h=b.scrollSensitivity,i=b.scrollSpeed,j=a.clientX,k=a.clientY,l=window.innerWidth,m=window.innerHeight;if(A!==c&&(z=b.scroll,A=c,z===!0)){z=c;do if(z.offsetWidth<z.scrollWidth||z.offsetHeight<z.scrollHeight)break;while(z=z.parentNode)}z&&(d=z,e=z.getBoundingClientRect(),f=(T(e.right-j)<=h)-(T(e.left-j)<=h),g=(T(e.bottom-k)<=h)-(T(e.top-k)<=h)),f||g||(f=(h>=l-j)-(h>=j),g=(h>=m-k)-(h>=k),(f||g)&&(d=N)),(K.vx!==f||K.vy!==g||K.el!==d)&&(K.el=d,K.vx=f,K.vy=g,clearInterval(K.pid),d&&(K.pid=setInterval(function(){d===N?N.scrollTo(N.pageXOffset+f*i,N.pageYOffset+g*i):(g&&(d.scrollTop+=g*i),f&&(d.scrollLeft+=f*i))},24)))}},30),W=function(a){var b=a.group;b&&"object"==typeof b||(b=a.group={name:b}),["pull","put"].forEach(function(a){a in b||(b[a]=!0)}),a.groups=" "+b.name+(b.put.join?" "+b.put.join(" "):"")+" "};return a.prototype={constructor:a,_onTapStart:function(a){var b=this,d=this.el,e=this.options,f=a.type,g=a.touches&&a.touches[0],h=(g||a).target,i=h,k=e.filter;if(!("mousedown"===f&&0!==a.button||e.disabled)&&(h=c(h,e.draggable,d))){if(E=p(h,e.draggable),"function"==typeof k){if(k.call(this,a,h,this))return j(b,i,"filter",h,d,E),void a.preventDefault()}else if(k&&(k=k.split(",").some(function(a){return a=c(i,a.trim(),d),a?(j(b,a,"filter",h,d,E),!0):void 0})))return void a.preventDefault();(!e.handle||c(i,e.handle,d))&&this._prepareDragStart(a,g,h)}},_prepareDragStart:function(a,b,c){var d,f=this,h=f.el,j=f.options,k=h.ownerDocument;c&&!t&&c.parentNode===h&&(H=a,x=h,t=c,u=t.parentNode,y=t.nextSibling,G=j.group,d=function(){f._disableDelayedDrag(),t.draggable=!0,g(t,f.options.chosenClass,!0),f._triggerDragStart(b)},j.ignore.split(",").forEach(function(a){i(t,a.trim(),l)}),e(k,"mouseup",f._onDrop),e(k,"touchend",f._onDrop),e(k,"touchcancel",f._onDrop),j.delay?(e(k,"mouseup",f._disableDelayedDrag),e(k,"touchend",f._disableDelayedDrag),e(k,"touchcancel",f._disableDelayedDrag),e(k,"mousemove",f._disableDelayedDrag),e(k,"touchmove",f._disableDelayedDrag),f._dragStartTimer=setTimeout(d,j.delay)):d())},_disableDelayedDrag:function(){var a=this.el.ownerDocument;clearTimeout(this._dragStartTimer),f(a,"mouseup",this._disableDelayedDrag),f(a,"touchend",this._disableDelayedDrag),f(a,"touchcancel",this._disableDelayedDrag),f(a,"mousemove",this._disableDelayedDrag),f(a,"touchmove",this._disableDelayedDrag)},_triggerDragStart:function(a){a?(H={target:t,clientX:a.clientX,clientY:a.clientY},this._onDragStart(H,"touch")):this.nativeDraggable?(e(t,"dragend",this),e(x,"dragstart",this._onDragStart)):this._onDragStart(H,!0);try{O.selection?setTimeout(function(){O.selection.empty()}):window.getSelection().removeAllRanges()}catch(b){}},_dragStarted:function(){x&&t&&(g(t,this.options.ghostClass,!0),a.active=this,j(this,x,"start",t,x,E))},_emulateDragOver:function(){if(I){if(this._lastX===I.clientX&&this._lastY===I.clientY)return;this._lastX=I.clientX,this._lastY=I.clientY,R||h(v,"display","none");var a=O.elementFromPoint(I.clientX,I.clientY),b=a,c=" "+this.options.group.name,d=U.length;if(b)do{if(b[M]&&b[M].options.groups.indexOf(c)>-1){for(;d--;)U[d]({clientX:I.clientX,clientY:I.clientY,target:a,rootEl:b});break}a=b}while(b=b.parentNode);R||h(v,"display","")}},_onTouchMove:function(b){if(H){a.active||this._dragStarted(),this._appendGhost();var c=b.touches?b.touches[0]:b,d=c.clientX-H.clientX,e=c.clientY-H.clientY,f=b.touches?"translate3d("+d+"px,"+e+"px,0)":"translate("+d+"px,"+e+"px)";J=!0,I=c,h(v,"webkitTransform",f),h(v,"mozTransform",f),h(v,"msTransform",f),h(v,"transform",f),b.preventDefault()}},_appendGhost:function(){if(!v){var a,b=t.getBoundingClientRect(),c=h(t),d=this.options;v=t.cloneNode(!0),g(v,d.ghostClass,!1),g(v,d.fallbackClass,!0),h(v,"top",b.top-P(c.marginTop,10)),h(v,"left",b.left-P(c.marginLeft,10)),h(v,"width",b.width),h(v,"height",b.height),h(v,"opacity","0.8"),h(v,"position","fixed"),h(v,"zIndex","100000"),h(v,"pointerEvents","none"),d.fallbackOnBody&&O.body.appendChild(v)||x.appendChild(v),a=v.getBoundingClientRect(),h(v,"width",2*b.width-a.width),h(v,"height",2*b.height-a.height)}},_onDragStart:function(a,b){var c=a.dataTransfer,d=this.options;this._offUpEvents(),"clone"==G.pull&&(w=t.cloneNode(!0),h(w,"display","none"),x.insertBefore(w,t)),b?("touch"===b?(e(O,"touchmove",this._onTouchMove),e(O,"touchend",this._onDrop),e(O,"touchcancel",this._onDrop)):(e(O,"mousemove",this._onTouchMove),e(O,"mouseup",this._onDrop)),this._loopId=setInterval(this._emulateDragOver,50)):(c&&(c.effectAllowed="move",d.setData&&d.setData.call(this,c,t)),e(O,"drop",this),setTimeout(this._dragStarted,0))},_onDragOver:function(a){var d,e,f,g=this.el,i=this.options,j=i.group,l=j.put,o=G===j,p=i.sort;if(void 0!==a.preventDefault&&(a.preventDefault(),!i.dragoverBubble&&a.stopPropagation()),J=!0,G&&!i.disabled&&(o?p||(f=!x.contains(t)):G.pull&&l&&(G.name===j.name||l.indexOf&&~l.indexOf(G.name)))&&(void 0===a.rootEl||a.rootEl===this.el)){if(V(a,i,this.el),S)return;if(d=c(a.target,i.draggable,g),e=t.getBoundingClientRect(),f)return b(!0),void(w||y?x.insertBefore(t,w||y):p||x.appendChild(t));if(0===g.children.length||g.children[0]===v||g===a.target&&(d=n(g,a))){if(d){if(d.animated)return;r=d.getBoundingClientRect()}b(o),k(x,g,t,e,d,r)!==!1&&(t.contains(g)||(g.appendChild(t),u=g),this._animate(e,t),d&&this._animate(r,d))}else if(d&&!d.animated&&d!==t&&void 0!==d.parentNode[M]){B!==d&&(B=d,C=h(d),D=h(d.parentNode));var q,r=d.getBoundingClientRect(),s=r.right-r.left,z=r.bottom-r.top,A=/left|right|inline/.test(C.cssFloat+C.display)||"flex"==D.display&&0===D["flex-direction"].indexOf("row"),E=d.offsetWidth>t.offsetWidth,F=d.offsetHeight>t.offsetHeight,H=(A?(a.clientX-r.left)/s:(a.clientY-r.top)/z)>.5,I=d.nextElementSibling,K=k(x,g,t,e,d,r);if(K!==!1){if(S=!0,setTimeout(m,30),b(o),1===K||-1===K)q=1===K;else if(A){var L=t.offsetTop,N=d.offsetTop;q=L===N?d.previousElementSibling===t&&!E||H&&E:N>L}else q=I!==t&&!F||H&&F;t.contains(g)||(q&&!I?g.appendChild(t):d.parentNode.insertBefore(t,q?I:d)),u=t.parentNode,this._animate(e,t),this._animate(r,d)}}}},_animate:function(a,b){var c=this.options.animation;if(c){var d=b.getBoundingClientRect();h(b,"transition","none"),h(b,"transform","translate3d("+(a.left-d.left)+"px,"+(a.top-d.top)+"px,0)"),b.offsetWidth,h(b,"transition","all "+c+"ms"),h(b,"transform","translate3d(0,0,0)"),clearTimeout(b.animated),b.animated=setTimeout(function(){h(b,"transition",""),h(b,"transform",""),b.animated=!1},c)}},_offUpEvents:function(){var a=this.el.ownerDocument;f(O,"touchmove",this._onTouchMove),f(a,"mouseup",this._onDrop),f(a,"touchend",this._onDrop),f(a,"touchcancel",this._onDrop)},_onDrop:function(b){var c=this.el,d=this.options;clearInterval(this._loopId),clearInterval(K.pid),clearTimeout(this._dragStartTimer),f(O,"mousemove",this._onTouchMove),this.nativeDraggable&&(f(O,"drop",this),f(c,"dragstart",this._onDragStart)),this._offUpEvents(),b&&(J&&(b.preventDefault(),!d.dropBubble&&b.stopPropagation()),v&&v.parentNode.removeChild(v),t&&(this.nativeDraggable&&f(t,"dragend",this),l(t),g(t,this.options.ghostClass,!1),g(t,this.options.chosenClass,!1),x!==u?(F=p(t,d.draggable),F>=0&&(j(null,u,"sort",t,x,E,F),j(this,x,"sort",t,x,E,F),j(null,u,"add",t,x,E,F),j(this,x,"remove",t,x,E,F))):(w&&w.parentNode.removeChild(w),t.nextSibling!==y&&(F=p(t,d.draggable),F>=0&&(j(this,x,"update",t,x,E,F),j(this,x,"sort",t,x,E,F)))),a.active&&((null==F||-1===F)&&(F=E),j(this,x,"end",t,x,E,F),this.save()))),this._nulling()},_nulling:function(){a.active===this&&(x=t=u=v=y=w=z=A=H=I=J=F=B=C=G=a.active=null)},handleEvent:function(a){var b=a.type;"dragover"===b||"dragenter"===b?t&&(this._onDragOver(a),d(a)):("drop"===b||"dragend"===b)&&this._onDrop(a)},toArray:function(){for(var a,b=[],d=this.el.children,e=0,f=d.length,g=this.options;f>e;e++)a=d[e],c(a,g.draggable,this.el)&&b.push(a.getAttribute(g.dataIdAttr)||o(a));return b},sort:function(a){var b={},d=this.el;this.toArray().forEach(function(a,e){var f=d.children[e];c(f,this.options.draggable,d)&&(b[a]=f)},this),a.forEach(function(a){b[a]&&(d.removeChild(b[a]),d.appendChild(b[a]))})},save:function(){var a=this.options.store;a&&a.set(this)},closest:function(a,b){return c(a,b||this.options.draggable,this.el)},option:function(a,b){var c=this.options;return void 0===b?c[a]:(c[a]=b,void("group"===a&&W(c)))},destroy:function(){var a=this.el;a[M]=null,f(a,"mousedown",this._onTapStart),f(a,"touchstart",this._onTapStart),this.nativeDraggable&&(f(a,"dragover",this),f(a,"dragenter",this)),Array.prototype.forEach.call(a.querySelectorAll("[draggable]"),function(a){a.removeAttribute("draggable")}),U.splice(U.indexOf(this._onDragOver),1),this._onDrop(),this.el=a=null}},a.utils={on:e,off:f,css:h,find:i,is:function(a,b){return!!c(a,b,a)},extend:s,throttle:r,closest:c,toggleClass:g,index:p},a.create=function(b,c){return new a(b,c)},a.version="1.4.2",a});

data/app/assets/stylesheets/guts/application.scss

@@ -241,11 +241,29 @@ textarea.tinymce {
 }
 
 /* Navigation */
-.nav_block .callout ul {
-  list-style: none;
+.nav_block {
+  .callout ul {
+    list-style: none;
 
-  li {
-    padding: 0.3rem 0;
+    li {
+      padding: 0.3rem 0;
+    }
+  }
+
+  .action_links {
+    float: right;
+  }
+}
+
+.sortable {
+  .handle {
+    margin-right: 5px;
+    cursor: move;
+  }
+
+  .sortable-ghost,
+  .sortable-chosen {
+    opacity: 0.4;
   }
 }
 

data/app/controllers/guts/navigations_controller.rb

@@ -3,7 +3,7 @@ require_dependency 'guts/application_controller'
 module Guts
   # Navigations ontroller
   class NavigationsController < ApplicationController
-    before_action :set_navigation, only: [:show, :edit, :update, :destroy]
+    before_action :set_navigation, only: [:show, :edit, :update, :destroy, :reorder]
 
     # Displays a list of navigations
     def index
@@ -51,13 +51,26 @@ module Guts
     # @note Redirects to #index on success
     def destroy
       @navigation.destroy
-      
+
       flash[:notice] = 'Navigation was successfully destroyed.'
       redirect_to navigations_path
     end
 
+    # Updates sorting for a navigation
+    # @note This is an AJAX call
+    def reorder
+      ActiveRecord::Base.transaction do
+        @navigation.navigation_items.each do |item|
+          find = params[:order].find { |k, v| v == item.id.to_s }
+          item.update_attribute(:position, find[0].to_i)
+        end
+      end
+
+      render nothing: true, status: :ok
+    end
+
     private
-    
+
     # Sets a navigation from the database using `id` param
     # @note This is a `before_action` callback
     # @private

data/app/models/guts/navigation_item.rb

@@ -2,19 +2,32 @@ module Guts
   # Navigation item model
   class NavigationItem < ActiveRecord::Base
     include MultisiteScopeConcern
-    
+
+    before_create :set_position
+
     validates :title, presence: true
-    
+
     belongs_to :site
     belongs_to :navigation
     belongs_to :navigatable, polymorphic: true, required: false
     has_many :media, as: :filable, dependent: :destroy
     has_many :metafields, as: :fieldable, dependent: :destroy
-    
+
+    default_scope { order(position: :asc) }
+
     # Determines if the navigation item has a custom link
     # @return [Boolean]
     def custom?
       self[:navigatable_type].nil? || self[:navigatable_type].empty?
     end
+
+    private
+
+    # Sets the position (ordering) for a navigation item before creation
+    def set_position
+      max_position = Navigation.find(self[:navigation_id]).navigation_items.maximum(:position) || -1
+
+      self[:position] = max_position + 1
+    end
   end
 end

data/app/views/guts/navigation_items/index.html.erb

@@ -20,10 +20,10 @@
   <div class="small-12 columns">
     <% if @navigation_items.size > 0 %>
       <table>
-        <tbody>
+        <tbody class="sortable" data-url="<%= reorder_navigation_path @navigation %>">
           <% @navigation_items.each do |navigation_item| %>
-            <tr>
-              <td><%= navigation_item.title %></td>
+            <tr class="item" data-id="<%= navigation_item.id %>">
+              <td><i class="handle fa fa-reorder"></i> <%= navigation_item.title %></td>
               <td>
                 <small>
                   to: <%= navigation_item.custom? ? 'Custom' : navigation_item.navigatable.navigatable_format %> <%= "(#{navigation_item.custom})" if navigation_item.custom? %>

data/app/views/guts/navigations/index.html.erb

@@ -26,10 +26,11 @@
             <%= link_to 'Edit', edit_navigation_path(navigation), { class: 'warning button' } %>
             <%= link_to_destroy 'Destroy', navigation, { class: 'alert button' } %>
           </div>
-          <ul>
+          <ul class="sortable" data-url="<%= reorder_navigation_path navigation %>">
             <% if navigation.navigation_items.size > 0 %>
               <% navigation.navigation_items.each do |item| %>
-                <li>
+                <li class="item" data-id="<%= item.id %>">
+                  <i class="handle fa fa-reorder"></i>
                   <%= item.title %>&nbsp;&nbsp;&mdash;&gt;&nbsp;&nbsp;<%= item.custom? ? 'Custom' : item.navigatable.navigatable_format %> <%= "to: #{item.custom}" if item.custom? %>
                   <div class="action_links">
                     <%= link_to 'Edit', edit_navigation_navigation_item_path(navigation, item) %>

data/config/routes.rb

@@ -2,85 +2,87 @@ Guts::Engine.routes.draw do
   # Master concerns... everything can have a metafield and file attached to it
   concern(:fieldable) {|opts| resources :metafields, opts}
   concern(:filable) {|opts| resources :media, opts}
-  
+
   # Resources and routes
-  get "/", to: "users#index"
-  
+  get '/', to: 'users#index'
+
   # Sites
   resources :sites do
     get :set_default, on: :member
     get :remove_default, on: :member
   end
-  
+
   # Media
   resources :media do
     get :editor_insert, on: :member
   end
-  
+
   # Users
   resources :users do
-    concerns :fieldable, fieldable_type: "Guts::User"
-    concerns :filable, filable_type: "Guts::User"
-    
+    concerns :fieldable, fieldable_type: 'Guts::User'
+    concerns :filable, filable_type: 'Guts::User'
+
     match :switch_user, on: :collection, via: [:get, :post]
   end
-  
+
   # Groups
   resources :groups do
-    concerns :fieldable, fieldable_type: "Guts::Group"
-    concerns :filable, filable_type: "Guts::Group"
+    concerns :fieldable, fieldable_type: 'Guts::Group'
+    concerns :filable, filable_type: 'Guts::Group'
   end
-  
+
   # Categories
   resources :categories do
-    concerns :fieldable, fieldable_type: "Guts::Category"
-    concerns :filable, filable_type: "Guts::Category"
+    concerns :fieldable, fieldable_type: 'Guts::Category'
+    concerns :filable, filable_type: 'Guts::Category'
   end
-  
+
   # Types
   resources :types do
-    concerns :fieldable, fieldable_type: "Guts::Type"
-    concerns :filable, filable_type: "Guts::Type"
+    concerns :fieldable, fieldable_type: 'Guts::Type'
+    concerns :filable, filable_type: 'Guts::Type'
   end
-  
+
   # Contents
   resources :contents do
-    concerns :fieldable, fieldable_type: "Guts::Content"
-    concerns :filable, filable_type: "Guts::Content"
+    concerns :fieldable, fieldable_type: 'Guts::Content'
+    concerns :filable, filable_type: 'Guts::Content'
   end
-  
+
   # Navigations
   resources :navigations do
-    concerns :fieldable, fieldable_type: "Guts::Navigation"
-    concerns :filable, filable_type: "Guts::Navigation"
-    
+    concerns :fieldable, fieldable_type: 'Guts::Navigation'
+    concerns :filable, filable_type: 'Guts::Navigation'
+
     resources :navigation_items, path: :items do
-      concerns :fieldable, fieldable_type: "Guts::NavigationItem"
-      concerns :filable, filable_type: "Guts::NavigationItem"
+      concerns :fieldable, fieldable_type: 'Guts::NavigationItem'
+      concerns :filable, filable_type: 'Guts::NavigationItem'
     end
+
+    post '/reorder', to: 'navigations#reorder', on: :member
   end
-  
+
   # Navigation Items
   resources :navigation_items do
-    concerns :fieldable, fieldable_type: "Guts::NavigationItem"
-    concerns :filable, filable_type: "Guts::NavigationItem"
-    
+    concerns :fieldable, fieldable_type: 'Guts::NavigationItem'
+    concerns :filable, filable_type: 'Guts::NavigationItem'
+
     get :navigatable_objects, on: :collection
   end
-  
+
   # Options
   resources :options
-  
+
   # Session
   scope :session do
-    get :login, to: "sessions#new", as: :new_session
-    post :login, to: "sessions#create", as: :create_session
-    get :logout, to: "sessions#destroy", as: :destroy_session
-    get :forgot, to: "sessions#forgot", as: :forgot_session
-    post :forgot_token, to: "sessions#forgot_token", as: :forgot_token_session
-    get "/reset_password/:token", to: "sessions#reset_password", as: :reset_password_session
+    get :login, to: 'sessions#new', as: :new_session
+    post :login, to: 'sessions#create', as: :create_session
+    get :logout, to: 'sessions#destroy', as: :destroy_session
+    get :forgot, to: 'sessions#forgot', as: :forgot_session
+    post :forgot_token, to: 'sessions#forgot_token', as: :forgot_token_session
+    get '/reset_password/:token', to: 'sessions#reset_password', as: :reset_password_session
   end
-  
+
   # Tracker/Log
-  get :trackers, to: "trackers#index"
+  get :trackers, to: 'trackers#index'
 end