diff --git a/.gitignore b/.gitignore index d54eb89b..cbe55900 100755 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ server/config/mongo_config.js server/config/cert_config.js server/public/assets/dist/callback.min.js server/public/assets/dist/embed.min.js +server/public/assets/dist/lib.min.js server/public/assets/dist/main.min.js server/public/assets/dist/remote.min.js */node_modules diff --git a/gulpfile.js b/gulpfile.js index 07076bd2..1961a20e 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,8 +3,19 @@ var gulp = require('gulp'), uglify = require('gulp-uglifyjs'), concat = require('gulp-concat'); +gulp.task('lib', function () { + gulp.src(['server/public/assets/dist/lib/jquery-2.2.4.min.js', 'server/public/assets/dist/lib/materialize.min.js', 'server/public/assets/dist/lib/jquery-ui.min.js', 'server/public/assets/dist/lib/jquery.contextMenu.js', 'server/public/assets/dist/lib/jquery.ui.position.min.js', 'server/public/assets/dist/lib/jquery.ui.touch-punch.min']) + .pipe(uglify({ + mangle: true, + compress: true, + enclose: true + })) + .pipe(concat('lib.min.js')) + .pipe(gulp.dest('server/public/assets/dist')); +}); + gulp.task('js', function () { - gulp.src(['server/public/assets/js/*.js', '!server/public/assets/js/embed*', '!server/public/assets/js/remotecontroller.js', '!server/public/assets/js/callback.js']) + gulp.src(['server/public/assets/js/lib/*.js','server/public/assets/js/*.js', '!server/public/assets/js/embed*', '!server/public/assets/js/remotecontroller.js', '!server/public/assets/js/callback.js']) .pipe(uglify({ mangle: true, compress: true, @@ -37,11 +48,11 @@ gulp.task('callback', function () { }); gulp.task('build', function() { - gulp.run(['js', 'embed', 'remotecontroller', 'callback']); + gulp.run(['lib', 'js', 'embed', 'remotecontroller', 'callback']); }) gulp.task('remotecontroller', function () { - gulp.src(['server/public/assets/js/remotecontroller.js']) + gulp.src(['server/public/assets/js/lib/*.js', 'server/public/assets/js/remotecontroller.js']) .pipe(uglify({ mangle: true, compress: true, @@ -52,6 +63,7 @@ gulp.task('remotecontroller', function () { }); gulp.task('default', function(){ + gulp.watch('server/public/assets/dist/lib/*.js', ['lib']); gulp.watch('server/public/assets/js/*.js', ['js']); gulp.watch('server/public/assets/js/*.js', ['embed']); gulp.watch(['server/public/assets/js/callback.js', 'server/public/assets/js/helpers.js'], ['callback']); diff --git a/package.json b/package.json index d9463854..55f64442 100644 --- a/package.json +++ b/package.json @@ -20,10 +20,10 @@ "url": "https://github.com/zoff-music/zoff/issues" }, "devDependencies": { - "gulp-util": "~3.0.6", "gulp": "~3.9.0", "gulp-concat": "~2.6.0", - "gulp-uglifyjs": "~0.6.2" + "gulp-uglifyjs": "~0.6.2", + "gulp-util": "~3.0.6" }, "homepage": "https://github.com/zoff-music/zoff#readme", "dependencies": { diff --git a/server/public/assets/dist/lib.min.js b/server/public/assets/dist/lib.min.js new file mode 100644 index 00000000..57f25fad --- /dev/null +++ b/server/public/assets/dist/lib.min.js @@ -0,0 +1 @@ +!function(){function e(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}!function(e,t){"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){function i(e){var t=!!e&&"length"in e&&e.length,i=se.type(e);return"function"!==i&&!se.isWindow(e)&&("array"===i||0===t||"number"==typeof t&&t>0&&t-1 in e)}function n(e,t,i){if(se.isFunction(t))return se.grep(e,function(e,n){return!!t.call(e,n,e)!==i});if(t.nodeType)return se.grep(e,function(e){return e===t!==i});if("string"==typeof t){if(me.test(t))return se.filter(t,e,i);t=se.filter(t,e)}return se.grep(e,function(e){return J.call(t,e)>-1!==i})}function o(e,t){for(;(e=e[t])&&1!==e.nodeType;);return e}function s(e){var t={};return se.each(e.match(xe)||[],function(e,i){t[i]=!0}),t}function r(){U.removeEventListener("DOMContentLoaded",r),e.removeEventListener("load",r),se.ready()}function a(){this.expando=se.expando+a.uid++}function l(e,t,i){var n;if(void 0===i&&1===e.nodeType)if(n="data-"+t.replace(Pe,"-$&").toLowerCase(),"string"==typeof(i=e.getAttribute(n))){try{i="true"===i||"false"!==i&&("null"===i?null:+i+""===i?+i:Se.test(i)?se.parseJSON(i):i)}catch(e){}Te.set(e,t,i)}else i=void 0;return i}function c(e,t,i,n){var o,s=1,r=20,a=n?function(){return n.cur()}:function(){return se.css(e,t,"")},l=a(),c=i&&i[3]||(se.cssNumber[t]?"":"px"),u=(se.cssNumber[t]||"px"!==c&&+l)&&Me.exec(se.css(e,t));if(u&&u[3]!==c){c=c||u[3],i=i||[],u=+l||1;do{s=s||".5",u/=s,se.style(e,t,u+c)}while(s!==(s=a()/l)&&1!==s&&--r)}return i&&(u=+u||+l||0,o=i[1]?u+(i[1]+1)*i[2]:+i[2],n&&(n.unit=c,n.start=u,n.end=o)),o}function u(e,t){var i=void 0!==e.getElementsByTagName?e.getElementsByTagName(t||"*"):void 0!==e.querySelectorAll?e.querySelectorAll(t||"*"):[];return void 0===t||t&&se.nodeName(e,t)?se.merge([e],i):i}function h(e,t){for(var i=0,n=e.length;n>i;i++)_e.set(e[i],"globalEval",!t||_e.get(t[i],"globalEval"))}function d(e,t,i,n,o){for(var s,r,a,l,c,d,p=t.createDocumentFragment(),f=[],m=0,g=e.length;g>m;m++)if((s=e[m])||0===s)if("object"===se.type(s))se.merge(f,s.nodeType?[s]:s);else if(Ie.test(s)){for(r=r||p.appendChild(t.createElement("div")),a=(ze.exec(s)||["",""])[1].toLowerCase(),l=He[a]||He._default,r.innerHTML=l[1]+se.htmlPrefilter(s)+l[2],d=l[0];d--;)r=r.lastChild;se.merge(f,r.childNodes),r=p.firstChild,r.textContent=""}else f.push(t.createTextNode(s));for(p.textContent="",m=0;s=f[m++];)if(n&&se.inArray(s,n)>-1)o&&o.push(s);else if(c=se.contains(s.ownerDocument,s),r=u(p.appendChild(s),"script"),c&&h(r),i)for(d=0;s=r[d++];)Ne.test(s.type||"")&&i.push(s);return p}function p(){return!0}function f(){return!1}function m(){try{return U.activeElement}catch(e){}}function g(e,t,i,n,o,s){var r,a;if("object"==typeof t){"string"!=typeof i&&(n=n||i,i=void 0);for(a in t)g(e,a,i,n,t[a],s);return e}if(null==n&&null==o?(o=i,n=i=void 0):null==o&&("string"==typeof i?(o=n,n=void 0):(o=n,n=i,i=void 0)),!1===o)o=f;else if(!o)return e;return 1===s&&(r=o,o=function(e){return se().off(e),r.apply(this,arguments)},o.guid=r.guid||(r.guid=se.guid++)),e.each(function(){se.event.add(this,t,o,n,i)})}function v(e,t){return se.nodeName(e,"table")&&se.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function y(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function b(e){var t=Fe.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function x(e,t){var i,n,o,s,r,a,l,c;if(1===t.nodeType){if(_e.hasData(e)&&(s=_e.access(e),r=_e.set(t,s),c=s.events)){delete r.handle,r.events={};for(o in c)for(i=0,n=c[o].length;n>i;i++)se.event.add(t,o,c[o][i])}Te.hasData(e)&&(a=Te.access(e),l=se.extend({},a),Te.set(t,l))}}function w(e,t){var i=t.nodeName.toLowerCase();"input"===i&&De.test(e.type)?t.checked=e.checked:"input"!==i&&"textarea"!==i||(t.defaultValue=e.defaultValue)}function k(e,t,i,n){t=K.apply([],t);var o,s,r,a,l,c,h=0,p=e.length,f=p-1,m=t[0],g=se.isFunction(m);if(g||p>1&&"string"==typeof m&&!ne.checkClone&&Re.test(m))return e.each(function(o){var s=e.eq(o);g&&(t[0]=m.call(this,o,s.html())),k(s,t,i,n)});if(p&&(o=d(t,e[0].ownerDocument,!1,e,n),s=o.firstChild,1===o.childNodes.length&&(o=s),s||n)){for(r=se.map(u(o,"script"),y),a=r.length;p>h;h++)l=o,h!==f&&(l=se.clone(l,!0,!0),a&&se.merge(r,u(l,"script"))),i.call(e[h],l,h);if(a)for(c=r[r.length-1].ownerDocument,se.map(r,b),h=0;a>h;h++)l=r[h],Ne.test(l.type||"")&&!_e.access(l,"globalEval")&&se.contains(c,l)&&(l.src?se._evalUrl&&se._evalUrl(l.src):se.globalEval(l.textContent.replace(Ve,"")))}return e}function C(e,t,i){for(var n,o=t?se.filter(t,e):e,s=0;null!=(n=o[s]);s++)i||1!==n.nodeType||se.cleanData(u(n)),n.parentNode&&(i&&se.contains(n.ownerDocument,n)&&h(u(n,"script")),n.parentNode.removeChild(n));return e}function _(e,t){var i=se(t.createElement(e)).appendTo(t.body),n=se.css(i[0],"display");return i.detach(),n}function T(e){var t=U,i=Be[e];return i||(i=_(e,t),"none"!==i&&i||(Xe=(Xe||se("