From 369073e636bf45697c1afda65ec8b130b485f908 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sat, 23 Apr 2016 10:52:16 +0100 Subject: [PATCH] Fixed chart.js and rebuilt assets --- bower.json | 2 +- gulpfile.js | 2 +- .../{all-84f6fb9f0b.js => all-98b897c006.js} | 41 ++++++++++--------- public/build/rev-manifest.json | 2 +- 4 files changed, 24 insertions(+), 23 deletions(-) rename public/build/dist/js/{all-84f6fb9f0b.js => all-98b897c006.js} (51%) diff --git a/bower.json b/bower.json index 31e09051..dd393daa 100644 --- a/bower.json +++ b/bower.json @@ -4,7 +4,7 @@ "animate-sass": "~0.6", "autosize": "~3.0.15", "bootstrap-sass": "~3.3", - "chartjs": "~2.0.0-beta2", + "chartjs": "~2.0.2", "eonasdan-bootstrap-datetimepicker": "~3.1", "humane-js": "~3.2", "ionicons": "~2.0", diff --git a/gulpfile.js b/gulpfile.js index 2ec60175..1c86bfb1 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -24,7 +24,7 @@ elixir(function (mix) { 'vendor/bower_components/livestampjs/livestamp.js', 'vendor/bower_components/jquery-minicolors/jquery.minicolors.js', 'vendor/bower_components/jquery-serialize-object/jquery.serialize-object.js', - 'vendor/bower_components/chartjs/Chart.js', + 'vendor/bower_components/chartjs/dist/Chart.js', 'vendor/bower_components/jquery-sparkline/dist/jquery.sparkline.js', 'vendor/bower_components/sweetalert/dist/sweetalert.min.js', 'resources/assets/js/password-strength.js', diff --git a/public/build/dist/js/all-84f6fb9f0b.js b/public/build/dist/js/all-98b897c006.js similarity index 51% rename from public/build/dist/js/all-84f6fb9f0b.js rename to public/build/dist/js/all-98b897c006.js index 427e9b23..f7f42b29 100644 --- a/public/build/dist/js/all-84f6fb9f0b.js +++ b/public/build/dist/js/all-98b897c006.js @@ -1,20 +1,21 @@ -function askConfirmation(t){swal({type:"warning",title:"Confirm your action",text:"Are you sure you want to do this?",confirmButtonText:"Yes",confirmButtonColor:"#FF6F6F",showCancelButton:!0},function(){t()})}if(function(t,e){"object"==typeof module&&"object"==typeof module.exports?module.exports=t.document?e(t,!0):function(t){if(!t.document)throw new Error("jQuery requires a window with a document");return e(t)}:e(t)}("undefined"!=typeof window?window:this,function(t,e){function n(t){var e=!!t&&"length"in t&&t.length,n=rt.type(t);return"function"===n||rt.isWindow(t)?!1:"array"===n||0===e||"number"==typeof e&&e>0&&e-1 in t}function i(t,e,n){if(rt.isFunction(e))return rt.grep(t,function(t,i){return!!e.call(t,i,t)!==n});if(e.nodeType)return rt.grep(t,function(t){return t===e!==n});if("string"==typeof e){if(mt.test(e))return rt.filter(e,t,n);e=rt.filter(e,t)}return rt.grep(t,function(t){return K.call(e,t)>-1!==n})}function a(t,e){for(;(t=t[e])&&1!==t.nodeType;);return t}function r(t){var e={};return rt.each(t.match(Mt)||[],function(t,n){e[n]=!0}),e}function s(){G.removeEventListener("DOMContentLoaded",s),t.removeEventListener("load",s),rt.ready()}function o(){this.expando=rt.expando+o.uid++}function l(t,e,n){var i;if(void 0===n&&1===t.nodeType)if(i="data-"+e.replace(Tt,"-$&").toLowerCase(),n=t.getAttribute(i),"string"==typeof n){try{n="true"===n?!0:"false"===n?!1:"null"===n?null:+n+""===n?+n:Yt.test(n)?rt.parseJSON(n):n}catch(a){}Dt.set(t,e,n)}else n=void 0;return n}function d(t,e,n,i){var a,r=1,s=20,o=i?function(){return i.cur()}:function(){return rt.css(t,e,"")},l=o(),d=n&&n[3]||(rt.cssNumber[e]?"":"px"),u=(rt.cssNumber[e]||"px"!==d&&+l)&&Ct.exec(rt.css(t,e));if(u&&u[3]!==d){d=d||u[3],n=n||[],u=+l||1;do r=r||".5",u/=r,rt.style(t,e,u+d);while(r!==(r=o()/l)&&1!==r&&--s)}return n&&(u=+u||+l||0,a=n[1]?u+(n[1]+1)*n[2]:+n[2],i&&(i.unit=d,i.start=u,i.end=a)),a}function u(t,e){var n="undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e||"*"):"undefined"!=typeof t.querySelectorAll?t.querySelectorAll(e||"*"):[];return void 0===e||e&&rt.nodeName(t,e)?rt.merge([t],n):n}function h(t,e){for(var n=0,i=t.length;i>n;n++)Lt.set(t[n],"globalEval",!e||Lt.get(e[n],"globalEval"))}function c(t,e,n,i,a){for(var r,s,o,l,d,c,p=e.createDocumentFragment(),f=[],m=0,g=t.length;g>m;m++)if(r=t[m],r||0===r)if("object"===rt.type(r))rt.merge(f,r.nodeType?[r]:r);else if(Et.test(r)){for(s=s||p.appendChild(e.createElement("div")),o=(Pt.exec(r)||["",""])[1].toLowerCase(),l=Wt[o]||Wt._default,s.innerHTML=l[1]+rt.htmlPrefilter(r)+l[2],c=l[0];c--;)s=s.lastChild;rt.merge(f,s.childNodes),s=p.firstChild,s.textContent=""}else f.push(e.createTextNode(r));for(p.textContent="",m=0;r=f[m++];)if(i&&rt.inArray(r,i)>-1)a&&a.push(r);else if(d=rt.contains(r.ownerDocument,r),s=u(p.appendChild(r),"script"),d&&h(s),n)for(c=0;r=s[c++];)It.test(r.type||"")&&n.push(r);return p}function p(){return!0}function f(){return!1}function m(){try{return G.activeElement}catch(t){}}function g(t,e,n,i,a,r){var s,o;if("object"==typeof e){"string"!=typeof n&&(i=i||n,n=void 0);for(o in e)g(t,o,n,i,e[o],r);return t}if(null==i&&null==a?(a=n,i=n=void 0):null==a&&("string"==typeof n?(a=i,i=void 0):(a=i,i=n,n=void 0)),a===!1)a=f;else if(!a)return t;return 1===r&&(s=a,a=function(t){return rt().off(t),s.apply(this,arguments)},a.guid=s.guid||(s.guid=rt.guid++)),t.each(function(){rt.event.add(this,e,a,i,n)})}function _(t,e){return rt.nodeName(t,"table")&&rt.nodeName(11!==e.nodeType?e:e.firstChild,"tr")?t.getElementsByTagName("tbody")[0]||t.appendChild(t.ownerDocument.createElement("tbody")):t}function v(t){return t.type=(null!==t.getAttribute("type"))+"/"+t.type,t}function y(t){var e=$t.exec(t.type);return e?t.type=e[1]:t.removeAttribute("type"),t}function b(t,e){var n,i,a,r,s,o,l,d;if(1===e.nodeType){if(Lt.hasData(t)&&(r=Lt.access(t),s=Lt.set(e,r),d=r.events)){delete s.handle,s.events={};for(a in d)for(n=0,i=d[a].length;i>n;n++)rt.event.add(e,a,d[a][n])}Dt.hasData(t)&&(o=Dt.access(t),l=rt.extend({},o),Dt.set(e,l))}}function M(t,e){var n=e.nodeName.toLowerCase();"input"===n&&jt.test(t.type)?e.checked=t.checked:"input"!==n&&"textarea"!==n||(e.defaultValue=t.defaultValue)}function w(t,e,n,i){e=Q.apply([],e);var a,r,s,o,l,d,h=0,p=t.length,f=p-1,m=e[0],g=rt.isFunction(m);if(g||p>1&&"string"==typeof m&&!it.checkClone&&Bt.test(m))return t.each(function(a){var r=t.eq(a);g&&(e[0]=m.call(this,a,r.html())),w(r,e,n,i)});if(p&&(a=c(e,t[0].ownerDocument,!1,t,i),r=a.firstChild,1===a.childNodes.length&&(a=r),r||i)){for(s=rt.map(u(a,"script"),v),o=s.length;p>h;h++)l=a,h!==f&&(l=rt.clone(l,!0,!0),o&&rt.merge(s,u(l,"script"))),n.call(t[h],l,h);if(o)for(d=s[s.length-1].ownerDocument,rt.map(s,y),h=0;o>h;h++)l=s[h],It.test(l.type||"")&&!Lt.access(l,"globalEval")&&rt.contains(d,l)&&(l.src?rt._evalUrl&&rt._evalUrl(l.src):rt.globalEval(l.textContent.replace(Vt,"")))}return t}function k(t,e,n){for(var i,a=e?rt.filter(e,t):t,r=0;null!=(i=a[r]);r++)n||1!==i.nodeType||rt.cleanData(u(i)),i.parentNode&&(n&&rt.contains(i.ownerDocument,i)&&h(u(i,"script")),i.parentNode.removeChild(i));return t}function x(t,e){var n=rt(e.createElement(t)).appendTo(e.body),i=rt.css(n[0],"display");return n.detach(),i}function L(t){var e=G,n=Ut[t];return n||(n=x(t,e),"none"!==n&&n||(qt=(qt||rt("