diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-12-02 11:45:22 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-12-02 11:45:22 -0500 |
| commit | 724fec3a208e7f42ed9e657740484b3b6be9f27e (patch) | |
| tree | 69c97589517c9580abe2a6c2de3837b664fa0d79 | |
| parent | 0122e6656bc54fb94db29dfd99f268c49e6e16de (diff) | |
if running crosswalk, disable this feature (doesn't work) #398
| -rw-r--r-- | config.xml | 2 | ||||
| -rw-r--r-- | www/js/EventCtrl.js | 30 | ||||
| -rw-r--r-- | www/lang/locale-en.json | 1 |
3 files changed, 25 insertions, 8 deletions
@@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.30" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.31" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>zmNinja</name> <description> High performance ZoneMinder client diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index c17071ea..3ff6c1ce 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -1179,14 +1179,30 @@ angular.module('zmApp.controllers') // make sure the user knows the GIF is not full fps/all frames function gifAlert(e) { - $ionicPopup.alert( - { - title: $translate.instant('kNote'), - template: "{{'kGifWarning' | translate }}" - }).then(function() + if(navigator.userAgent.toLowerCase().indexOf('crosswalk') == -1) { + $ionicPopup.confirm( + { + title: $translate.instant('kNote'), + template: "{{'kGifWarning' | translate }}" + }).then(function(res) + { + if (res) + { + downloadAsGif2(e); + } + else + NVRDataModel.debug ("User cancelled GIF"); + + }); + } + else { - downloadAsGif2(e); - }); + $ionicPopup.alert({ + title:$translate.instant ('kNote'), + template:"{{'kGifNoCrosswalk' | translate}}" + }); + } + } diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index ca200f17..af191d83 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -130,6 +130,7 @@ "kFromDate" :"From Date", "kFromTime" :"From Time", "kGifWarning" :"The GIF animation will only be of alarmed frames and 1fps", + "kGifNoCrosswalk" : "Sorry, you need to be on Android 5.0 (Lollipop) or above for this feature to work.", "kGlobalConfiguration" :"Global Configuration", "kGraphAlarmed" :"alarmed", "kGraphAll" :"all", |