From e2485045283e0ca7b5427b1e73bf20f2b78beb6e Mon Sep 17 00:00:00 2001 From: Athou Date: Sat, 1 Mar 2014 18:34:10 +0100 Subject: [PATCH] new webjars --- pom.xml | 10 ++++++++++ src/main/webapp/WEB-INF/wro.xml | 4 ++-- src/main/webapp/vendor/devicejs/device.0.1.58.min.js | 2 -- .../nginfinitescroll/ng-infinite-scroll-1.0.0.min.js | 2 -- 4 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 src/main/webapp/vendor/devicejs/device.0.1.58.min.js delete mode 100644 src/main/webapp/vendor/nginfinitescroll/ng-infinite-scroll-1.0.0.min.js diff --git a/pom.xml b/pom.xml index 6e9cfbbd..2490f21a 100644 --- a/pom.xml +++ b/pom.xml @@ -448,6 +448,16 @@ ng-grid 2.0.8 + + org.webjars + device.js + 139f208 + + + org.webjars + ngInfiniteScroll + 1.0.0 + junit diff --git a/src/main/webapp/WEB-INF/wro.xml b/src/main/webapp/WEB-INF/wro.xml index 2a094a26..2d872171 100644 --- a/src/main/webapp/WEB-INF/wro.xml +++ b/src/main/webapp/WEB-INF/wro.xml @@ -20,7 +20,7 @@ webjar:mousetrap.min.js - /vendor/devicejs/*.js + webjar:device.min.js webjar:spin.js @@ -37,7 +37,7 @@ webjar:ui-utils.min.js webjar:ui-select2.js webjar:ui-bootstrap-tpls.min.js - /vendor/nginfinitescroll/*.js + webjar:ng-infinite-scroll.min.js webjar:ng-grid.min.js webjar:ng-grid.min.css diff --git a/src/main/webapp/vendor/devicejs/device.0.1.58.min.js b/src/main/webapp/vendor/devicejs/device.0.1.58.min.js deleted file mode 100644 index 610c47f5..00000000 --- a/src/main/webapp/vendor/devicejs/device.0.1.58.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! device.js 0.1.58 fork https://github.com/Athou/device.js */ -(function(){var a,b,c,d,e,f,g,h,i,j;a=window.device,window.device={},c=window.document.documentElement,j=window.navigator.userAgent.toLowerCase(),device.ios=function(){return device.iphone()||device.ipod()||device.ipad()},device.iphone=function(){return d("iphone")},device.ipod=function(){return d("ipod")},device.ipad=function(){return d("ipad")},device.android=function(){return d("android")},device.androidPhone=function(){return device.android()&&d("mobile")},device.androidTablet=function(){return device.android()&&!d("mobile")},device.blackberry=function(){return d("blackberry")||d("bb10")||d("rim")},device.blackberryPhone=function(){return device.blackberry()&&!d("tablet")},device.blackberryTablet=function(){return device.blackberry()&&d("tablet")},device.windows=function(){return d("windows")},device.windowsPhone=function(){return device.windows()&&d("phone")},device.windowsTablet=function(){return device.windows()&&d("touch")},device.fxos=function(){return(d("(mobile;")||d("(tablet;"))&&d("; rv:")},device.fxosPhone=function(){return device.fxos()&&d("mobile")},device.fxosTablet=function(){return device.fxos()&&d("tablet")},device.meego=function(){return d("meego")},device.mobile=function(){return device.androidPhone()||device.iphone()||device.ipod()||device.windowsPhone()||device.blackberryPhone()||device.fxosPhone()||device.meego()},device.tablet=function(){return device.ipad()||device.androidTablet()||device.blackberryTablet()||device.windowsTablet()||device.fxosTablet()},device.portrait=function(){return 90!==Math.abs(window.orientation)},device.landscape=function(){return 90===Math.abs(window.orientation)},device.noConflict=function(){return window.device=a,this},d=function(a){return-1!==j.indexOf(a)},f=function(a){var b;return b=new RegExp(a,"i"),c.className.match(b)},b=function(a){return f(a)?void 0:c.className+=" "+a},h=function(a){return f(a)?c.className=c.className.replace(a,""):void 0},device.ios()?device.ipad()?b("ios ipad tablet"):device.iphone()?b("ios iphone mobile"):device.ipod()&&b("ios ipod mobile"):device.android()?device.androidTablet()?b("android tablet"):b("android mobile"):device.blackberry()?device.blackberryTablet()?b("blackberry tablet"):b("blackberry mobile"):device.windows()?device.windowsTablet()?b("windows tablet"):device.windowsPhone()?b("windows mobile"):b("desktop"):device.fxos()?device.fxosTablet()?b("fxos tablet"):b("fxos mobile"):device.meego()?b("meego mobile"):b("desktop"),e=function(){return device.landscape()?(h("portrait"),b("landscape")):(h("landscape"),b("portrait"))},i="onorientationchange"in window,g=i?"orientationchange":"resize",window.addEventListener?window.addEventListener(g,e,!1):window.attachEvent?window.attachEvent(g,e):window[g]=e,e()}).call(this); \ No newline at end of file diff --git a/src/main/webapp/vendor/nginfinitescroll/ng-infinite-scroll-1.0.0.min.js b/src/main/webapp/vendor/nginfinitescroll/ng-infinite-scroll-1.0.0.min.js deleted file mode 100644 index d4410b93..00000000 --- a/src/main/webapp/vendor/nginfinitescroll/ng-infinite-scroll-1.0.0.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/* ng-infinite-scroll - v1.0.0 - 2013-02-23 */ -var mod;mod=angular.module("infinite-scroll",[]),mod.directive("infiniteScroll",["$rootScope","$window","$timeout",function(i,n,e){return{link:function(t,l,o){var r,c,f,a;return n=angular.element(n),f=0,null!=o.infiniteScrollDistance&&t.$watch(o.infiniteScrollDistance,function(i){return f=parseInt(i,10)}),a=!0,r=!1,null!=o.infiniteScrollDisabled&&t.$watch(o.infiniteScrollDisabled,function(i){return a=!i,a&&r?(r=!1,c()):void 0}),c=function(){var e,c,u,d;return d=n.height()+n.scrollTop(),e=l.offset().top+l.height(),c=e-d,u=n.height()*f>=c,u&&a?i.$$phase?t.$eval(o.infiniteScroll):t.$apply(o.infiniteScroll):u?r=!0:void 0},n.on("scroll",c),t.$on("$destroy",function(){return n.off("scroll",c)}),e(function(){return o.infiniteScrollImmediateCheck?t.$eval(o.infiniteScrollImmediateCheck)?c():void 0:c()},0)}}}]); \ No newline at end of file