From 54c7e4e5c0ce00a47418c42fc207b4ace3573eb4 Mon Sep 17 00:00:00 2001 From: Tom Dallimore Date: Wed, 27 Jul 2016 00:59:45 +0700 Subject: [PATCH] Refactored to be more dry for soca asset. --- app/assets/javascripts/trado.ready.js | 8 +++++--- app/views/admin/orders/index.html.erb | 2 +- app/views/admin/products/stock/index.html.erb | 2 +- vendor/assets/javascripts/admin/soca.js | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/trado.ready.js b/app/assets/javascripts/trado.ready.js index 3279b8c5e..c3907b7d9 100644 --- a/app/assets/javascripts/trado.ready.js +++ b/app/assets/javascripts/trado.ready.js @@ -6,9 +6,11 @@ ready = function() soca.animation.colourCaveat(); soca.animation.sidebarExtension(); - soca.filter.tableRowTarget(); - soca.filter.products(); - soca.filter.orders(); + soca.index.tableRowTarget(); + soca.index.sort('#sort-product'); + soca.index.filter('#filter-product-category'); + soca.index.filter('#filter-stock'); + soca.index.filter('#filter-order-delivery'); soca.misc.taxField(); soca.misc.multiSelect(); diff --git a/app/views/admin/orders/index.html.erb b/app/views/admin/orders/index.html.erb index 67916eb5f..e4aed2229 100644 --- a/app/views/admin/orders/index.html.erb +++ b/app/views/admin/orders/index.html.erb @@ -7,7 +7,7 @@

Orders

- diff --git a/app/views/admin/products/stock/index.html.erb b/app/views/admin/products/stock/index.html.erb index 8bc94e7f1..0479405cf 100644 --- a/app/views/admin/products/stock/index.html.erb +++ b/app/views/admin/products/stock/index.html.erb @@ -7,7 +7,7 @@

Stock management

- diff --git a/vendor/assets/javascripts/admin/soca.js b/vendor/assets/javascripts/admin/soca.js index d8212bc53..c871a7976 100644 --- a/vendor/assets/javascripts/admin/soca.js +++ b/vendor/assets/javascripts/admin/soca.js @@ -2,5 +2,5 @@ for(var f=0;fg;)h=d[g],g++;return a!==b?a[e]!==b?a[e]:a:void 0};return a?c._execFilter("getOption",d(c,a),arguments):c},setOptions:function(b){var c=this;c._execAction("setOptions",0,arguments),"object"==typeof b&&a.extend(!0,c,b),c._execAction("setOptions",1,arguments)},getState:function(){var a=this;return a._execFilter("getState",a._state,a)},forceRefresh:function(){var a=this;a._refresh(!1,!0)},destroy:function(b){var c=this,d=a.MixItUp.prototype._bound._filter,e=a.MixItUp.prototype._bound._sort;c._execAction("destroy",0,arguments),c._$body.add(a(c.selectors.sort)).add(a(c.selectors.filter)).off(".mixItUp");for(var f=0;f1?d[c.selectors.filter]--:1===d[c.selectors.filter]&&delete d[c.selectors.filter],e[c.selectors.sort]&&e[c.selectors.sort]>1?e[c.selectors.sort]--:1===e[c.selectors.sort]&&delete e[c.selectors.sort],delete a.MixItUp.prototype._instances[c._id]}},a.fn.mixItUp=function(){var c,d=arguments,e=[],f=function(b,c){var d=new a.MixItUp,e=function(){return("00000"+(16777216*Math.random()<<0).toString(16)).substr(-6).toUpperCase()};d._execAction("_instantiate",0,arguments),b.id=b.id?b.id:"MixItUp"+e(),d._instances[b.id]||(d._instances[b.id]=d,d._init(b,c)),d._execAction("_instantiate",1,arguments)};return c=this.each(function(){if(d&&"string"==typeof d[0]){var c=a.MixItUp.prototype._instances[this.id];if("isLoaded"===d[0])e.push(c?!0:!1);else{var g=c[d[0]](d[1],d[2],d[3]);g!==b&&e.push(g)}}else f(this,d[0])}),e.length?e.length>1?e:e[0]:c},a.fn.removeStyle=function(c,d){return d=d?d:"",this.each(function(){for(var e=this,f=c.split(" "),g=0;gh;h++){switch(h){case 0:var i=f[g];break;case 1:var i=a.MixItUp.prototype._helpers._camelCase(i);break;case 2:var i=d+f[g];break;case 3:var i=a.MixItUp.prototype._helpers._camelCase(d+f[g])}if(e.style[i]!==b&&"unknown"!=typeof e.style[i]&&e.style[i].length>0&&(e.style[i]=""),!d&&1===h)break}e.attributes&&e.attributes.style&&e.attributes.style!==b&&""===e.attributes.style.value&&e.attributes.removeNamedItem("style")})}}(jQuery),+function(a){function b(b){a(d).remove(),a(e).each(function(){var d=c(a(this)),e={relatedTarget:this};d.hasClass("open")&&(d.trigger(b=a.Event("hide.bs.dropdown",e)),b.isDefaultPrevented()||d.removeClass("open").trigger("hidden.bs.dropdown",e))})}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}var d=".dropdown-backdrop",e="[data-toggle=dropdown]",f=function(b){a(b).on("click.bs.dropdown",this.toggle)};f.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('