From 635a9bd9eee82c7ab76bc7afeb9fafa3dc80a3d0 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sun, 15 Apr 2018 12:26:32 -0400 Subject: ionic lib updates --- build_android.sh | 3 ++- config.xml | 15 ++++---------- package.json | 22 +++++++-------------- resources/android/icon/drawable-hdpi-icon.png | Bin 3161 -> 3161 bytes resources/android/icon/drawable-ldpi-icon.png | Bin 1398 -> 1398 bytes resources/android/icon/drawable-mdpi-icon.png | Bin 2078 -> 2078 bytes resources/android/icon/drawable-xhdpi-icon.png | Bin 4154 -> 4154 bytes resources/android/icon/drawable-xxhdpi-icon.png | Bin 6195 -> 6195 bytes resources/android/icon/drawable-xxxhdpi-icon.png | Bin 8231 -> 8231 bytes .../android/splash/drawable-land-hdpi-screen.png | Bin 17726 -> 17726 bytes .../android/splash/drawable-land-ldpi-screen.png | Bin 6771 -> 6771 bytes .../android/splash/drawable-land-mdpi-screen.png | Bin 10105 -> 10105 bytes .../android/splash/drawable-land-xhdpi-screen.png | Bin 30192 -> 30192 bytes .../android/splash/drawable-land-xxhdpi-screen.png | Bin 40693 -> 40693 bytes .../splash/drawable-land-xxxhdpi-screen.png | Bin 53718 -> 53718 bytes .../android/splash/drawable-port-hdpi-screen.png | Bin 18160 -> 18160 bytes .../android/splash/drawable-port-ldpi-screen.png | Bin 6903 -> 6903 bytes .../android/splash/drawable-port-mdpi-screen.png | Bin 10366 -> 10366 bytes .../android/splash/drawable-port-xhdpi-screen.png | Bin 31026 -> 31026 bytes .../android/splash/drawable-port-xxhdpi-screen.png | Bin 41584 -> 41584 bytes .../splash/drawable-port-xxxhdpi-screen.png | Bin 54940 -> 54940 bytes resources/ios/icon/icon-1024.png | Bin 32775 -> 32775 bytes resources/ios/icon/icon-40.png | Bin 1526 -> 1526 bytes resources/ios/icon/icon-40@2x.png | Bin 3486 -> 3486 bytes resources/ios/icon/icon-40@3x.png | Bin 5265 -> 5265 bytes resources/ios/icon/icon-50.png | Bin 2181 -> 2181 bytes resources/ios/icon/icon-50@2x.png | Bin 4386 -> 4386 bytes resources/ios/icon/icon-60.png | Bin 2647 -> 2647 bytes resources/ios/icon/icon-60@2x.png | Bin 5265 -> 5265 bytes resources/ios/icon/icon-60@3x.png | Bin 7814 -> 7814 bytes resources/ios/icon/icon-72.png | Bin 3161 -> 3161 bytes resources/ios/icon/icon-72@2x.png | Bin 6195 -> 6195 bytes resources/ios/icon/icon-76.png | Bin 3352 -> 3352 bytes resources/ios/icon/icon-76@2x.png | Bin 6643 -> 6643 bytes resources/ios/icon/icon-83.5@2x.png | Bin 7168 -> 7168 bytes resources/ios/icon/icon-small.png | Bin 1205 -> 1205 bytes resources/ios/icon/icon-small@2x.png | Bin 2520 -> 2520 bytes resources/ios/icon/icon-small@3x.png | Bin 3803 -> 3803 bytes resources/ios/icon/icon.png | Bin 2451 -> 2451 bytes resources/ios/icon/icon@2x.png | Bin 4988 -> 4988 bytes resources/ios/splash/Default-568h@2x~iphone.png | Bin 26982 -> 26982 bytes resources/ios/splash/Default-667h.png | Bin 32395 -> 32395 bytes resources/ios/splash/Default-736h.png | Bin 62886 -> 62886 bytes resources/ios/splash/Default-Landscape-736h.png | Bin 62629 -> 62629 bytes resources/ios/splash/Default-Landscape@2x~ipad.png | Bin 59305 -> 59305 bytes .../ios/splash/Default-Landscape@~ipadpro.png | Bin 87979 -> 87979 bytes resources/ios/splash/Default-Landscape~ipad.png | Bin 25129 -> 25129 bytes resources/ios/splash/Default-Portrait@2x~ipad.png | Bin 59374 -> 59374 bytes resources/ios/splash/Default-Portrait@~ipadpro.png | Bin 88671 -> 88671 bytes resources/ios/splash/Default-Portrait~ipad.png | Bin 25496 -> 25496 bytes resources/ios/splash/Default@2x~iphone.png | Bin 22993 -> 22993 bytes .../ios/splash/Default@2x~universal~anyany.png | Bin 97293 -> 97293 bytes resources/ios/splash/Default~iphone.png | Bin 10366 -> 10366 bytes www/css/ionic.app.css | 4 +++- www/css/style.css | 1 + www/js/MontageCtrl.js | 11 ++++++++--- www/js/app.js | 8 ++++---- www/templates/montage.html | 2 +- 58 files changed, 30 insertions(+), 36 deletions(-) diff --git a/build_android.sh b/build_android.sh index 87cfc889..bcf226e7 100755 --- a/build_android.sh +++ b/build_android.sh @@ -82,7 +82,8 @@ if [ "$BUILD_MODE" = "native" ] || [ "$BUILD_MODE" = "all" ]; then # use the right plugin for SSL certificate mgmt cordova plugin remove cordova-plugin-crosswalk-certificate - cordova plugin add https://github.com/hypery2k/cordova-certificate-plugin + cordova plugin add https://github.com/hypery2k/cordova-certificate-plugin.git + #cordova plugin add https://github.com/hypery2k/cordova-certificate-plugin #ionic platform remove android #ionic platform add android cp "$NINJAKEYSTORE" platforms/android/ diff --git a/config.xml b/config.xml index 3551278b..ed187fae 100644 --- a/config.xml +++ b/config.xml @@ -75,6 +75,7 @@ + @@ -102,8 +103,6 @@ - - @@ -118,7 +117,6 @@ - @@ -149,12 +147,7 @@ - - - - - - - - + + + diff --git a/package.json b/package.json index 12b55708..6621f654 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ "cordova-plugin-globalization": {}, "cordova-plugin-inappbrowser": {}, "cordova-plugin-insomnia": {}, - "cordova-plugin-ios-longpress-fix": {}, "cordova-plugin-media": { "MICROPHONE_USAGE_DESCRIPTION": " " }, @@ -53,32 +52,25 @@ "cordova-plugin-device": {}, "cordova-plugin-file": {}, "cordova-plugin-add-swift-support": {}, - "cordova-plugin-crosswalk-certificate": {}, - "cordova-plugin-crosswalk-webview": { - "XWALK_MODE": "lite", - "XWALK_VERSION": "17.46.459.1", - "XWALK_LITEVERSION": "xwalk_core_library_canary:17+", - "XWALK_COMMANDLINE": "--disable-pull-to-refresh-effect", - "XWALK_MULTIPLEAPK": "true" - } + "cordova-plugin-certificates": {} } }, "dependencies": { + "@ionic/cli-utils": "^1.19.2", "EmailComposer": "git+https://github.com/pliablepixels/email-composer.git", "com.telerik.plugins.nativepagetransitions": "^0.6.5", + "cordova": "^8.0.0", "cordova-android": "^6.3.0", "cordova-custom-config": "~4.0.2", - "cordova-ios": "4.5.4", + "cordova-ios": "^4.5.4", "cordova-library-helper": "^1.0.4", "cordova-plugin-add-swift-support": "^1.7.1", "cordova-plugin-android-fingerprint-auth": "^1.4.0", "cordova-plugin-android-permissions": "^1.0.0", "cordova-plugin-app-version": "^0.1.9", "cordova-plugin-canvas2image": "git+https://github.com/flache/Canvas2ImagePlugin.git", - "cordova-plugin-compat": "^1.2.0", + "cordova-plugin-certificates": "git+https://github.com/hypery2k/cordova-certificate-plugin.git", "cordova-plugin-console": "^1.1.0", - "cordova-plugin-crosswalk-certificate": "git+https://github.com/danjarvis/cordova-plugin-crosswalk-certificate.git", - "cordova-plugin-crosswalk-webview": "^2.2.0", "cordova-plugin-customurlscheme": "^4.3.0", "cordova-plugin-device": "^2.0.1", "cordova-plugin-email": "git+https://github.com/pliablepixels/cordova-email-plugin.git", @@ -87,7 +79,6 @@ "cordova-plugin-globalization": "^1.0.7", "cordova-plugin-inappbrowser": "^1.7.1", "cordova-plugin-insomnia": "^4.3.0", - "cordova-plugin-ios-longpress-fix": "^1.1.0", "cordova-plugin-media": "git+https://github.com/pliablepixels/cordova-plugin-media.git", "cordova-plugin-network-information": "^2.0.1", "cordova-plugin-photo-library": "^1.2.2", @@ -118,6 +109,7 @@ "gulp-concat": "^2.6.1", "gulp-minify-css": "^1.2.4", "gulp-rename": "^1.2.2", - "gulp-sass": "^3.1.0" + "gulp-sass": "^3.1.0", + "npm": "^5.8.0" } } \ No newline at end of file diff --git a/resources/android/icon/drawable-hdpi-icon.png b/resources/android/icon/drawable-hdpi-icon.png index 0b88382c..29f6e23a 100644 Binary files a/resources/android/icon/drawable-hdpi-icon.png and b/resources/android/icon/drawable-hdpi-icon.png differ diff --git a/resources/android/icon/drawable-ldpi-icon.png b/resources/android/icon/drawable-ldpi-icon.png index 3a34012f..82fdb670 100644 Binary files a/resources/android/icon/drawable-ldpi-icon.png and b/resources/android/icon/drawable-ldpi-icon.png differ diff --git a/resources/android/icon/drawable-mdpi-icon.png b/resources/android/icon/drawable-mdpi-icon.png index 8c134720..5b11045c 100644 Binary files a/resources/android/icon/drawable-mdpi-icon.png and b/resources/android/icon/drawable-mdpi-icon.png differ diff --git a/resources/android/icon/drawable-xhdpi-icon.png b/resources/android/icon/drawable-xhdpi-icon.png index 6d5cde71..c4c6730a 100644 Binary files a/resources/android/icon/drawable-xhdpi-icon.png and b/resources/android/icon/drawable-xhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxhdpi-icon.png b/resources/android/icon/drawable-xxhdpi-icon.png index 338ca1b5..d6512f1b 100644 Binary files a/resources/android/icon/drawable-xxhdpi-icon.png and b/resources/android/icon/drawable-xxhdpi-icon.png differ diff --git a/resources/android/icon/drawable-xxxhdpi-icon.png b/resources/android/icon/drawable-xxxhdpi-icon.png index 7d3e4ba3..8cee414d 100644 Binary files a/resources/android/icon/drawable-xxxhdpi-icon.png and b/resources/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/resources/android/splash/drawable-land-hdpi-screen.png b/resources/android/splash/drawable-land-hdpi-screen.png index 69ed72ca..b8dd869c 100644 Binary files a/resources/android/splash/drawable-land-hdpi-screen.png and b/resources/android/splash/drawable-land-hdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-ldpi-screen.png b/resources/android/splash/drawable-land-ldpi-screen.png index 8269ae9f..c138f74b 100644 Binary files a/resources/android/splash/drawable-land-ldpi-screen.png and b/resources/android/splash/drawable-land-ldpi-screen.png differ diff --git a/resources/android/splash/drawable-land-mdpi-screen.png b/resources/android/splash/drawable-land-mdpi-screen.png index 154b0d9b..cae7657e 100644 Binary files a/resources/android/splash/drawable-land-mdpi-screen.png and b/resources/android/splash/drawable-land-mdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xhdpi-screen.png b/resources/android/splash/drawable-land-xhdpi-screen.png index 5d1aee71..56872897 100644 Binary files a/resources/android/splash/drawable-land-xhdpi-screen.png and b/resources/android/splash/drawable-land-xhdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xxhdpi-screen.png b/resources/android/splash/drawable-land-xxhdpi-screen.png index fe7a95a2..19fc10c0 100644 Binary files a/resources/android/splash/drawable-land-xxhdpi-screen.png and b/resources/android/splash/drawable-land-xxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-land-xxxhdpi-screen.png b/resources/android/splash/drawable-land-xxxhdpi-screen.png index 8089cda5..368a3e70 100644 Binary files a/resources/android/splash/drawable-land-xxxhdpi-screen.png and b/resources/android/splash/drawable-land-xxxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-hdpi-screen.png b/resources/android/splash/drawable-port-hdpi-screen.png index 1071c75f..08f065bf 100644 Binary files a/resources/android/splash/drawable-port-hdpi-screen.png and b/resources/android/splash/drawable-port-hdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-ldpi-screen.png b/resources/android/splash/drawable-port-ldpi-screen.png index 36493eef..64bc2d66 100644 Binary files a/resources/android/splash/drawable-port-ldpi-screen.png and b/resources/android/splash/drawable-port-ldpi-screen.png differ diff --git a/resources/android/splash/drawable-port-mdpi-screen.png b/resources/android/splash/drawable-port-mdpi-screen.png index d26c79a2..ebc915e4 100644 Binary files a/resources/android/splash/drawable-port-mdpi-screen.png and b/resources/android/splash/drawable-port-mdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xhdpi-screen.png b/resources/android/splash/drawable-port-xhdpi-screen.png index 2db0fb89..7d46beb7 100644 Binary files a/resources/android/splash/drawable-port-xhdpi-screen.png and b/resources/android/splash/drawable-port-xhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xxhdpi-screen.png b/resources/android/splash/drawable-port-xxhdpi-screen.png index fa52e59b..0e52c7db 100644 Binary files a/resources/android/splash/drawable-port-xxhdpi-screen.png and b/resources/android/splash/drawable-port-xxhdpi-screen.png differ diff --git a/resources/android/splash/drawable-port-xxxhdpi-screen.png b/resources/android/splash/drawable-port-xxxhdpi-screen.png index c07f67fe..ed5ca0c7 100644 Binary files a/resources/android/splash/drawable-port-xxxhdpi-screen.png and b/resources/android/splash/drawable-port-xxxhdpi-screen.png differ diff --git a/resources/ios/icon/icon-1024.png b/resources/ios/icon/icon-1024.png index bcee4aff..f37b5159 100644 Binary files a/resources/ios/icon/icon-1024.png and b/resources/ios/icon/icon-1024.png differ diff --git a/resources/ios/icon/icon-40.png b/resources/ios/icon/icon-40.png index 18d895a4..68076c16 100644 Binary files a/resources/ios/icon/icon-40.png and b/resources/ios/icon/icon-40.png differ diff --git a/resources/ios/icon/icon-40@2x.png b/resources/ios/icon/icon-40@2x.png index 65ec2885..3c2bfa7b 100644 Binary files a/resources/ios/icon/icon-40@2x.png and b/resources/ios/icon/icon-40@2x.png differ diff --git a/resources/ios/icon/icon-40@3x.png b/resources/ios/icon/icon-40@3x.png index a7bb7b13..322bb744 100644 Binary files a/resources/ios/icon/icon-40@3x.png and b/resources/ios/icon/icon-40@3x.png differ diff --git a/resources/ios/icon/icon-50.png b/resources/ios/icon/icon-50.png index 539e19b9..6470a9f5 100644 Binary files a/resources/ios/icon/icon-50.png and b/resources/ios/icon/icon-50.png differ diff --git a/resources/ios/icon/icon-50@2x.png b/resources/ios/icon/icon-50@2x.png index 4e175caf..ae858faa 100644 Binary files a/resources/ios/icon/icon-50@2x.png and b/resources/ios/icon/icon-50@2x.png differ diff --git a/resources/ios/icon/icon-60.png b/resources/ios/icon/icon-60.png index 05576441..898c4b60 100644 Binary files a/resources/ios/icon/icon-60.png and b/resources/ios/icon/icon-60.png differ diff --git a/resources/ios/icon/icon-60@2x.png b/resources/ios/icon/icon-60@2x.png index 195b8711..322bb744 100644 Binary files a/resources/ios/icon/icon-60@2x.png and b/resources/ios/icon/icon-60@2x.png differ diff --git a/resources/ios/icon/icon-60@3x.png b/resources/ios/icon/icon-60@3x.png index 4cf47f10..d68a766f 100644 Binary files a/resources/ios/icon/icon-60@3x.png and b/resources/ios/icon/icon-60@3x.png differ diff --git a/resources/ios/icon/icon-72.png b/resources/ios/icon/icon-72.png index af19d4a2..88fd9594 100644 Binary files a/resources/ios/icon/icon-72.png and b/resources/ios/icon/icon-72.png differ diff --git a/resources/ios/icon/icon-72@2x.png b/resources/ios/icon/icon-72@2x.png index 60611f8e..90425a78 100644 Binary files a/resources/ios/icon/icon-72@2x.png and b/resources/ios/icon/icon-72@2x.png differ diff --git a/resources/ios/icon/icon-76.png b/resources/ios/icon/icon-76.png index ea172200..5060dd22 100644 Binary files a/resources/ios/icon/icon-76.png and b/resources/ios/icon/icon-76.png differ diff --git a/resources/ios/icon/icon-76@2x.png b/resources/ios/icon/icon-76@2x.png index d9216c67..295365eb 100644 Binary files a/resources/ios/icon/icon-76@2x.png and b/resources/ios/icon/icon-76@2x.png differ diff --git a/resources/ios/icon/icon-83.5@2x.png b/resources/ios/icon/icon-83.5@2x.png index 037ea035..67434740 100644 Binary files a/resources/ios/icon/icon-83.5@2x.png and b/resources/ios/icon/icon-83.5@2x.png differ diff --git a/resources/ios/icon/icon-small.png b/resources/ios/icon/icon-small.png index 3b00b09b..8801c466 100644 Binary files a/resources/ios/icon/icon-small.png and b/resources/ios/icon/icon-small.png differ diff --git a/resources/ios/icon/icon-small@2x.png b/resources/ios/icon/icon-small@2x.png index ccba1134..cf83c273 100644 Binary files a/resources/ios/icon/icon-small@2x.png and b/resources/ios/icon/icon-small@2x.png differ diff --git a/resources/ios/icon/icon-small@3x.png b/resources/ios/icon/icon-small@3x.png index 5eaa0a60..0d65e805 100644 Binary files a/resources/ios/icon/icon-small@3x.png and b/resources/ios/icon/icon-small@3x.png differ diff --git a/resources/ios/icon/icon.png b/resources/ios/icon/icon.png index acbdde33..8fc8862c 100644 Binary files a/resources/ios/icon/icon.png and b/resources/ios/icon/icon.png differ diff --git a/resources/ios/icon/icon@2x.png b/resources/ios/icon/icon@2x.png index d8e73c35..139233e2 100644 Binary files a/resources/ios/icon/icon@2x.png and b/resources/ios/icon/icon@2x.png differ diff --git a/resources/ios/splash/Default-568h@2x~iphone.png b/resources/ios/splash/Default-568h@2x~iphone.png index e04c1590..cac62e36 100644 Binary files a/resources/ios/splash/Default-568h@2x~iphone.png and b/resources/ios/splash/Default-568h@2x~iphone.png differ diff --git a/resources/ios/splash/Default-667h.png b/resources/ios/splash/Default-667h.png index 954bdef2..94114802 100644 Binary files a/resources/ios/splash/Default-667h.png and b/resources/ios/splash/Default-667h.png differ diff --git a/resources/ios/splash/Default-736h.png b/resources/ios/splash/Default-736h.png index 17d2ab17..02cfcace 100644 Binary files a/resources/ios/splash/Default-736h.png and b/resources/ios/splash/Default-736h.png differ diff --git a/resources/ios/splash/Default-Landscape-736h.png b/resources/ios/splash/Default-Landscape-736h.png index 168e3fc3..8b77eb03 100644 Binary files a/resources/ios/splash/Default-Landscape-736h.png and b/resources/ios/splash/Default-Landscape-736h.png differ diff --git a/resources/ios/splash/Default-Landscape@2x~ipad.png b/resources/ios/splash/Default-Landscape@2x~ipad.png index c7cb27af..ba0edbda 100644 Binary files a/resources/ios/splash/Default-Landscape@2x~ipad.png and b/resources/ios/splash/Default-Landscape@2x~ipad.png differ diff --git a/resources/ios/splash/Default-Landscape@~ipadpro.png b/resources/ios/splash/Default-Landscape@~ipadpro.png index d140e3c1..893bc568 100644 Binary files a/resources/ios/splash/Default-Landscape@~ipadpro.png and b/resources/ios/splash/Default-Landscape@~ipadpro.png differ diff --git a/resources/ios/splash/Default-Landscape~ipad.png b/resources/ios/splash/Default-Landscape~ipad.png index 91a82910..07a3669d 100644 Binary files a/resources/ios/splash/Default-Landscape~ipad.png and b/resources/ios/splash/Default-Landscape~ipad.png differ diff --git a/resources/ios/splash/Default-Portrait@2x~ipad.png b/resources/ios/splash/Default-Portrait@2x~ipad.png index 799cc2a2..3e6a6c1c 100644 Binary files a/resources/ios/splash/Default-Portrait@2x~ipad.png and b/resources/ios/splash/Default-Portrait@2x~ipad.png differ diff --git a/resources/ios/splash/Default-Portrait@~ipadpro.png b/resources/ios/splash/Default-Portrait@~ipadpro.png index b2556500..96e5f1a8 100644 Binary files a/resources/ios/splash/Default-Portrait@~ipadpro.png and b/resources/ios/splash/Default-Portrait@~ipadpro.png differ diff --git a/resources/ios/splash/Default-Portrait~ipad.png b/resources/ios/splash/Default-Portrait~ipad.png index a9d06469..3ad79c2a 100644 Binary files a/resources/ios/splash/Default-Portrait~ipad.png and b/resources/ios/splash/Default-Portrait~ipad.png differ diff --git a/resources/ios/splash/Default@2x~iphone.png b/resources/ios/splash/Default@2x~iphone.png index 6294245a..d654833d 100644 Binary files a/resources/ios/splash/Default@2x~iphone.png and b/resources/ios/splash/Default@2x~iphone.png differ diff --git a/resources/ios/splash/Default@2x~universal~anyany.png b/resources/ios/splash/Default@2x~universal~anyany.png index f9bc777c..3a0f0e53 100644 Binary files a/resources/ios/splash/Default@2x~universal~anyany.png and b/resources/ios/splash/Default@2x~universal~anyany.png differ diff --git a/resources/ios/splash/Default~iphone.png b/resources/ios/splash/Default~iphone.png index 697db5b3..67b76e25 100644 Binary files a/resources/ios/splash/Default~iphone.png and b/resources/ios/splash/Default~iphone.png differ diff --git a/www/css/ionic.app.css b/www/css/ionic.app.css index 13676ee1..d7a0409f 100644 --- a/www/css/ionic.app.css +++ b/www/css/ionic.app.css @@ -9672,7 +9672,9 @@ a.button { padding-right: calc(constant(safe-area-inset-right) + 54px); } .item-icon-right .icon { right: calc(constant(safe-area-inset-right) + 11px); } - .item-complex, a.item.item-complex, button.item.item-complex { + .item-complex, + a.item.item-complex, + button.item.item-complex { padding: 0; } .item-complex .item-content, a.item.item-complex .item-content, button.item.item-complex .item-content { padding: 16px calc(constant(safe-area-inset-right) + 49px) 16px calc(constant(safe-area-inset-left) + 16px); } diff --git a/www/css/style.css b/www/css/style.css index c850fb41..d4513b80 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -125,6 +125,7 @@ ion-popover-view.fit ion-content { width: 100% } + /*.modal { top: 100; diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index f8ff4b01..02128ebc 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -850,10 +850,15 @@ angular.module('zmApp.controllers') disableAnimate: true, disableBack: true }); - $state.go("app.montage", { + + $state.go('app.refresh', { + "view": 'app.montage' + }); + + /* $state.go("app.montage", { minimal: $scope.minimal, isRefresh: true - }); + });*/ return; }; @@ -1623,7 +1628,7 @@ angular.module('zmApp.controllers') $scope.constructStream = function (monitor) { var stream; - //if (areStreamsStopped) return ""; //getmode doing snapshot now + if (areStreamsStopped) return ""; stream = monitor.Monitor.streamingURL + "/nph-zms?mode=" + getMode() + "&monitor=" + monitor.Monitor.Id + diff --git a/www/js/app.js b/www/js/app.js index 01928d5e..f6da56cd 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -644,12 +644,12 @@ angular.module('zmApp', [ //console.log (">>>>>>>>>>>>> INTERCEPT OBJECT " + JSON.stringify(config)); - if ($rootScope.zmCookie) { - config.headers.Cookie = "ZMSESSID=" + $rootScope.zmCookie; + // if ($rootScope.zmCookie) { + // config.headers.Cookie = "ZMSESSID=" + // $rootScope.zmCookie; // console.log (">>>>> WOOOT HAVE COOKIE AND USING: "+$rootScope.zmCookie); - } else { + // } else { // console.log ("No cookie present in " + config.url); - } + // } if ($rootScope.apiAuth) { // console.log("********** API AUTH"); diff --git a/www/templates/montage.html b/www/templates/montage.html index 0742e3d3..90a3bc23 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -90,7 +90,7 @@ - +