Shortcodes by Angie Makes - Version 1.36

Version Description

Download this release

Release Info

Developer cbaldelomar
Plugin Icon wp plugin Shortcodes by Angie Makes
Version 1.36
Comparing to
See all releases

Code changes from version 1.35 to 1.36

Files changed (14) hide show
  1. README.md +6 -1
  2. includes/css/style.css +1 -35
  3. includes/js/imagesloaded.pkgd.min.js +7 -0
  4. includes/js/masonry.pkgd.min.js +9 -0
  5. includes/js/posts.js +94 -105
  6. includes/js/slider.js +0 -29
  7. includes/mce/js/shortcodes-tinymce-4.js +1 -1
  8. includes/scripts.php +10 -3
  9. includes/shortcode-functions.php +11 -3
  10. includes/templates/index.php +1 -1
  11. includes/templates/nav-filtering.php +1 -1
  12. includes/templates/nav-pagination.php +2 -2
  13. readme.txt +6 -1
  14. wc-shortcodes.php +2 -2
README.md CHANGED
@@ -1,4 +1,4 @@
1
- # WordPress Canvas - Shortcodes #
2
 
3
  **Contributors:** cbaldelomar
4
  **Donate link:** http://webplantmedia.com/donate/
@@ -66,6 +66,11 @@ Use the shortcode manager in the TinyMCE text editor
66
 
67
  ## Changelog ##
68
 
 
 
 
 
 
69
  ### Version 1.35
70
 
71
  * wc_box short code needed line breaks inserted
1
+ # WP Canvas - Shortcodes #
2
 
3
  **Contributors:** cbaldelomar
4
  **Donate link:** http://webplantmedia.com/donate/
66
 
67
  ## Changelog ##
68
 
69
+ ### Version 1.36
70
+
71
+ * switched out isotope library with open source masonry library
72
+ * Increased number of pagination buttons
73
+
74
  ### Version 1.35
75
 
76
  * wc_box short code needed line breaks inserted
includes/css/style.css CHANGED
@@ -1273,41 +1273,7 @@ pre.pre-wrap {
1273
  text-decoration: none;
1274
  }
1275
 
1276
- /* Isotopes */
1277
- .wc-shortcodes-posts.wc-shortcodes-posts-animation,
1278
- .wc-shortcodes-posts.wc-shortcodes-posts-animation .wc-shortcodes-post-box {
1279
- -webkit-transition-duration: 0.8s;
1280
- -moz-transition-duration: 0.8s;
1281
- -ms-transition-duration: 0.8s;
1282
- -o-transition-duration: 0.8s;
1283
- transition-duration: 0.8s;
1284
- }
1285
- .isotope-item {
1286
- z-index: 2;
1287
- }
1288
-
1289
- .isotope-hidden.isotope-item {
1290
- pointer-events: none;
1291
- z-index: 1;
1292
- }
1293
-
1294
- .wc-shortcodes-posts.wc-shortcodes-posts-animation {
1295
- -webkit-transition-property: height, width;
1296
- -moz-transition-property: height, width;
1297
- -ms-transition-property: height, width;
1298
- -o-transition-property: height, width;
1299
- transition-property: height, width;
1300
- }
1301
-
1302
- .wc-shortcodes-posts.wc-shortcodes-posts-animation .wc-shortcodes-post-box {
1303
- -webkit-transition-property: -webkit-transform, opacity;
1304
- -moz-transition-property: -moz-transform, opacity;
1305
- -ms-transition-property: -ms-transform, opacity;
1306
- -o-transition-property: -o-transform, opacity;
1307
- transition-property: transform, opacity;
1308
- }
1309
-
1310
- /* isotope filtering */
1311
  .wc-shortcodes-filtering {
1312
  margin-bottom: 20px;
1313
  }
1273
  text-decoration: none;
1274
  }
1275
 
1276
+ /* masonry filtering */
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1277
  .wc-shortcodes-filtering {
1278
  margin-bottom: 20px;
1279
  }
includes/js/imagesloaded.pkgd.min.js ADDED
@@ -0,0 +1,7 @@
 
 
 
 
 
 
 
1
+ /*!
2
+ * imagesLoaded PACKAGED v3.1.5
3
+ * JavaScript is all like "You images are done yet or what?"
4
+ * MIT License
5
+ */
6
+
7
+ (function(){function e(){}function t(e,t){for(var n=e.length;n--;)if(e[n].listener===t)return n;return-1}function n(e){return function(){return this[e].apply(this,arguments)}}var i=e.prototype,r=this,o=r.EventEmitter;i.getListeners=function(e){var t,n,i=this._getEvents();if("object"==typeof e){t={};for(n in i)i.hasOwnProperty(n)&&e.test(n)&&(t[n]=i[n])}else t=i[e]||(i[e]=[]);return t},i.flattenListeners=function(e){var t,n=[];for(t=0;e.length>t;t+=1)n.push(e[t].listener);return n},i.getListenersAsObject=function(e){var t,n=this.getListeners(e);return n instanceof Array&&(t={},t[e]=n),t||n},i.addListener=function(e,n){var i,r=this.getListenersAsObject(e),o="object"==typeof n;for(i in r)r.hasOwnProperty(i)&&-1===t(r[i],n)&&r[i].push(o?n:{listener:n,once:!1});return this},i.on=n("addListener"),i.addOnceListener=function(e,t){return this.addListener(e,{listener:t,once:!0})},i.once=n("addOnceListener"),i.defineEvent=function(e){return this.getListeners(e),this},i.defineEvents=function(e){for(var t=0;e.length>t;t+=1)this.defineEvent(e[t]);return this},i.removeListener=function(e,n){var i,r,o=this.getListenersAsObject(e);for(r in o)o.hasOwnProperty(r)&&(i=t(o[r],n),-1!==i&&o[r].splice(i,1));return this},i.off=n("removeListener"),i.addListeners=function(e,t){return this.manipulateListeners(!1,e,t)},i.removeListeners=function(e,t){return this.manipulateListeners(!0,e,t)},i.manipulateListeners=function(e,t,n){var i,r,o=e?this.removeListener:this.addListener,s=e?this.removeListeners:this.addListeners;if("object"!=typeof t||t instanceof RegExp)for(i=n.length;i--;)o.call(this,t,n[i]);else for(i in t)t.hasOwnProperty(i)&&(r=t[i])&&("function"==typeof r?o.call(this,i,r):s.call(this,i,r));return this},i.removeEvent=function(e){var t,n=typeof e,i=this._getEvents();if("string"===n)delete i[e];else if("object"===n)for(t in i)i.hasOwnProperty(t)&&e.test(t)&&delete i[t];else delete this._events;return this},i.removeAllListeners=n("removeEvent"),i.emitEvent=function(e,t){var n,i,r,o,s=this.getListenersAsObject(e);for(r in s)if(s.hasOwnProperty(r))for(i=s[r].length;i--;)n=s[r][i],n.once===!0&&this.removeListener(e,n.listener),o=n.listener.apply(this,t||[]),o===this._getOnceReturnValue()&&this.removeListener(e,n.listener);return this},i.trigger=n("emitEvent"),i.emit=function(e){var t=Array.prototype.slice.call(arguments,1);return this.emitEvent(e,t)},i.setOnceReturnValue=function(e){return this._onceReturnValue=e,this},i._getOnceReturnValue=function(){return this.hasOwnProperty("_onceReturnValue")?this._onceReturnValue:!0},i._getEvents=function(){return this._events||(this._events={})},e.noConflict=function(){return r.EventEmitter=o,e},"function"==typeof define&&define.amd?define("eventEmitter/EventEmitter",[],function(){return e}):"object"==typeof module&&module.exports?module.exports=e:this.EventEmitter=e}).call(this),function(e){function t(t){var n=e.event;return n.target=n.target||n.srcElement||t,n}var n=document.documentElement,i=function(){};n.addEventListener?i=function(e,t,n){e.addEventListener(t,n,!1)}:n.attachEvent&&(i=function(e,n,i){e[n+i]=i.handleEvent?function(){var n=t(e);i.handleEvent.call(i,n)}:function(){var n=t(e);i.call(e,n)},e.attachEvent("on"+n,e[n+i])});var r=function(){};n.removeEventListener?r=function(e,t,n){e.removeEventListener(t,n,!1)}:n.detachEvent&&(r=function(e,t,n){e.detachEvent("on"+t,e[t+n]);try{delete e[t+n]}catch(i){e[t+n]=void 0}});var o={bind:i,unbind:r};"function"==typeof define&&define.amd?define("eventie/eventie",o):e.eventie=o}(this),function(e,t){"function"==typeof define&&define.amd?define(["eventEmitter/EventEmitter","eventie/eventie"],function(n,i){return t(e,n,i)}):"object"==typeof exports?module.exports=t(e,require("eventEmitter"),require("eventie")):e.imagesLoaded=t(e,e.EventEmitter,e.eventie)}(this,function(e,t,n){function i(e,t){for(var n in t)e[n]=t[n];return e}function r(e){return"[object Array]"===d.call(e)}function o(e){var t=[];if(r(e))t=e;else if("number"==typeof e.length)for(var n=0,i=e.length;i>n;n++)t.push(e[n]);else t.push(e);return t}function s(e,t,n){if(!(this instanceof s))return new s(e,t);"string"==typeof e&&(e=document.querySelectorAll(e)),this.elements=o(e),this.options=i({},this.options),"function"==typeof t?n=t:i(this.options,t),n&&this.on("always",n),this.getImages(),a&&(this.jqDeferred=new a.Deferred);var r=this;setTimeout(function(){r.check()})}function c(e){this.img=e}function f(e){this.src=e,v[e]=this}var a=e.jQuery,u=e.console,h=u!==void 0,d=Object.prototype.toString;s.prototype=new t,s.prototype.options={},s.prototype.getImages=function(){this.images=[];for(var e=0,t=this.elements.length;t>e;e++){var n=this.elements[e];if("IMG"===n.nodeName&&this.addImage(n),n.nodeType&&(1===n.nodeType||9===n.nodeType))for(var i=n.querySelectorAll("img"),r=0,o=i.length;o>r;r++){var s=i[r];this.addImage(s)}}},s.prototype.addImage=function(e){var t=new c(e);this.images.push(t)},s.prototype.check=function(){function e(e,r){return t.options.debug&&h&&u.log("confirm",e,r),t.progress(e),n++,n===i&&t.complete(),!0}var t=this,n=0,i=this.images.length;if(this.hasAnyBroken=!1,!i)return this.complete(),void 0;for(var r=0;i>r;r++){var o=this.images[r];o.on("confirm",e),o.check()}},s.prototype.progress=function(e){this.hasAnyBroken=this.hasAnyBroken||!e.isLoaded;var t=this;setTimeout(function(){t.emit("progress",t,e),t.jqDeferred&&t.jqDeferred.notify&&t.jqDeferred.notify(t,e)})},s.prototype.complete=function(){var e=this.hasAnyBroken?"fail":"done";this.isComplete=!0;var t=this;setTimeout(function(){if(t.emit(e,t),t.emit("always",t),t.jqDeferred){var n=t.hasAnyBroken?"reject":"resolve";t.jqDeferred[n](t)}})},a&&(a.fn.imagesLoaded=function(e,t){var n=new s(this,e,t);return n.jqDeferred.promise(a(this))}),c.prototype=new t,c.prototype.check=function(){var e=v[this.img.src]||new f(this.img.src);if(e.isConfirmed)return this.confirm(e.isLoaded,"cached was confirmed"),void 0;if(this.img.complete&&void 0!==this.img.naturalWidth)return this.confirm(0!==this.img.naturalWidth,"naturalWidth"),void 0;var t=this;e.on("confirm",function(e,n){return t.confirm(e.isLoaded,n),!0}),e.check()},c.prototype.confirm=function(e,t){this.isLoaded=e,this.emit("confirm",this,t)};var v={};return f.prototype=new t,f.prototype.check=function(){if(!this.isChecked){var e=new Image;n.bind(e,"load",this),n.bind(e,"error",this),e.src=this.src,this.isChecked=!0}},f.prototype.handleEvent=function(e){var t="on"+e.type;this[t]&&this[t](e)},f.prototype.onload=function(e){this.confirm(!0,"onload"),this.unbindProxyEvents(e)},f.prototype.onerror=function(e){this.confirm(!1,"onerror"),this.unbindProxyEvents(e)},f.prototype.confirm=function(e,t){this.isConfirmed=!0,this.isLoaded=e,this.emit("confirm",this,t)},f.prototype.unbindProxyEvents=function(e){n.unbind(e.target,"load",this),n.unbind(e.target,"error",this)},s});
includes/js/masonry.pkgd.min.js ADDED
@@ -0,0 +1,9 @@
 
 
 
 
 
 
 
 
 
1
+ /*!
2
+ * Masonry PACKAGED v3.1.5
3
+ * Cascading grid layout library
4
+ * http://masonry.desandro.com
5
+ * MIT License
6
+ * by David DeSandro
7
+ */
8
+
9
+ !function(a){function b(){}function c(a){function c(b){b.prototype.option||(b.prototype.option=function(b){a.isPlainObject(b)&&(this.options=a.extend(!0,this.options,b))})}function e(b,c){a.fn[b]=function(e){if("string"==typeof e){for(var g=d.call(arguments,1),h=0,i=this.length;i>h;h++){var j=this[h],k=a.data(j,b);if(k)if(a.isFunction(k[e])&&"_"!==e.charAt(0)){var l=k[e].apply(k,g);if(void 0!==l)return l}else f("no such method '"+e+"' for "+b+" instance");else f("cannot call methods on "+b+" prior to initialization; attempted to call '"+e+"'")}return this}return this.each(function(){var d=a.data(this,b);d?(d.option(e),d._init()):(d=new c(this,e),a.data(this,b,d))})}}if(a){var f="undefined"==typeof console?b:function(a){console.error(a)};return a.bridget=function(a,b){c(b),e(a,b)},a.bridget}}var d=Array.prototype.slice;"function"==typeof define&&define.amd?define("jquery-bridget/jquery.bridget",["jquery"],c):c(a.jQuery)}(window),function(a){function b(b){var c=a.event;return c.target=c.target||c.srcElement||b,c}var c=document.documentElement,d=function(){};c.addEventListener?d=function(a,b,c){a.addEventListener(b,c,!1)}:c.attachEvent&&(d=function(a,c,d){a[c+d]=d.handleEvent?function(){var c=b(a);d.handleEvent.call(d,c)}:function(){var c=b(a);d.call(a,c)},a.attachEvent("on"+c,a[c+d])});var e=function(){};c.removeEventListener?e=function(a,b,c){a.removeEventListener(b,c,!1)}:c.detachEvent&&(e=function(a,b,c){a.detachEvent("on"+b,a[b+c]);try{delete a[b+c]}catch(d){a[b+c]=void 0}});var f={bind:d,unbind:e};"function"==typeof define&&define.amd?define("eventie/eventie",f):"object"==typeof exports?module.exports=f:a.eventie=f}(this),function(a){function b(a){"function"==typeof a&&(b.isReady?a():f.push(a))}function c(a){var c="readystatechange"===a.type&&"complete"!==e.readyState;if(!b.isReady&&!c){b.isReady=!0;for(var d=0,g=f.length;g>d;d++){var h=f[d];h()}}}function d(d){return d.bind(e,"DOMContentLoaded",c),d.bind(e,"readystatechange",c),d.bind(a,"load",c),b}var e=a.document,f=[];b.isReady=!1,"function"==typeof define&&define.amd?(b.isReady="function"==typeof requirejs,define("doc-ready/doc-ready",["eventie/eventie"],d)):a.docReady=d(a.eventie)}(this),function(){function a(){}function b(a,b){for(var c=a.length;c--;)if(a[c].listener===b)return c;return-1}function c(a){return function(){return this[a].apply(this,arguments)}}var d=a.prototype,e=this,f=e.EventEmitter;d.getListeners=function(a){var b,c,d=this._getEvents();if(a instanceof RegExp){b={};for(c in d)d.hasOwnProperty(c)&&a.test(c)&&(b[c]=d[c])}else b=d[a]||(d[a]=[]);return b},d.flattenListeners=function(a){var b,c=[];for(b=0;b<a.length;b+=1)c.push(a[b].listener);return c},d.getListenersAsObject=function(a){var b,c=this.getListeners(a);return c instanceof Array&&(b={},b[a]=c),b||c},d.addListener=function(a,c){var d,e=this.getListenersAsObject(a),f="object"==typeof c;for(d in e)e.hasOwnProperty(d)&&-1===b(e[d],c)&&e[d].push(f?c:{listener:c,once:!1});return this},d.on=c("addListener"),d.addOnceListener=function(a,b){return this.addListener(a,{listener:b,once:!0})},d.once=c("addOnceListener"),d.defineEvent=function(a){return this.getListeners(a),this},d.defineEvents=function(a){for(var b=0;b<a.length;b+=1)this.defineEvent(a[b]);return this},d.removeListener=function(a,c){var d,e,f=this.getListenersAsObject(a);for(e in f)f.hasOwnProperty(e)&&(d=b(f[e],c),-1!==d&&f[e].splice(d,1));return this},d.off=c("removeListener"),d.addListeners=function(a,b){return this.manipulateListeners(!1,a,b)},d.removeListeners=function(a,b){return this.manipulateListeners(!0,a,b)},d.manipulateListeners=function(a,b,c){var d,e,f=a?this.removeListener:this.addListener,g=a?this.removeListeners:this.addListeners;if("object"!=typeof b||b instanceof RegExp)for(d=c.length;d--;)f.call(this,b,c[d]);else for(d in b)b.hasOwnProperty(d)&&(e=b[d])&&("function"==typeof e?f.call(this,d,e):g.call(this,d,e));return this},d.removeEvent=function(a){var b,c=typeof a,d=this._getEvents();if("string"===c)delete d[a];else if(a instanceof RegExp)for(b in d)d.hasOwnProperty(b)&&a.test(b)&&delete d[b];else delete this._events;return this},d.removeAllListeners=c("removeEvent"),d.emitEvent=function(a,b){var c,d,e,f,g=this.getListenersAsObject(a);for(e in g)if(g.hasOwnProperty(e))for(d=g[e].length;d--;)c=g[e][d],c.once===!0&&this.removeListener(a,c.listener),f=c.listener.apply(this,b||[]),f===this._getOnceReturnValue()&&this.removeListener(a,c.listener);return this},d.trigger=c("emitEvent"),d.emit=function(a){var b=Array.prototype.slice.call(arguments,1);return this.emitEvent(a,b)},d.setOnceReturnValue=function(a){return this._onceReturnValue=a,this},d._getOnceReturnValue=function(){return this.hasOwnProperty("_onceReturnValue")?this._onceReturnValue:!0},d._getEvents=function(){return this._events||(this._events={})},a.noConflict=function(){return e.EventEmitter=f,a},"function"==typeof define&&define.amd?define("eventEmitter/EventEmitter",[],function(){return a}):"object"==typeof module&&module.exports?module.exports=a:this.EventEmitter=a}.call(this),function(a){function b(a){if(a){if("string"==typeof d[a])return a;a=a.charAt(0).toUpperCase()+a.slice(1);for(var b,e=0,f=c.length;f>e;e++)if(b=c[e]+a,"string"==typeof d[b])return b}}var c="Webkit Moz ms Ms O".split(" "),d=document.documentElement.style;"function"==typeof define&&define.amd?define("get-style-property/get-style-property",[],function(){return b}):"object"==typeof exports?module.exports=b:a.getStyleProperty=b}(window),function(a){function b(a){var b=parseFloat(a),c=-1===a.indexOf("%")&&!isNaN(b);return c&&b}function c(){for(var a={width:0,height:0,innerWidth:0,innerHeight:0,outerWidth:0,outerHeight:0},b=0,c=g.length;c>b;b++){var d=g[b];a[d]=0}return a}function d(a){function d(a){if("string"==typeof a&&(a=document.querySelector(a)),a&&"object"==typeof a&&a.nodeType){var d=f(a);if("none"===d.display)return c();var e={};e.width=a.offsetWidth,e.height=a.offsetHeight;for(var k=e.isBorderBox=!(!j||!d[j]||"border-box"!==d[j]),l=0,m=g.length;m>l;l++){var n=g[l],o=d[n];o=h(a,o);var p=parseFloat(o);e[n]=isNaN(p)?0:p}var q=e.paddingLeft+e.paddingRight,r=e.paddingTop+e.paddingBottom,s=e.marginLeft+e.marginRight,t=e.marginTop+e.marginBottom,u=e.borderLeftWidth+e.borderRightWidth,v=e.borderTopWidth+e.borderBottomWidth,w=k&&i,x=b(d.width);x!==!1&&(e.width=x+(w?0:q+u));var y=b(d.height);return y!==!1&&(e.height=y+(w?0:r+v)),e.innerWidth=e.width-(q+u),e.innerHeight=e.height-(r+v),e.outerWidth=e.width+s,e.outerHeight=e.height+t,e}}function h(a,b){if(e||-1===b.indexOf("%"))return b;var c=a.style,d=c.left,f=a.runtimeStyle,g=f&&f.left;return g&&(f.left=a.currentStyle.left),c.left=b,b=c.pixelLeft,c.left=d,g&&(f.left=g),b}var i,j=a("boxSizing");return function(){if(j){var a=document.createElement("div");a.style.width="200px",a.style.padding="1px 2px 3px 4px",a.style.borderStyle="solid",a.style.borderWidth="1px 2px 3px 4px",a.style[j]="border-box";var c=document.body||document.documentElement;c.appendChild(a);var d=f(a);i=200===b(d.width),c.removeChild(a)}}(),d}var e=a.getComputedStyle,f=e?function(a){return e(a,null)}:function(a){return a.currentStyle},g=["paddingLeft","paddingRight","paddingTop","paddingBottom","marginLeft","marginRight","marginTop","marginBottom","borderLeftWidth","borderRightWidth","borderTopWidth","borderBottomWidth"];"function"==typeof define&&define.amd?define("get-size/get-size",["get-style-property/get-style-property"],d):"object"==typeof exports?module.exports=d(require("get-style-property")):a.getSize=d(a.getStyleProperty)}(window),function(a,b){function c(a,b){return a[h](b)}function d(a){if(!a.parentNode){var b=document.createDocumentFragment();b.appendChild(a)}}function e(a,b){d(a);for(var c=a.parentNode.querySelectorAll(b),e=0,f=c.length;f>e;e++)if(c[e]===a)return!0;return!1}function f(a,b){return d(a),c(a,b)}var g,h=function(){if(b.matchesSelector)return"matchesSelector";for(var a=["webkit","moz","ms","o"],c=0,d=a.length;d>c;c++){var e=a[c],f=e+"MatchesSelector";if(b[f])return f}}();if(h){var i=document.createElement("div"),j=c(i,"div");g=j?c:f}else g=e;"function"==typeof define&&define.amd?define("matches-selector/matches-selector",[],function(){return g}):window.matchesSelector=g}(this,Element.prototype),function(a){function b(a,b){for(var c in b)a[c]=b[c];return a}function c(a){for(var b in a)return!1;return b=null,!0}function d(a){return a.replace(/([A-Z])/g,function(a){return"-"+a.toLowerCase()})}function e(a,e,f){function h(a,b){a&&(this.element=a,this.layout=b,this.position={x:0,y:0},this._create())}var i=f("transition"),j=f("transform"),k=i&&j,l=!!f("perspective"),m={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"otransitionend",transition:"transitionend"}[i],n=["transform","transition","transitionDuration","transitionProperty"],o=function(){for(var a={},b=0,c=n.length;c>b;b++){var d=n[b],e=f(d);e&&e!==d&&(a[d]=e)}return a}();b(h.prototype,a.prototype),h.prototype._create=function(){this._transn={ingProperties:{},clean:{},onEnd:{}},this.css({position:"absolute"})},h.prototype.handleEvent=function(a){var b="on"+a.type;this[b]&&this[b](a)},h.prototype.getSize=function(){this.size=e(this.element)},h.prototype.css=function(a){var b=this.element.style;for(var c in a){var d=o[c]||c;b[d]=a[c]}},h.prototype.getPosition=function(){var a=g(this.element),b=this.layout.options,c=b.isOriginLeft,d=b.isOriginTop,e=parseInt(a[c?"left":"right"],10),f=parseInt(a[d?"top":"bottom"],10);e=isNaN(e)?0:e,f=isNaN(f)?0:f;var h=this.layout.size;e-=c?h.paddingLeft:h.paddingRight,f-=d?h.paddingTop:h.paddingBottom,this.position.x=e,this.position.y=f},h.prototype.layoutPosition=function(){var a=this.layout.size,b=this.layout.options,c={};b.isOriginLeft?(c.left=this.position.x+a.paddingLeft+"px",c.right=""):(c.right=this.position.x+a.paddingRight+"px",c.left=""),b.isOriginTop?(c.top=this.position.y+a.paddingTop+"px",c.bottom=""):(c.bottom=this.position.y+a.paddingBottom+"px",c.top=""),this.css(c),this.emitEvent("layout",[this])};var p=l?function(a,b){return"translate3d("+a+"px, "+b+"px, 0)"}:function(a,b){return"translate("+a+"px, "+b+"px)"};h.prototype._transitionTo=function(a,b){this.getPosition();var c=this.position.x,d=this.position.y,e=parseInt(a,10),f=parseInt(b,10),g=e===this.position.x&&f===this.position.y;if(this.setPosition(a,b),g&&!this.isTransitioning)return void this.layoutPosition();var h=a-c,i=b-d,j={},k=this.layout.options;h=k.isOriginLeft?h:-h,i=k.isOriginTop?i:-i,j.transform=p(h,i),this.transition({to:j,onTransitionEnd:{transform:this.layoutPosition},isCleaning:!0})},h.prototype.goTo=function(a,b){this.setPosition(a,b),this.layoutPosition()},h.prototype.moveTo=k?h.prototype._transitionTo:h.prototype.goTo,h.prototype.setPosition=function(a,b){this.position.x=parseInt(a,10),this.position.y=parseInt(b,10)},h.prototype._nonTransition=function(a){this.css(a.to),a.isCleaning&&this._removeStyles(a.to);for(var b in a.onTransitionEnd)a.onTransitionEnd[b].call(this)},h.prototype._transition=function(a){if(!parseFloat(this.layout.options.transitionDuration))return void this._nonTransition(a);var b=this._transn;for(var c in a.onTransitionEnd)b.onEnd[c]=a.onTransitionEnd[c];for(c in a.to)b.ingProperties[c]=!0,a.isCleaning&&(b.clean[c]=!0);if(a.from){this.css(a.from);var d=this.element.offsetHeight;d=null}this.enableTransition(a.to),this.css(a.to),this.isTransitioning=!0};var q=j&&d(j)+",opacity";h.prototype.enableTransition=function(){this.isTransitioning||(this.css({transitionProperty:q,transitionDuration:this.layout.options.transitionDuration}),this.element.addEventListener(m,this,!1))},h.prototype.transition=h.prototype[i?"_transition":"_nonTransition"],h.prototype.onwebkitTransitionEnd=function(a){this.ontransitionend(a)},h.prototype.onotransitionend=function(a){this.ontransitionend(a)};var r={"-webkit-transform":"transform","-moz-transform":"transform","-o-transform":"transform"};h.prototype.ontransitionend=function(a){if(a.target===this.element){var b=this._transn,d=r[a.propertyName]||a.propertyName;if(delete b.ingProperties[d],c(b.ingProperties)&&this.disableTransition(),d in b.clean&&(this.element.style[a.propertyName]="",delete b.clean[d]),d in b.onEnd){var e=b.onEnd[d];e.call(this),delete b.onEnd[d]}this.emitEvent("transitionEnd",[this])}},h.prototype.disableTransition=function(){this.removeTransitionStyles(),this.element.removeEventListener(m,this,!1),this.isTransitioning=!1},h.prototype._removeStyles=function(a){var b={};for(var c in a)b[c]="";this.css(b)};var s={transitionProperty:"",transitionDuration:""};return h.prototype.removeTransitionStyles=function(){this.css(s)},h.prototype.removeElem=function(){this.element.parentNode.removeChild(this.element),this.emitEvent("remove",[this])},h.prototype.remove=function(){if(!i||!parseFloat(this.layout.options.transitionDuration))return void this.removeElem();var a=this;this.on("transitionEnd",function(){return a.removeElem(),!0}),this.hide()},h.prototype.reveal=function(){delete this.isHidden,this.css({display:""});var a=this.layout.options;this.transition({from:a.hiddenStyle,to:a.visibleStyle,isCleaning:!0})},h.prototype.hide=function(){this.isHidden=!0,this.css({display:""});var a=this.layout.options;this.transition({from:a.visibleStyle,to:a.hiddenStyle,isCleaning:!0,onTransitionEnd:{opacity:function(){this.isHidden&&this.css({display:"none"})}}})},h.prototype.destroy=function(){this.css({position:"",left:"",right:"",top:"",bottom:"",transition:"",transform:""})},h}var f=a.getComputedStyle,g=f?function(a){return f(a,null)}:function(a){return a.currentStyle};"function"==typeof define&&define.amd?define("outlayer/item",["eventEmitter/EventEmitter","get-size/get-size","get-style-property/get-style-property"],e):(a.Outlayer={},a.Outlayer.Item=e(a.EventEmitter,a.getSize,a.getStyleProperty))}(window),function(a){function b(a,b){for(var c in b)a[c]=b[c];return a}function c(a){return"[object Array]"===l.call(a)}function d(a){var b=[];if(c(a))b=a;else if(a&&"number"==typeof a.length)for(var d=0,e=a.length;e>d;d++)b.push(a[d]);else b.push(a);return b}function e(a,b){var c=n(b,a);-1!==c&&b.splice(c,1)}function f(a){return a.replace(/(.)([A-Z])/g,function(a,b,c){return b+"-"+c}).toLowerCase()}function g(c,g,l,n,o,p){function q(a,c){if("string"==typeof a&&(a=h.querySelector(a)),!a||!m(a))return void(i&&i.error("Bad "+this.constructor.namespace+" element: "+a));this.element=a,this.options=b({},this.constructor.defaults),this.option(c);var d=++r;this.element.outlayerGUID=d,s[d]=this,this._create(),this.options.isInitLayout&&this.layout()}var r=0,s={};return q.namespace="outlayer",q.Item=p,q.defaults={containerStyle:{position:"relative"},isInitLayout:!0,isOriginLeft:!0,isOriginTop:!0,isResizeBound:!0,isResizingContainer:!0,transitionDuration:"0.4s",hiddenStyle:{opacity:0,transform:"scale(0.001)"},visibleStyle:{opacity:1,transform:"scale(1)"}},b(q.prototype,l.prototype),q.prototype.option=function(a){b(this.options,a)},q.prototype._create=function(){this.reloadItems(),this.stamps=[],this.stamp(this.options.stamp),b(this.element.style,this.options.containerStyle),this.options.isResizeBound&&this.bindResize()},q.prototype.reloadItems=function(){this.items=this._itemize(this.element.children)},q.prototype._itemize=function(a){for(var b=this._filterFindItemElements(a),c=this.constructor.Item,d=[],e=0,f=b.length;f>e;e++){var g=b[e],h=new c(g,this);d.push(h)}return d},q.prototype._filterFindItemElements=function(a){a=d(a);for(var b=this.options.itemSelector,c=[],e=0,f=a.length;f>e;e++){var g=a[e];if(m(g))if(b){o(g,b)&&c.push(g);for(var h=g.querySelectorAll(b),i=0,j=h.length;j>i;i++)c.push(h[i])}else c.push(g)}return c},q.prototype.getItemElements=function(){for(var a=[],b=0,c=this.items.length;c>b;b++)a.push(this.items[b].element);return a},q.prototype.layout=function(){this._resetLayout(),this._manageStamps();var a=void 0!==this.options.isLayoutInstant?this.options.isLayoutInstant:!this._isLayoutInited;this.layoutItems(this.items,a),this._isLayoutInited=!0},q.prototype._init=q.prototype.layout,q.prototype._resetLayout=function(){this.getSize()},q.prototype.getSize=function(){this.size=n(this.element)},q.prototype._getMeasurement=function(a,b){var c,d=this.options[a];d?("string"==typeof d?c=this.element.querySelector(d):m(d)&&(c=d),this[a]=c?n(c)[b]:d):this[a]=0},q.prototype.layoutItems=function(a,b){a=this._getItemsForLayout(a),this._layoutItems(a,b),this._postLayout()},q.prototype._getItemsForLayout=function(a){for(var b=[],c=0,d=a.length;d>c;c++){var e=a[c];e.isIgnored||b.push(e)}return b},q.prototype._layoutItems=function(a,b){function c(){d.emitEvent("layoutComplete",[d,a])}var d=this;if(!a||!a.length)return void c();this._itemsOn(a,"layout",c);for(var e=[],f=0,g=a.length;g>f;f++){var h=a[f],i=this._getItemLayoutPosition(h);i.item=h,i.isInstant=b||h.isLayoutInstant,e.push(i)}this._processLayoutQueue(e)},q.prototype._getItemLayoutPosition=function(){return{x:0,y:0}},q.prototype._processLayoutQueue=function(a){for(var b=0,c=a.length;c>b;b++){var d=a[b];this._positionItem(d.item,d.x,d.y,d.isInstant)}},q.prototype._positionItem=function(a,b,c,d){d?a.goTo(b,c):a.moveTo(b,c)},q.prototype._postLayout=function(){this.resizeContainer()},q.prototype.resizeContainer=function(){if(this.options.isResizingContainer){var a=this._getContainerSize();a&&(this._setContainerMeasure(a.width,!0),this._setContainerMeasure(a.height,!1))}},q.prototype._getContainerSize=k,q.prototype._setContainerMeasure=function(a,b){if(void 0!==a){var c=this.size;c.isBorderBox&&(a+=b?c.paddingLeft+c.paddingRight+c.borderLeftWidth+c.borderRightWidth:c.paddingBottom+c.paddingTop+c.borderTopWidth+c.borderBottomWidth),a=Math.max(a,0),this.element.style[b?"width":"height"]=a+"px"}},q.prototype._itemsOn=function(a,b,c){function d(){return e++,e===f&&c.call(g),!0}for(var e=0,f=a.length,g=this,h=0,i=a.length;i>h;h++){var j=a[h];j.on(b,d)}},q.prototype.ignore=function(a){var b=this.getItem(a);b&&(b.isIgnored=!0)},q.prototype.unignore=function(a){var b=this.getItem(a);b&&delete b.isIgnored},q.prototype.stamp=function(a){if(a=this._find(a)){this.stamps=this.stamps.concat(a);for(var b=0,c=a.length;c>b;b++){var d=a[b];this.ignore(d)}}},q.prototype.unstamp=function(a){if(a=this._find(a))for(var b=0,c=a.length;c>b;b++){var d=a[b];e(d,this.stamps),this.unignore(d)}},q.prototype._find=function(a){return a?("string"==typeof a&&(a=this.element.querySelectorAll(a)),a=d(a)):void 0},q.prototype._manageStamps=function(){if(this.stamps&&this.stamps.length){this._getBoundingRect();for(var a=0,b=this.stamps.length;b>a;a++){var c=this.stamps[a];this._manageStamp(c)}}},q.prototype._getBoundingRect=function(){var a=this.element.getBoundingClientRect(),b=this.size;this._boundingRect={left:a.left+b.paddingLeft+b.borderLeftWidth,top:a.top+b.paddingTop+b.borderTopWidth,right:a.right-(b.paddingRight+b.borderRightWidth),bottom:a.bottom-(b.paddingBottom+b.borderBottomWidth)}},q.prototype._manageStamp=k,q.prototype._getElementOffset=function(a){var b=a.getBoundingClientRect(),c=this._boundingRect,d=n(a),e={left:b.left-c.left-d.marginLeft,top:b.top-c.top-d.marginTop,right:c.right-b.right-d.marginRight,bottom:c.bottom-b.bottom-d.marginBottom};return e},q.prototype.handleEvent=function(a){var b="on"+a.type;this[b]&&this[b](a)},q.prototype.bindResize=function(){this.isResizeBound||(c.bind(a,"resize",this),this.isResizeBound=!0)},q.prototype.unbindResize=function(){this.isResizeBound&&c.unbind(a,"resize",this),this.isResizeBound=!1},q.prototype.onresize=function(){function a(){b.resize(),delete b.resizeTimeout}this.resizeTimeout&&clearTimeout(this.resizeTimeout);var b=this;this.resizeTimeout=setTimeout(a,100)},q.prototype.resize=function(){this.isResizeBound&&this.needsResizeLayout()&&this.layout()},q.prototype.needsResizeLayout=function(){var a=n(this.element),b=this.size&&a;return b&&a.innerWidth!==this.size.innerWidth},q.prototype.addItems=function(a){var b=this._itemize(a);return b.length&&(this.items=this.items.concat(b)),b},q.prototype.appended=function(a){var b=this.addItems(a);b.length&&(this.layoutItems(b,!0),this.reveal(b))},q.prototype.prepended=function(a){var b=this._itemize(a);if(b.length){var c=this.items.slice(0);this.items=b.concat(c),this._resetLayout(),this._manageStamps(),this.layoutItems(b,!0),this.reveal(b),this.layoutItems(c)}},q.prototype.reveal=function(a){var b=a&&a.length;if(b)for(var c=0;b>c;c++){var d=a[c];d.reveal()}},q.prototype.hide=function(a){var b=a&&a.length;if(b)for(var c=0;b>c;c++){var d=a[c];d.hide()}},q.prototype.getItem=function(a){for(var b=0,c=this.items.length;c>b;b++){var d=this.items[b];if(d.element===a)return d}},q.prototype.getItems=function(a){if(a&&a.length){for(var b=[],c=0,d=a.length;d>c;c++){var e=a[c],f=this.getItem(e);f&&b.push(f)}return b}},q.prototype.remove=function(a){a=d(a);var b=this.getItems(a);if(b&&b.length){this._itemsOn(b,"remove",function(){this.emitEvent("removeComplete",[this,b])});for(var c=0,f=b.length;f>c;c++){var g=b[c];g.remove(),e(g,this.items)}}},q.prototype.destroy=function(){var a=this.element.style;a.height="",a.position="",a.width="";for(var b=0,c=this.items.length;c>b;b++){var d=this.items[b];d.destroy()}this.unbindResize(),delete this.element.outlayerGUID,j&&j.removeData(this.element,this.constructor.namespace)},q.data=function(a){var b=a&&a.outlayerGUID;return b&&s[b]},q.create=function(a,c){function d(){q.apply(this,arguments)}return Object.create?d.prototype=Object.create(q.prototype):b(d.prototype,q.prototype),d.prototype.constructor=d,d.defaults=b({},q.defaults),b(d.defaults,c),d.prototype.settings={},d.namespace=a,d.data=q.data,d.Item=function(){p.apply(this,arguments)},d.Item.prototype=new p,g(function(){for(var b=f(a),c=h.querySelectorAll(".js-"+b),e="data-"+b+"-options",g=0,k=c.length;k>g;g++){var l,m=c[g],n=m.getAttribute(e);try{l=n&&JSON.parse(n)}catch(o){i&&i.error("Error parsing "+e+" on "+m.nodeName.toLowerCase()+(m.id?"#"+m.id:"")+": "+o);continue}var p=new d(m,l);j&&j.data(m,a,p)}}),j&&j.bridget&&j.bridget(a,d),d},q.Item=p,q}var h=a.document,i=a.console,j=a.jQuery,k=function(){},l=Object.prototype.toString,m="object"==typeof HTMLElement?function(a){return a instanceof HTMLElement}:function(a){return a&&"object"==typeof a&&1===a.nodeType&&"string"==typeof a.nodeName},n=Array.prototype.indexOf?function(a,b){return a.indexOf(b)}:function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1};"function"==typeof define&&define.amd?define("outlayer/outlayer",["eventie/eventie","doc-ready/doc-ready","eventEmitter/EventEmitter","get-size/get-size","matches-selector/matches-selector","./item"],g):a.Outlayer=g(a.eventie,a.docReady,a.EventEmitter,a.getSize,a.matchesSelector,a.Outlayer.Item)}(window),function(a){function b(a,b){var d=a.create("masonry");return d.prototype._resetLayout=function(){this.getSize(),this._getMeasurement("columnWidth","outerWidth"),this._getMeasurement("gutter","outerWidth"),this.measureColumns();var a=this.cols;for(this.colYs=[];a--;)this.colYs.push(0);this.maxY=0},d.prototype.measureColumns=function(){if(this.getContainerWidth(),!this.columnWidth){var a=this.items[0],c=a&&a.element;this.columnWidth=c&&b(c).outerWidth||this.containerWidth}this.columnWidth+=this.gutter,this.cols=Math.floor((this.containerWidth+this.gutter)/this.columnWidth),this.cols=Math.max(this.cols,1)},d.prototype.getContainerWidth=function(){var a=this.options.isFitWidth?this.element.parentNode:this.element,c=b(a);this.containerWidth=c&&c.innerWidth},d.prototype._getItemLayoutPosition=function(a){a.getSize();var b=a.size.outerWidth%this.columnWidth,d=b&&1>b?"round":"ceil",e=Math[d](a.size.outerWidth/this.columnWidth);e=Math.min(e,this.cols);for(var f=this._getColGroup(e),g=Math.min.apply(Math,f),h=c(f,g),i={x:this.columnWidth*h,y:g},j=g+a.size.outerHeight,k=this.cols+1-f.length,l=0;k>l;l++)this.colYs[h+l]=j;return i},d.prototype._getColGroup=function(a){if(2>a)return this.colYs;for(var b=[],c=this.cols+1-a,d=0;c>d;d++){var e=this.colYs.slice(d,d+a);b[d]=Math.max.apply(Math,e)}return b},d.prototype._manageStamp=function(a){var c=b(a),d=this._getElementOffset(a),e=this.options.isOriginLeft?d.left:d.right,f=e+c.outerWidth,g=Math.floor(e/this.columnWidth);g=Math.max(0,g);var h=Math.floor(f/this.columnWidth);h-=f%this.columnWidth?0:1,h=Math.min(this.cols-1,h);for(var i=(this.options.isOriginTop?d.top:d.bottom)+c.outerHeight,j=g;h>=j;j++)this.colYs[j]=Math.max(i,this.colYs[j])},d.prototype._getContainerSize=function(){this.maxY=Math.max.apply(Math,this.colYs);var a={height:this.maxY};return this.options.isFitWidth&&(a.width=this._getContainerFitWidth()),a},d.prototype._getContainerFitWidth=function(){for(var a=0,b=this.cols;--b&&0===this.colYs[b];)a++;return(this.cols-a)*this.columnWidth-this.gutter},d.prototype.needsResizeLayout=function(){var a=this.containerWidth;return this.getContainerWidth(),a!==this.containerWidth},d}var c=Array.prototype.indexOf?function(a,b){return a.indexOf(b)}:function(a,b){for(var c=0,d=a.length;d>c;c++){var e=a[c];if(e===b)return c}return-1};"function"==typeof define&&define.amd?define(["outlayer/outlayer","get-size/get-size"],b):a.Masonry=b(a.Outlayer,a.getSize)}(window);
includes/js/posts.js CHANGED
@@ -1,126 +1,105 @@
1
  ( function( $ ) {
2
  "use strict";
3
 
4
- // Modified Isotope methods for gutters in masonry
5
- $.Isotope.prototype._getMasonryGutterColumns = function() {
6
- var gutter = this.options.masonry && this.options.masonry.gutterWidth || 0;
7
- var containerWidth = this.element.width();
8
-
9
- this.masonry.columnWidth = this.options.masonry && this.options.masonry.columnWidth ||
10
- // Or use the size of the first item
11
- this.$filteredAtoms.outerWidth(true) ||
12
- // If there's no items, use size of container
13
- containerWidth;
14
-
15
- this.masonry.columnWidth += gutter;
16
-
17
- this.masonry.cols = Math.floor((containerWidth + gutter) / this.masonry.columnWidth);
18
- this.masonry.cols = Math.max(this.masonry.cols, 1);
19
- };
20
-
21
- $.Isotope.prototype._masonryReset = function() {
22
- // Layout-specific props
23
- this.masonry = {};
24
- // FIXME shouldn't have to call this again
25
- this._getMasonryGutterColumns();
26
- var i = this.masonry.cols;
27
- this.masonry.colYs = [];
28
- while (i--) {
29
- this.masonry.colYs.push(0);
30
  }
31
- };
32
-
33
- $.Isotope.prototype._masonryResizeChanged = function() {
34
- var prevSegments = this.masonry.cols;
35
- // Update cols/rows
36
- this._getMasonryGutterColumns();
37
- // Return if updated cols/rows is not equal to previous
38
- return (this.masonry.cols !== prevSegments);
39
- };
40
 
41
- $(document).ready(function(){
42
- var $container = $('.wc-shortcodes-posts');
43
- var $postBox = $container.children('.wc-shortcodes-post-box');
44
- var columnWidth = 0;
45
- var gutterWidth = 0;
 
 
 
46
 
47
- var calculateGrid = function() {
48
- var columns = parseInt( $container.data('columns') );
49
- var gutterSpace = $container.data('gutterSpace');
50
- var containerWidth = $container.width();
51
- var marginBottom = 0;
52
 
53
- if ( isNaN( gutterSpace ) ) {
54
- gutterSpace = .020;
55
- }
56
- else if ( gutterSpace > 0.05 || gutterSpace < 0 ) {
57
- gutterSpace = .020;
58
- }
59
 
60
- if ( containerWidth < 568 ) { columns = 1; }
61
- else if ( containerWidth < 768 ) { columns -= 2; }
62
- else if ( containerWidth < 991 ) {
63
- columns -= 1;
64
- if ( columns < 2 ) {
65
- columns = 2;
66
- }
67
- }
68
 
69
- if ( columns < 1 ) {
70
- columns = 1;
71
- }
72
 
73
- gutterWidth = Math.floor( containerWidth * gutterSpace );
 
74
 
75
- var allGutters = gutterWidth * ( columns - 1 );
76
- var contentWidth = containerWidth - allGutters;
77
 
78
- columnWidth = Math.floor( contentWidth / columns );
 
79
 
80
- marginBottom = gutterWidth;
81
- if ( 1 == columns ) {
82
- marginBottom = 20;
83
- }
84
- $postBox.css({'width':columnWidth+'px', 'marginBottom':marginBottom+'px', 'padding':'0'});
85
  }
86
 
87
- calculateGrid();
88
 
89
- $container.isotope({
90
- itemSelector : '.wc-shortcodes-post-box',
91
- resizable: false,
92
- masonry: {
93
- columnWidth: columnWidth,
94
- gutterWidth: gutterWidth
95
- }
96
- });
 
 
 
 
97
 
98
- $container.imagesLoaded( function(){
99
- calculateGrid();
100
 
101
- $container.isotope({
102
- itemSelector : '.wc-shortcodes-post-box',
103
- resizable: false,
104
- masonry: {
105
- columnWidth: columnWidth,
106
- gutterWidth: gutterWidth
107
- }
108
  });
109
 
110
- $postBox.css('visibility', 'visible');
111
- $container.addClass('wc-shortcodes-posts-animation');
112
- });
113
- $(window).smartresize(function(){
114
- calculateGrid();
115
- $container.isotope({
116
- masonry: {
117
- columnWidth: columnWidth,
118
- gutterWidth: gutterWidth
119
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
120
  });
121
  });
122
 
123
- var $term = $('.wc-shortcodes-filtering .wc-shortcodes-term');
 
124
  $term.click( function( event ) {
125
  event.preventDefault();
126
 
@@ -128,14 +107,24 @@
128
  $(this).addClass('wc-shortcodes-term-active');
129
 
130
  var selector = $(this).attr('data-filter');
131
- $container.isotope({
132
- filter: selector,
133
- masonry: {
134
- columnWidth: columnWidth,
135
- gutterWidth: gutterWidth
136
  }
 
 
 
 
 
 
 
 
137
  });
 
138
  return false;
139
  });
 
140
  });
141
  } )( jQuery );
1
  ( function( $ ) {
2
  "use strict";
3
 
4
+ var calculateGrid = function($container) {
5
+ var columns = parseInt( $container.data('columns') );
6
+ var gutterSpace = $container.data('gutterSpace');
7
+ var containerWidth = $container.width();
8
+
9
+ if ( isNaN( gutterSpace ) ) {
10
+ gutterSpace = .020;
11
+ }
12
+ else if ( gutterSpace > 0.05 || gutterSpace < 0 ) {
13
+ gutterSpace = .020;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
14
  }
 
 
 
 
 
 
 
 
 
15
 
16
+ if ( containerWidth < 568 ) { columns = 1; }
17
+ else if ( containerWidth < 768 ) { columns -= 2; }
18
+ else if ( containerWidth < 991 ) {
19
+ columns -= 1;
20
+ if ( columns < 2 ) {
21
+ columns = 2;
22
+ }
23
+ }
24
 
25
+ if ( columns < 1 ) {
26
+ columns = 1;
27
+ }
 
 
28
 
29
+ var gutterWidth = Math.floor( containerWidth * gutterSpace );
 
 
 
 
 
30
 
31
+ var allGutters = gutterWidth * ( columns - 1 );
32
+ var contentWidth = containerWidth - allGutters;
 
 
 
 
 
 
33
 
34
+ var columnWidth = Math.floor( contentWidth / columns );
 
 
35
 
36
+ return {columnWidth: columnWidth, gutterWidth: gutterWidth, columns: columns};
37
+ }
38
 
39
+ var runMasonry = function( duration, $container) {
40
+ var $postBox = $container.children('.wc-shortcodes-post-box');
41
 
42
+ var o = calculateGrid($container);
43
+ console.log(o);
44
 
45
+ var marginBottom = o.gutterWidth;
46
+ if ( 1 == o.columns ) {
47
+ marginBottom = 20;
 
 
48
  }
49
 
50
+ $postBox.css({'width':o.columnWidth+'px', 'margin-bottom':marginBottom+'px', 'padding':'0'});
51
 
52
+ $container.masonry( {
53
+ itemSelector: '.wc-shortcodes-post-box',
54
+ columnWidth: o.columnWidth,
55
+ gutter: o.gutterWidth,
56
+ transitionDuration: duration
57
+ } );
58
+ }
59
+
60
+ $(document).ready(function(){
61
+ $('.wc-shortcodes-posts').each( function() {
62
+ var $container = $(this);
63
+ var $postBox = $container.children('.wc-shortcodes-post-box');
64
 
 
 
65
 
66
+ // keeps the media elements from calculating for the full width of the post
67
+ runMasonry(0, $container);
68
+
69
+ imagesLoaded( $container, function() {
70
+ runMasonry(0, $container);
71
+
72
+ $container.css('visibility', 'visible');
73
  });
74
 
75
+ $(window).resize(function() {
76
+ runMasonry(0, $container);
77
+ });
78
+
79
+ $container.find(".wc-shortcodes-post-box .rslides").responsiveSlides({
80
+ auto: false, // Boolean: Animate automatically, true or false
81
+ speed: 500, // Integer: Speed of the transition, in milliseconds
82
+ timeout: 4000, // Integer: Time between slide transitions, in milliseconds
83
+ pager: false, // Boolean: Show pager, true or false
84
+ nav: true, // Boolean: Show navigation, true or false
85
+ random: false, // Boolean: Randomize the order of the slides, true or false
86
+ pause: false, // Boolean: Pause on hover, true or false
87
+ pauseControls: true, // Boolean: Pause when hovering controls, true or false
88
+ prevText: "", // String: Text for the "previous" button
89
+ nextText: "", // String: Text for the "next" button
90
+ maxwidth: "", // Integer: Max-width of the slideshow, in pixels
91
+ navContainer: "", // Selector: Where controls should be appended to, default is after the 'ul'
92
+ manualControls: "", // Selector: Declare custom pager navigation
93
+ namespace: "rslides", // String: Change the default namespace used
94
+ before: function(){}, // Function: Before callback
95
+ after: function(){
96
+ runMasonry(0, $container);
97
+ }// Function: After callback
98
  });
99
  });
100
 
101
+ var $filterNav = $('.wc-shortcodes-filtering');
102
+ var $term = $filterNav.find('.wc-shortcodes-term');
103
  $term.click( function( event ) {
104
  event.preventDefault();
105
 
107
  $(this).addClass('wc-shortcodes-term-active');
108
 
109
  var selector = $(this).attr('data-filter');
110
+ var target = $filterNav.data('target');
111
+ var $target = $(target);
112
+ $target.animate({opacity: 0}, 300, function() {
113
+ if ( '*' == selector ) {
114
+ $target.find('.wc-shortcodes-post-box').show();
115
  }
116
+ else {
117
+ $target.find('.wc-shortcodes-post-box').hide();
118
+ $target.find(selector).show();
119
+ }
120
+
121
+ runMasonry(0, $target);
122
+
123
+ $target.animate({opacity: 1}, 300);
124
  });
125
+
126
  return false;
127
  });
128
+
129
  });
130
  } )( jQuery );
includes/js/slider.js DELETED
@@ -1,29 +0,0 @@
1
- ( function( $ ) {
2
- "use strict";
3
-
4
- $(document).ready(function(){
5
- $(".rslides").responsiveSlides({
6
- auto: false, // Boolean: Animate automatically, true or false
7
- speed: 500, // Integer: Speed of the transition, in milliseconds
8
- timeout: 4000, // Integer: Time between slide transitions, in milliseconds
9
- pager: false, // Boolean: Show pager, true or false
10
- nav: true, // Boolean: Show navigation, true or false
11
- random: false, // Boolean: Randomize the order of the slides, true or false
12
- pause: false, // Boolean: Pause on hover, true or false
13
- pauseControls: true, // Boolean: Pause when hovering controls, true or false
14
- prevText: "", // String: Text for the "previous" button
15
- nextText: "", // String: Text for the "next" button
16
- maxwidth: "", // Integer: Max-width of the slideshow, in pixels
17
- navContainer: "", // Selector: Where controls should be appended to, default is after the 'ul'
18
- manualControls: "", // Selector: Declare custom pager navigation
19
- namespace: "rslides", // String: Change the default namespace used
20
- before: function(){}, // Function: Before callback
21
- after: function(){
22
- var $container = $('.wc-shortcodes-posts');
23
- if ($container.hasClass('isotope')) {
24
- $container.isotope( 'reLayout' )
25
- }
26
- }// Function: After callback
27
- });
28
- });
29
- } )( jQuery );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
includes/mce/js/shortcodes-tinymce-4.js CHANGED
@@ -85,7 +85,7 @@
85
  {
86
  text: "Posts",
87
  onclick: function(){
88
- editor.insertContent('[wc_posts author="" author_name="" p="" post__in="" order="DESC" orderby="date" post_status="publish" post_type="post" posts_per_page="10" taxonomy="" field="slug" terms="" title="yes" meta_all="yes" meta_author="yes" meta_date="yes" meta_comments="yes" thumbnail="yes" content="yes" paging="yes" size="large" filtering="yes" columns="3" gutter_space="0.020" heading_type="h2" layout="isotope"][/wc_posts]');
89
  }
90
  },
91
  {
85
  {
86
  text: "Posts",
87
  onclick: function(){
88
+ editor.insertContent('[wc_posts author="" author_name="" p="" post__in="" order="DESC" orderby="date" post_status="publish" post_type="post" posts_per_page="10" taxonomy="" field="slug" terms="" title="yes" meta_all="yes" meta_author="yes" meta_date="yes" meta_comments="yes" thumbnail="yes" content="yes" paging="yes" size="large" filtering="yes" columns="3" gutter_space="0.020" heading_type="h2" layout="masonry"][/wc_posts]');
89
  }
90
  },
91
  {
includes/scripts.php CHANGED
@@ -22,12 +22,19 @@ if( ! function_exists('wc_shortcodes_scripts') ) :
22
  wp_register_script( 'wc-shortcodes-skillbar', plugin_dir_url( __FILE__ ) . 'js/skillbar.js', array ( 'jquery' ), $ver, true );
23
  wp_register_script( 'wc-shortcodes-fullwidth', plugin_dir_url( __FILE__ ) . 'js/fullwidth.js', array ( 'jquery' ), $ver, true );
24
 
 
 
 
 
 
 
 
 
25
  // slider
26
  wp_register_script( 'wordpresscanvas-rslides', plugin_dir_url( __FILE__ ) . 'js/responsiveslides.js', array ( 'jquery' ), '1.0', true );
27
- wp_register_script( 'wc-shortcodes-slider', plugin_dir_url( __FILE__ ) . 'js/slider.js', array ( 'jquery', 'wordpresscanvas-rslides' ), $ver, true );
28
 
29
- // isotope
30
- wp_register_script( 'wc-shortcodes-posts', plugin_dir_url( __FILE__ ) . 'js/posts.js', array ( 'jquery', 'wordpresscanvas-isotope' ), $ver, true );
31
 
32
  // countdown
33
  wp_register_script( 'wc-shortcodes-jquery-countdown-js', plugin_dir_url( __FILE__ ) . 'js/jquery.countdown.js', array ( 'jquery' ), $ver, true );
22
  wp_register_script( 'wc-shortcodes-skillbar', plugin_dir_url( __FILE__ ) . 'js/skillbar.js', array ( 'jquery' ), $ver, true );
23
  wp_register_script( 'wc-shortcodes-fullwidth', plugin_dir_url( __FILE__ ) . 'js/fullwidth.js', array ( 'jquery' ), $ver, true );
24
 
25
+ // Masonry
26
+ wp_deregister_script( 'jquery-masonry' );
27
+ wp_register_script( 'jquery-masonry', plugin_dir_url( __FILE__ ) . 'js/masonry.pkgd.min.js', array( ), '3.1.5', true );
28
+ wp_enqueue_script( 'jquery-masonry' );
29
+
30
+ // images loaded
31
+ wp_register_script( 'wordpresscanvas-imagesloaded', plugin_dir_url( __FILE__ ) . 'js/imagesloaded.pkgd.min.js', array (), '3.1.5', true );
32
+
33
  // slider
34
  wp_register_script( 'wordpresscanvas-rslides', plugin_dir_url( __FILE__ ) . 'js/responsiveslides.js', array ( 'jquery' ), '1.0', true );
 
35
 
36
+ // posts
37
+ wp_register_script( 'wc-shortcodes-posts', plugin_dir_url( __FILE__ ) . 'js/posts.js', array ( 'jquery', 'wordpresscanvas-rslides', 'jquery-masonry', 'wordpresscanvas-imagesloaded' ), $ver, true );
38
 
39
  // countdown
40
  wp_register_script( 'wc-shortcodes-jquery-countdown-js', plugin_dir_url( __FILE__ ) . 'js/jquery.countdown.js', array ( 'jquery' ), $ver, true );
includes/shortcode-functions.php CHANGED
@@ -1046,6 +1046,9 @@ if( ! function_exists( 'wc_shortcodes_posts' ) ) {
1046
  global $data;
1047
  global $post;
1048
 
 
 
 
1049
  wp_enqueue_script('wc-shortcodes-posts');
1050
 
1051
  if ( (is_front_page() || is_home() ) ) {
@@ -1087,7 +1090,7 @@ if( ! function_exists( 'wc_shortcodes_posts' ) ) {
1087
  'columns' => '3', // default number of isotope columns
1088
  'gutter_space' => '0.020', // gutter width percentage relative to parent element width
1089
  'heading_type' => 'h2', // heading tag for title
1090
- 'layout' => 'isotope', // blog layout
1091
  ), $atts );
1092
 
1093
  // clean input values
@@ -1101,7 +1104,7 @@ if( ! function_exists( 'wc_shortcodes_posts' ) ) {
1101
  $atts['gutter_space'] = 0.020;
1102
  }
1103
  $atts['gutter_space'] = number_format( $atts['gutter_space'], 3 );
1104
- if ( $atts['gutter_space'] > 0.05 || $atts['gutter_space'] < 0.001 ) {
1105
  $atts['gutter_space'] = 0.020;
1106
  }
1107
 
@@ -1148,6 +1151,11 @@ if( ! function_exists( 'wc_shortcodes_posts' ) ) {
1148
  ($atts['filtering'] == "yes") ? ($atts['filtering'] = true) : ($atts['filtering'] = false);
1149
  ($atts['order'] == "ASC") ? ($atts['order'] = "ASC") : ($atts['order'] = "DESC");
1150
 
 
 
 
 
 
1151
  $ml_query = new WP_Query($atts);
1152
 
1153
  $html = '';
@@ -1163,7 +1171,7 @@ if( ! function_exists( 'wc_shortcodes_posts' ) ) {
1163
  $html .= ob_get_clean();
1164
  }
1165
 
1166
- $html .= '<div data-gutter-space="'.$atts["gutter_space"].'" data-columns="'.$atts["columns"].'" class="' . implode( ' ', $class ) . '">';
1167
 
1168
  while( $ml_query->have_posts() ) :
1169
  $ml_query->the_post();
1046
  global $data;
1047
  global $post;
1048
 
1049
+ static $instance = 0;
1050
+ $instance++;
1051
+
1052
  wp_enqueue_script('wc-shortcodes-posts');
1053
 
1054
  if ( (is_front_page() || is_home() ) ) {
1090
  'columns' => '3', // default number of isotope columns
1091
  'gutter_space' => '0.020', // gutter width percentage relative to parent element width
1092
  'heading_type' => 'h2', // heading tag for title
1093
+ 'layout' => 'masonry', // blog layout
1094
  ), $atts );
1095
 
1096
  // clean input values
1104
  $atts['gutter_space'] = 0.020;
1105
  }
1106
  $atts['gutter_space'] = number_format( $atts['gutter_space'], 3 );
1107
+ if ( $atts['gutter_space'] > 0.05 || $atts['gutter_space'] < 0.000 ) {
1108
  $atts['gutter_space'] = 0.020;
1109
  }
1110
 
1151
  ($atts['filtering'] == "yes") ? ($atts['filtering'] = true) : ($atts['filtering'] = false);
1152
  ($atts['order'] == "ASC") ? ($atts['order'] = "ASC") : ($atts['order'] = "DESC");
1153
 
1154
+ // changed default layout name. Let's catch old inputs
1155
+ if ($atts['layout'] == "isotope") {
1156
+ $atts['layout'] = "masonry";
1157
+ }
1158
+
1159
  $ml_query = new WP_Query($atts);
1160
 
1161
  $html = '';
1171
  $html .= ob_get_clean();
1172
  }
1173
 
1174
+ $html .= '<div id="wc-shortcodes-posts-'.$instance.'" data-gutter-space="'.$atts["gutter_space"].'" data-columns="'.$atts["columns"].'" class="' . implode( ' ', $class ) . '">';
1175
 
1176
  while( $ml_query->have_posts() ) :
1177
  $ml_query->the_post();
includes/templates/index.php CHANGED
@@ -32,7 +32,7 @@ switch( $post_format ) {
32
  include( 'content-quote.php' );
33
  break;
34
  case 'gallery' :
35
- wp_enqueue_script('wc-shortcodes-slider');
36
  include( 'content-gallery.php' );
37
  break;
38
  default :
32
  include( 'content-quote.php' );
33
  break;
34
  case 'gallery' :
35
+ // wp_enqueue_script('wc-shortcodes-slider');
36
  include( 'content-gallery.php' );
37
  break;
38
  default :
includes/templates/nav-filtering.php CHANGED
@@ -32,7 +32,7 @@ if ( ! empty( $taxonomy ) ) {
32
  ?>
33
 
34
  <?php if ( sizeof( $links ) > 2 ) : ?>
35
- <nav class="wc-shortcodes-filtering wc-shortcodes-nav-<?php echo $taxonomy; ?>">
36
  <?php echo implode( "<span class='tag-divider'>/</span>", $links ); ?>
37
  </nav>
38
  <?php endif; ?>
32
  ?>
33
 
34
  <?php if ( sizeof( $links ) > 2 ) : ?>
35
+ <nav data-target="#wc-shortcodes-posts-<?php echo $instance; ?>" class="wc-shortcodes-filtering wc-shortcodes-nav-<?php echo $taxonomy; ?>">
36
  <?php echo implode( "<span class='tag-divider'>/</span>", $links ); ?>
37
  </nav>
38
  <?php endif; ?>
includes/templates/nav-pagination.php CHANGED
@@ -17,8 +17,8 @@ if ( $ml_query->max_num_pages < 2 )
17
  'prev_next' => true,
18
  'prev_text' => __('Previous Page'),
19
  'next_text' => __('Next Page'),
20
- 'end_size' => 1,
21
- 'mid_size' => 1,
22
  'type' => 'plain',
23
  'add_args' => false, // array of query args to add
24
  'add_fragment' => ''
17
  'prev_next' => true,
18
  'prev_text' => __('Previous Page'),
19
  'next_text' => __('Next Page'),
20
+ 'end_size' => 2,
21
+ 'mid_size' => 2,
22
  'type' => 'plain',
23
  'add_args' => false, // array of query args to add
24
  'add_fragment' => ''
readme.txt CHANGED
@@ -1,4 +1,4 @@
1
- === WordPress Canvas - Shortcodes ===
2
 
3
  Contributors: cbaldelomar
4
  Donate link: http://webplantmedia.com/donate/
@@ -88,6 +88,11 @@ Use the shortcode manager in the TinyMCE text editor
88
 
89
  == Changelog ==
90
 
 
 
 
 
 
91
  ### Version 1.35
92
 
93
  * wc_box short code needed line breaks inserted
1
+ === WP Canvas - Shortcodes ===
2
 
3
  Contributors: cbaldelomar
4
  Donate link: http://webplantmedia.com/donate/
88
 
89
  == Changelog ==
90
 
91
+ ### Version 1.36
92
+
93
+ * switched out isotope library with open source masonry library
94
+ * Increased number of pagination buttons
95
+
96
  ### Version 1.35
97
 
98
  * wc_box short code needed line breaks inserted
wc-shortcodes.php CHANGED
@@ -5,11 +5,11 @@ Plugin URI: http://wordpresscanvas.com/features/shortcodes/
5
  Description: A family of shortcodes to enhance site functionality.
6
  Author: Chris Baldelomar
7
  Author URI: http://webplantmedia.com/
8
- Version: 1.35
9
  License: GPLv2 or later
10
  */
11
 
12
- define( 'WC_SHORTCODES_VERSION', '1.35' );
13
  define( 'WC_SHORTCODES_PREFIX', 'wc_shortcodes_' );
14
  define( '_WC_SHORTCODES_PREFIX', '_wc_shortcodes_' );
15
  define( 'WC_SHORTCODES_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
5
  Description: A family of shortcodes to enhance site functionality.
6
  Author: Chris Baldelomar
7
  Author URI: http://webplantmedia.com/
8
+ Version: 1.36
9
  License: GPLv2 or later
10
  */
11
 
12
+ define( 'WC_SHORTCODES_VERSION', '1.36' );
13
  define( 'WC_SHORTCODES_PREFIX', 'wc_shortcodes_' );
14
  define( '_WC_SHORTCODES_PREFIX', '_wc_shortcodes_' );
15
  define( 'WC_SHORTCODES_PLUGIN_URL', plugin_dir_url( __FILE__ ) );