diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-09-29 08:47:33 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-09-29 08:47:33 -0400 |
| commit | 231c8f14a84b5493eed9b221c095a72e996e0366 (patch) | |
| tree | a60e63920739e08aa243d552b33436509ecf74f6 | |
| parent | 0d9a9353e756b7cdcabae85b4d4a4840910ed3df (diff) | |
applied scroll sista patch for native, moved it to external
Former-commit-id: 36e79c5df09980a6ad9a8751a19cea7f463a85fc
66 files changed, 15 insertions, 161 deletions
diff --git a/www/lib/ionic-scroll-sista/dist/ionic.scroll.sista.js b/www/external/ionic.scroll.sista.js index dc57ac26..63711ff9 100644 --- a/www/lib/ionic-scroll-sista/dist/ionic.scroll.sista.js +++ b/www/external/ionic.scroll.sista.js @@ -275,7 +275,7 @@ e = e.originalEvent || e; var duration = 0; - var scrollTop = e.detail.scrollTop; + var scrollTop = e.detail?e.detail.scrollTop:e.target.scrollTop; y = scrollTop >= 0 ? Math.min(defaultEnd, Math.max(0, y + scrollTop - prevScrollTop)) : 0; diff --git a/www/index.html b/www/index.html index ecc1a665..aa0ac36a 100644 --- a/www/index.html +++ b/www/index.html @@ -150,7 +150,7 @@ <script src="external/packery.pkgd.js"></script> <script src="external/draggabilly.pkgd.js"></script> - <script src="lib/ionic-scroll-sista/dist/ionic.scroll.sista.js"></script> + <script src="external/ionic.scroll.sista.js"></script> <!-- <script src="external/imagesloaded.pkgd.js"></script>--> diff --git a/www/lib/ionic-scroll-sista/.bower.json b/www/lib/ionic-scroll-sista/.bower.json deleted file mode 100644 index dcbf10a7..00000000 --- a/www/lib/ionic-scroll-sista/.bower.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "name": "ionic-scroll-sista", - "version": "1.0.7", - "description": "An Ionic plugin that will push your headers and tabs away while scrolling to free up more space", - "author": "Devin Jett <djett41@gmail.com> (https://github.com/djett41)", - "main": [ - "dist/ionic.scroll.sista.js" - ], - "repository": { - "type": "git", - "url": "https://github.com/djett41/ionic-scroll-sista.git" - }, - "ignore": [ - "demo", - "js", - "test", - ".gitignore", - "gulpfile.js", - "LICENSE", - "package.json", - "README.md" - ], - "dependencies": {}, - "devDependencies": { - "ionic": "^1.0.0-rc.0", - "angular-mocks": "1.4.3" - }, - "keywords": [ - "mobile", - "html5", - "ionic", - "cordova", - "phonegap", - "scroll", - "header", - "shrink", - "tabs", - "angularjs", - "angular" - ], - "license": "MIT", - "private": false, - "homepage": "https://github.com/djett41/ionic-scroll-sista", - "_release": "1.0.7", - "_resolution": { - "type": "version", - "tag": "v1.0.7", - "commit": "a5199fc2b4ee1bb73a62a8fa2efcd0e3512000c6" - }, - "_source": "https://github.com/djett41/ionic-scroll-sista.git", - "_target": "~1.0.7", - "_originalSource": "ionic-scroll-sista", - "_direct": true -}
\ No newline at end of file diff --git a/www/lib/ionic-scroll-sista/bower.json b/www/lib/ionic-scroll-sista/bower.json deleted file mode 100644 index 58c0c10a..00000000 --- a/www/lib/ionic-scroll-sista/bower.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "ionic-scroll-sista", - "version": "1.0.7", - "description": "An Ionic plugin that will push your headers and tabs away while scrolling to free up more space", - "author": "Devin Jett <djett41@gmail.com> (https://github.com/djett41)", - "main": [ - "dist/ionic.scroll.sista.js" - ], - "repository": { - "type": "git", - "url": "https://github.com/djett41/ionic-scroll-sista.git" - }, - "ignore": [ - "demo", - "js", - "test", - ".gitignore", - "gulpfile.js", - "LICENSE", - "package.json", - "README.md" - ], - "dependencies": {}, - "devDependencies": { - "ionic": "^1.0.0-rc.0", - "angular-mocks": "1.4.3" - }, - "keywords": [ - "mobile", - "html5", - "ionic", - "cordova", - "phonegap", - "scroll", - "header", - "shrink", - "tabs", - "angularjs", - "angular" - ], - "license": "MIT", - "private": false -} diff --git a/www/lib/ionic-scroll-sista/dist/ionic.scroll.sista.min.js b/www/lib/ionic-scroll-sista/dist/ionic.scroll.sista.min.js deleted file mode 100644 index 8bd3716d..00000000 --- a/www/lib/ionic-scroll-sista/dist/ionic.scroll.sista.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(e,t){"use strict";e.module("jett.ionic.scroll.sista",["ionic"]).directive("scrollSista",["$document","$timeout","$rootScope","$ionicScrollDelegate",function(a,n,r,o){function i(e,t,a,n){var r;for(n=n||10;e.parentNode&&n--;){if(r=e.parentNode.getAttribute(t),r&&r===a)return e.parentNode;e=e.parentNode}return null}var c=400,l=2*c,s=c+"ms",u=t.Platform.isAndroid()?!1:!0;return{restrict:"A",link:function(r,c,f){function d(e,a,r){r&&!e.style[t.CSS.TRANSITION_DURATION]&&(e.style[t.CSS.TRANSITION_DURATION]=r,n(function(){e.style[t.CSS.TRANSITION_DURATION]=""},l,!1)),e.style[t.CSS.TRANSFORM]="translate3d(0, "+-a+"px, 0)"}function b(){N=0,v=0,$=0}function h(){var e;if(y=q.querySelector('[nav-bar="cached"] .bar-header'),g=q.querySelector('[nav-bar="active"] .bar-header'))switch(A=g.offsetHeight,T=A,I=q.querySelectorAll(".tabs"),I=I[I.length-1],I&&(k=I.offsetHeight,I.parentNode.classList.contains("tabs-top")?(V=!0,T+=k):I.parentNode.classList.contains("tabs-bottom")&&(F=!0)),e=i(c[0],"nav-view","active"),M=e&&e.querySelector(".bar-subheader"),M&&(R=M.offsetHeight,T+=R),x=2*T,O=w=C=x,k=k||0,R=R||0,f.scrollSista){case"header":C=A,w=V?A:0;break;case"header-tabs":L=V?k:0,C=V?A+k:A;break;case"tabs-subheader":O=0,L=V?T-A:R,U=V?R:0;break;case"tabs":O=0,C=V?k:0;break;case"subheader":O=0,w=0;break;case"header-subheader":w=V?A:0;break;case"subheader-header":L=R,U=V?R:0,w=V?A:0;break;default:L=V?T-A:R,U=V?R:0}}function S(a,n){var r=Math.max(0,1-a/A);g&&(d(g,a,n),e.forEach(g.children,function(e){e.style.opacity=r,u&&(e.style[t.CSS.TRANSFORM]="scale("+r+","+r+")")})),y&&d(y,a,n)}function p(e,t){var a,n,r=c[0].style,o=e>L?e-L:0;M&&(n=e>_?e-_:0,d(M,Math.min(C,n),t)),I&&(a=Math.min(w,e>U?e-U:0),F&&(a=-a,r.bottom=Math.max(0,k-e)+"px"),d(I,a,t)),S(Math.min(O,o),t),r.top=Math.max(0,T-e)+"px"}function m(e,a){t.requestAnimationFrame(function(){p(e,a)})}var N,v,$,y,g,A,T,M,R,I,k,x,O,w,C,H=!0,q=a[0].body,D=f.delegateHandle?o.$getByHandle(f.delegateHandle):o,E=D.getScrollView(),V=!1,F=!1,L=0,U=0,_=0;r.$on("scroll.refreshComplete",function(){b()}),r.$parent.$on("$ionicView.beforeLeave",function(){H=!0,p(0),g=null,y=null}),r.$parent.$on("$ionicView.beforeEnter",function(){E&&E.scrollTo(0,0)}),r.$parent.$on("$ionicView.afterEnter",function(){b(),n(function(){h(),H=!1},20,!1)}),c.bind("scroll",function(e){if(!H){e=e.originalEvent||e;var t=0,a=e.detail.scrollTop;N=a>=0?Math.min(x,Math.max(0,N+a-$)):0,E.getScrollMax().top-a<=T&&(N=0,t=s),$=a,v!==N&&(v=N,m(N,t))}})}}}])}(angular,ionic);
\ No newline at end of file diff --git a/www/lib/ionic-scroll-sista/karma.conf.js b/www/lib/ionic-scroll-sista/karma.conf.js deleted file mode 100644 index 625b7758..00000000 --- a/www/lib/ionic-scroll-sista/karma.conf.js +++ /dev/null @@ -1,32 +0,0 @@ -module.exports = { - files: [ - 'bower_components/angular/angular.js', - 'bower_components/angular-animate/angular-animate.js', - 'bower_components/angular-sanitize/angular-sanitize.js', - 'bower_components/angular-ui-router/release/angular-ui-router.js', - 'bower_components/ionic/release/js/ionic.js', - 'bower_components/ionic/release/js/ionic-angular.js', - 'bower_components/angular-mocks/angular-mocks.js', - 'js/ionic.scroll.sista.js' - ], - - frameworks: ['jasmine'], - reporters: ['progress'], - port: 9876, - colors: true, - // possible values: 'OFF', 'ERROR', 'WARN', 'INFO', 'DEBUG' - logLevel: 'INFO', - autoWatch: true, - captureTimeout: 60000, - singleRun: false, - - // Start these browsers, currently available: - // - Chrome - // - ChromeCanary - // - Firefox - // - Opera (has to be installed with `npm install karma-opera-launcher`) - // - Safari (only Mac; has to be installed with `npm install karma-safari-launcher`) - // - PhantomJS - // - IE (only Windows; has to be installed with `npm install karma-ie-launcher`) - browsers: ['PhantomJS'] -};
\ No newline at end of file diff --git a/www/lib/ionic-scroll-sista/resources/android/icon/drawable-hdpi-icon.png b/www/lib/ionic-scroll-sista/resources/android/icon/drawable-hdpi-icon.png Binary files differdeleted file mode 100644 index b9100934..00000000 --- a/www/lib/ionic-scroll-sista/resources/android/icon/drawable-hdpi-icon.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/android/icon/drawable-ldpi-icon.png b/www/lib/ionic-scroll-sista/resources/android/icon/drawable-ldpi-icon.png Binary files differdeleted file mode 100644 index 16cd5dba..00000000 --- a/www/lib/ionic-scroll-sista/resources/android/icon/drawable-ldpi-icon.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/android/icon/drawable-mdpi-icon.png b/www/lib/ionic-scroll-sista/resources/android/icon/drawable-mdpi-icon.png Binary files differdeleted file mode 100644 index 64a6cbc5..00000000 --- a/www/lib/ionic-scroll-sista/resources/android/icon/drawable-mdpi-icon.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/android/icon/drawable-xhdpi-icon.png b/www/lib/ionic-scroll-sista/resources/android/icon/drawable-xhdpi-icon.png Binary files differdeleted file mode 100644 index 1605f695..00000000 --- a/www/lib/ionic-scroll-sista/resources/android/icon/drawable-xhdpi-icon.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/android/icon/drawable-xxhdpi-icon.png b/www/lib/ionic-scroll-sista/resources/android/icon/drawable-xxhdpi-icon.png Binary files differdeleted file mode 100644 index 56fb29e6..00000000 --- a/www/lib/ionic-scroll-sista/resources/android/icon/drawable-xxhdpi-icon.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/android/icon/drawable-xxxhdpi-icon.png b/www/lib/ionic-scroll-sista/resources/android/icon/drawable-xxxhdpi-icon.png Binary files differdeleted file mode 100644 index e4a91525..00000000 --- a/www/lib/ionic-scroll-sista/resources/android/icon/drawable-xxxhdpi-icon.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-land-hdpi-screen.png b/www/lib/ionic-scroll-sista/resources/android/splash/drawable-land-hdpi-screen.png Binary files differdeleted file mode 100644 index 66b12fea..00000000 --- a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-land-hdpi-screen.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-land-ldpi-screen.png b/www/lib/ionic-scroll-sista/resources/android/splash/drawable-land-ldpi-screen.png Binary files differdeleted file mode 100644 index 7dceec7b..00000000 --- a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-land-ldpi-screen.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-land-mdpi-screen.png b/www/lib/ionic-scroll-sista/resources/android/splash/drawable-land-mdpi-screen.png Binary files differdeleted file mode 100644 index 0dc2ba75..00000000 --- a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-land-mdpi-screen.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-land-xhdpi-screen.png b/www/lib/ionic-scroll-sista/resources/android/splash/drawable-land-xhdpi-screen.png Binary files differdeleted file mode 100644 index 39ae00c3..00000000 --- a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-land-xhdpi-screen.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-land-xxhdpi-screen.png b/www/lib/ionic-scroll-sista/resources/android/splash/drawable-land-xxhdpi-screen.png Binary files differdeleted file mode 100644 index 3f591b1e..00000000 --- a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-land-xxhdpi-screen.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-land-xxxhdpi-screen.png b/www/lib/ionic-scroll-sista/resources/android/splash/drawable-land-xxxhdpi-screen.png Binary files differdeleted file mode 100644 index 253e6f18..00000000 --- a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-land-xxxhdpi-screen.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-port-hdpi-screen.png b/www/lib/ionic-scroll-sista/resources/android/splash/drawable-port-hdpi-screen.png Binary files differdeleted file mode 100644 index e0dbb62f..00000000 --- a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-port-hdpi-screen.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-port-ldpi-screen.png b/www/lib/ionic-scroll-sista/resources/android/splash/drawable-port-ldpi-screen.png Binary files differdeleted file mode 100644 index 8e93c2d6..00000000 --- a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-port-ldpi-screen.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-port-mdpi-screen.png b/www/lib/ionic-scroll-sista/resources/android/splash/drawable-port-mdpi-screen.png Binary files differdeleted file mode 100644 index 0aaad62b..00000000 --- a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-port-mdpi-screen.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-port-xhdpi-screen.png b/www/lib/ionic-scroll-sista/resources/android/splash/drawable-port-xhdpi-screen.png Binary files differdeleted file mode 100644 index 64c27f8a..00000000 --- a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-port-xhdpi-screen.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-port-xxhdpi-screen.png b/www/lib/ionic-scroll-sista/resources/android/splash/drawable-port-xxhdpi-screen.png Binary files differdeleted file mode 100644 index f605e6a3..00000000 --- a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-port-xxhdpi-screen.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-port-xxxhdpi-screen.png b/www/lib/ionic-scroll-sista/resources/android/splash/drawable-port-xxxhdpi-screen.png Binary files differdeleted file mode 100644 index 2b993cff..00000000 --- a/www/lib/ionic-scroll-sista/resources/android/splash/drawable-port-xxxhdpi-screen.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/icon.png b/www/lib/ionic-scroll-sista/resources/icon.png Binary files differdeleted file mode 100644 index bee77667..00000000 --- a/www/lib/ionic-scroll-sista/resources/icon.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-40.png b/www/lib/ionic-scroll-sista/resources/ios/icon/icon-40.png Binary files differdeleted file mode 100644 index 76cc53c3..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-40.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-40@2x.png b/www/lib/ionic-scroll-sista/resources/ios/icon/icon-40@2x.png Binary files differdeleted file mode 100644 index 64b49069..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-40@2x.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-50.png b/www/lib/ionic-scroll-sista/resources/ios/icon/icon-50.png Binary files differdeleted file mode 100644 index 8bd51dfd..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-50.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-50@2x.png b/www/lib/ionic-scroll-sista/resources/ios/icon/icon-50@2x.png Binary files differdeleted file mode 100644 index 2676f8f6..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-50@2x.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-60.png b/www/lib/ionic-scroll-sista/resources/ios/icon/icon-60.png Binary files differdeleted file mode 100644 index 11f39124..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-60.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-60@2x.png b/www/lib/ionic-scroll-sista/resources/ios/icon/icon-60@2x.png Binary files differdeleted file mode 100644 index b5210482..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-60@2x.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-60@3x.png b/www/lib/ionic-scroll-sista/resources/ios/icon/icon-60@3x.png Binary files differdeleted file mode 100644 index dbc83030..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-60@3x.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-72.png b/www/lib/ionic-scroll-sista/resources/ios/icon/icon-72.png Binary files differdeleted file mode 100644 index 4e5a8276..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-72.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-72@2x.png b/www/lib/ionic-scroll-sista/resources/ios/icon/icon-72@2x.png Binary files differdeleted file mode 100644 index 56fb29e6..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-72@2x.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-76.png b/www/lib/ionic-scroll-sista/resources/ios/icon/icon-76.png Binary files differdeleted file mode 100644 index e66a90ed..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-76.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-76@2x.png b/www/lib/ionic-scroll-sista/resources/ios/icon/icon-76@2x.png Binary files differdeleted file mode 100644 index 3f5c942f..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-76@2x.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-small.png b/www/lib/ionic-scroll-sista/resources/ios/icon/icon-small.png Binary files differdeleted file mode 100644 index de3146dc..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-small.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-small@2x.png b/www/lib/ionic-scroll-sista/resources/ios/icon/icon-small@2x.png Binary files differdeleted file mode 100644 index 916a02ec..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-small@2x.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-small@3x.png b/www/lib/ionic-scroll-sista/resources/ios/icon/icon-small@3x.png Binary files differdeleted file mode 100644 index 0efa99d8..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/icon/icon-small@3x.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/icon/icon.png b/www/lib/ionic-scroll-sista/resources/ios/icon/icon.png Binary files differdeleted file mode 100644 index 89f8c00f..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/icon/icon.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/icon/icon@2x.png b/www/lib/ionic-scroll-sista/resources/ios/icon/icon@2x.png Binary files differdeleted file mode 100644 index a6687a10..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/icon/icon@2x.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/splash/Default-568h@2x~iphone.png b/www/lib/ionic-scroll-sista/resources/ios/splash/Default-568h@2x~iphone.png Binary files differdeleted file mode 100644 index d2128a63..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/splash/Default-568h@2x~iphone.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/splash/Default-667h.png b/www/lib/ionic-scroll-sista/resources/ios/splash/Default-667h.png Binary files differdeleted file mode 100644 index fc23e64c..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/splash/Default-667h.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/splash/Default-736h.png b/www/lib/ionic-scroll-sista/resources/ios/splash/Default-736h.png Binary files differdeleted file mode 100644 index 71b16ca4..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/splash/Default-736h.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/splash/Default-Landscape-736h.png b/www/lib/ionic-scroll-sista/resources/ios/splash/Default-Landscape-736h.png Binary files differdeleted file mode 100644 index aaff74ad..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/splash/Default-Landscape-736h.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/splash/Default-Landscape@2x~ipad.png b/www/lib/ionic-scroll-sista/resources/ios/splash/Default-Landscape@2x~ipad.png Binary files differdeleted file mode 100644 index 19770a2c..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/splash/Default-Landscape@2x~ipad.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/splash/Default-Landscape~ipad.png b/www/lib/ionic-scroll-sista/resources/ios/splash/Default-Landscape~ipad.png Binary files differdeleted file mode 100644 index 6fe89255..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/splash/Default-Landscape~ipad.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/splash/Default-Portrait@2x~ipad.png b/www/lib/ionic-scroll-sista/resources/ios/splash/Default-Portrait@2x~ipad.png Binary files differdeleted file mode 100644 index 3d06d86d..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/splash/Default-Portrait@2x~ipad.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/splash/Default-Portrait~ipad.png b/www/lib/ionic-scroll-sista/resources/ios/splash/Default-Portrait~ipad.png Binary files differdeleted file mode 100644 index 53ad4c4c..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/splash/Default-Portrait~ipad.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/splash/Default@2x~iphone.png b/www/lib/ionic-scroll-sista/resources/ios/splash/Default@2x~iphone.png Binary files differdeleted file mode 100644 index 6a133168..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/splash/Default@2x~iphone.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/ios/splash/Default~iphone.png b/www/lib/ionic-scroll-sista/resources/ios/splash/Default~iphone.png Binary files differdeleted file mode 100644 index 0aaad62b..00000000 --- a/www/lib/ionic-scroll-sista/resources/ios/splash/Default~iphone.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/resources/splash.png b/www/lib/ionic-scroll-sista/resources/splash.png Binary files differdeleted file mode 100644 index cbddba06..00000000 --- a/www/lib/ionic-scroll-sista/resources/splash.png +++ /dev/null diff --git a/www/lib/ionic-scroll-sista/scss/ionic.scroll.sista.scss b/www/lib/ionic-scroll-sista/scss/ionic.scroll.sista.scss deleted file mode 100644 index 5c203370..00000000 --- a/www/lib/ionic-scroll-sista/scss/ionic.scroll.sista.scss +++ /dev/null @@ -1,16 +0,0 @@ -//Scroll Sista - -//places subheader underneath top tabs. Don't forget to import ionic scss before this file! -.tabs-top .bar-subheader { - top: $bar-height + $tabs-height; -} -.platform-ios.platform-cordova { - // iOS has a status bar which sits on top of the header. - // Bump down everything to make room for it. However, if - // if its in Cordova, and set to fullscreen, then disregard the bump. - &:not(.fullscreen) { - .tabs-top .bar-subheader { - top: $bar-height + $tabs-height + $ios-statusbar-height; - } - } -}
\ No newline at end of file diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html index b206a559..4e0b6f6b 100644 --- a/www/templates/devoptions.html +++ b/www/templates/devoptions.html @@ -11,7 +11,7 @@ </ion-nav-buttons> - <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll > + <ion-content scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll > <div class="list list-inset"> <span style="color:rgb(100,100,100)"> <i class="ion-android-settings" style="font-size:150%"></i> {{'kDeveloperOptionsFor'|translate}} {{loginData.serverName}} diff --git a/www/templates/events-date-time-filter.html b/www/templates/events-date-time-filter.html index af97ad60..15a6585a 100644 --- a/www/templates/events-date-time-filter.html +++ b/www/templates/events-date-time-filter.html @@ -2,7 +2,7 @@ - <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll > + <ion-content scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll > <label class="item item-input"> <span class="input-label">{{'kFromDate'|translate}}:</span> <input type="date" ng-model="$root.fromDate" max={{today}}> diff --git a/www/templates/eventserversettings.html b/www/templates/eventserversettings.html index e6ec4614..d982fc05 100644 --- a/www/templates/eventserversettings.html +++ b/www/templates/eventserversettings.html @@ -12,7 +12,7 @@ <button class="button button-clear" ng-click="saveItems()">{{'kSave'|translate}}</button> </ion-nav-buttons> - <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll > + <ion-content scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll > <div class="list list-inset"> {{'kEventServerConfig1' | translate }} diff --git a/www/templates/help.html b/www/templates/help.html index e0dea368..ebe61931 100644 --- a/www/templates/help.html +++ b/www/templates/help.html @@ -8,7 +8,7 @@ </ion-nav-buttons> - <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll> + <ion-content class="padding" scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll> <p><small>{{$root.appName}} v{{zmAppVersion}}</small></p> <div class="list"> diff --git a/www/templates/log.html b/www/templates/log.html index e53f00aa..42e308e5 100644 --- a/www/templates/log.html +++ b/www/templates/log.html @@ -22,7 +22,7 @@ </div> </ion-nav-buttons> - <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll> + <ion-content scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll> <b>{{$root.appName}} {{'kVersion'|translate}}: {{zmAppVersion}}</b><br/> <!-- don't indent here -- its a pre--> <pre>{{log.logString}}</pre> diff --git a/www/templates/login.html b/www/templates/login.html index 738c1c46..aa61a900 100644 --- a/www/templates/login.html +++ b/www/templates/login.html @@ -13,7 +13,7 @@ <button class="button button-clear" ng-click="saveItems()">Save</button> </ion-nav-buttons> - <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll > + <ion-content scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll > <div class="item item-input-inset"> {{'kServerName' | translate }}: diff --git a/www/templates/monitors.html b/www/templates/monitors.html index a9168c09..07d34cab 100644 --- a/www/templates/monitors.html +++ b/www/templates/monitors.html @@ -9,7 +9,7 @@ </ion-nav-buttons> - <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll > + <ion-content scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll > <ion-refresher pulling-text="Pull to reload Monitors..." spinner="bubbles" on-refresh="doRefresh()"> </ion-refresher> <div style="float:right;margin-top:3px;margin-right:8px;"> diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html index a49622b2..7f54f2c8 100644 --- a/www/templates/montage-history.html +++ b/www/templates/montage-history.html @@ -21,7 +21,7 @@ </ion-nav-buttons> - <ion-content scroll-sista has-bouncing="false" style="background-color:#444444" delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll> + <ion-content scroll-sista has-bouncing="false" style="background-color:#444444" delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll> diff --git a/www/templates/montage.html b/www/templates/montage.html index b442f998..76534b7d 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -33,7 +33,7 @@ </ion-nav-buttons> - <ion-content scroll-sista ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate" overflow-scroll="false" > + <ion-content scroll-sista ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate" overflow-scroll="true" > diff --git a/www/templates/news.html b/www/templates/news.html index f4a87e4f..d560b053 100644 --- a/www/templates/news.html +++ b/www/templates/news.html @@ -8,7 +8,7 @@ </ion-nav-buttons> - <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll > + <ion-content scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll > <div class="list"> <span ng-repeat = "post in newsItems"> diff --git a/www/templates/state.html b/www/templates/state.html index bf0cda4a..af50e9c5 100644 --- a/www/templates/state.html +++ b/www/templates/state.html @@ -4,7 +4,7 @@ <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button> <button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge" ng-click="handleAlarms();" ng-if="$root.isAlarm"></button> </ion-nav-buttons> - <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll> + <ion-content scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll> <ion-refresher pulling-text="{{'kPullToReload' | translate}}..." spinner="bubbles" on-refresh="doRefresh()"></ion-refresher> <ion-list> diff --git a/www/templates/timeline.html b/www/templates/timeline.html index e443e705..71e2e41c 100644 --- a/www/templates/timeline.html +++ b/www/templates/timeline.html @@ -23,7 +23,7 @@ </ion-nav-buttons> <!--<ion-content data-tap-disabled="true">--> - <ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll> + <ion-content scroll-sista delegate-handle="none" overflow-scroll="true" mouse-wheel-scroll> <div style="padding-left:15px; font-size:10px; color:grey"> {{prettify(fromDate)}} - {{prettify(toDate)}} ({{'kTimelineOnlyDisplaying1' | translate:translationData}}) diff --git a/www/templates/wizard.html b/www/templates/wizard.html index 3d20c522..0ee3f319 100644 --- a/www/templates/wizard.html +++ b/www/templates/wizard.html @@ -5,7 +5,7 @@ </ion-nav-buttons> - <ion-content class="padding" overflow-scroll="false"> + <ion-content class="padding" overflow-scroll="true"> <wizard on-finish="finishedWizard()"> |
