From 8cdb3fc1b13b0058fe59a78060133fac58c1e0a5 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Mon, 13 Feb 2017 19:50:17 -0500
Subject: let's make GIF and MP4 an option in Dev Settings #454

---
 www/js/DataModel.js           | 8 ++++++++
 www/js/app.js                 | 2 +-
 www/lang/locale-en.json       | 1 +
 www/templates/devoptions.html | 7 +++++++
 www/templates/events.html     | 6 +++---
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 51773a9d..d2b21c2c 100755
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -150,6 +150,7 @@ angular.module('zmApp.controllers')
             'timelineScale': -1,
             'hideArchived': false,
             'videoPlaybackSpeed': 2,
+            'enableGIFMP4': false,
 
         };
 
@@ -986,6 +987,13 @@ angular.module('zmApp.controllers')
 
                                 }
 
+                                if (typeof loginData.enableGIFMP4 == 'undefined')
+                                {
+
+                                    loginData.enableGIFMP4 = true;
+
+                                }
+
                                 log("DataModel init recovered this loginData as " + JSON.stringify(loginData));
                             }
                             else
diff --git a/www/js/app.js b/www/js/app.js
index 9d8e4994..d0f30afe 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1090,7 +1090,7 @@ angular.module('zmApp', [
                         $http(
                             {
                                 method: 'POST',
-                                timeout:5000,
+                                timeout:15000,
                                 //withCredentials: true,
                                 url: loginData.url + '/index.php',
                                 headers:
diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json
index 33f4f5ab..61701716 100644
--- a/www/lang/locale-en.json
+++ b/www/lang/locale-en.json
@@ -73,6 +73,7 @@
     "kDownload"                  :"download",
     "kEnable24hr"                :"enable 24hr time format",
     "kEnableDebug"               :"Enable debug logs",
+    "kEnableGIFMP4"              :"Enable GIF/MP4 downloads",
     "kEnableLogs"                :"Enable logs",
     "kEnableNewsUpdates"         :"enable news updates",
     "kEnterPin"                  :"Enter PIN",
diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index c9ab87c6..e84ef7de 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -116,6 +116,13 @@
                 </ion-toggle>
             </label>
 
+
+            <label>
+                <ion-toggle ng-model="loginData.enableGIFMP4" ng-checked="loginData.enableGIFMP4" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kEnableGIFMP4' | translate}}
+                   </span>
+                </ion-toggle>
+            </label>
+
             <label>
                 <ion-toggle ng-model="loginData.disableAlarmCheckMontage" ng-checked="loginData.disableAlarmCheckMontage" toggle-class="toggle-calm"><span class="item-text-wrap">{{'kDisableAlarmMontage' | translate}}
                     <p>{{'kDisableAlarmMontageSub' | translate}}</p></span>
diff --git a/www/templates/events.html b/www/templates/events.html
index d4e07324..01aef4a8 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -65,14 +65,14 @@
                             <div class="item-text-wrap">
                                 
                                 <b><i ng-if="event.Event.Archived=='1'" class="ion-ios-flag" style="color:red">&nbsp;</i>{{event.Event.MonitorName}}</b> ({{event.Event.Id}}) &nbsp;
-                                <button ng-if="gifshotSupported" class="button button-small button-clear icon gif-icon" ng-click="permissionsDownload(event)"> 
+                                <button ng-if="gifshotSupported && loginData.enableGIFMP4 " class="button button-small button-clear icon gif-icon" ng-click="permissionsDownload(event)"> 
                             </button>
 
                           
 
-                            <a ng-if="(event.Event.DefaultVideo!='' && event.Event.DefaultVideo!==undefined) && $root.platformOS=='desktop' " class="button button-clear button-small icon mp4-icon" href="{{event.Event.videoPath}}" download="{{event.Event.Id}}-video.mp4" ng-click="mp4warning()"></a>
+                            <a ng-if="(event.Event.DefaultVideo!='' && event.Event.DefaultVideo!==undefined) && $root.platformOS=='desktop' && loginData.enableGIFMP4 " class="button button-clear button-small icon mp4-icon" href="{{event.Event.videoPath}}" download="{{event.Event.Id}}-video.mp4" ng-click="mp4warning()"></a>
 
-                             <button ng-if="event.Event.DefaultVideo!='' && event.Event.DefaultVideo!=undefined && $root.platformOS!='desktop'" class="button button-small button-clear icon mp4-icon" ng-click="downloadFileToDevice(event.Event.videoPath, event.Event.Id)"> 
+                             <button ng-if="event.Event.DefaultVideo!='' && event.Event.DefaultVideo!=undefined && $root.platformOS!='desktop' && loginData.enableGIFMP4 " class="button button-small button-clear icon mp4-icon" ng-click="downloadFileToDevice(event.Event.videoPath, event.Event.Id)"> 
                             </button>
 
 
-- 
cgit v1.2.3