bazillion changes/cleanup - I think I got the big offender it was unload handler in app.js #550

author: Pliable Pixels <pliablepixels@gmail.com> 2017-11-02 14:56:45 -0400
committer: Pliable Pixels <pliablepixels@gmail.com> 2017-11-02 14:56:45 -0400
commit: 479b09f62d150cd56990be3d638c6b5f9dc5587c (patch)
tree: ba3361ab9418ebb755289f70450d25d51168e700 /www/index.html
parent: 22c27c6b6e53c17604f03466f573241c6e801a15 (diff)
1 files changed, 25 insertions, 128 deletions
diff --git a/www/index.html b/www/index.html
index 615d22c1..90fd465c 100644
--- a/www/index.html
+++ b/www/index.html
@@ -9,6 +9,9 @@
 
     <meta http-equiv="Content-Security-Policy" content="img-src * blob: android-webview-video-poster: cdvphotolibrary:  'self' data: ws: wss://*; default-src * blob: 'self' gap: wss: ws: data:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; connect-src * http: https: ws: wss://*;">
 
+
+   
+
     <!--<meta http-equiv="Content-Security-Policy" content="img-src * blob: android-webview-video-poster: cdvphotolibrary:  'self' data:; default-src * blob: 'self' gap: wss: ws: ; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval';connect-src * http: https: ws: wss:;">-->
     <title></title>
     <meta name="format-detection" content="telephone=no">
@@ -32,8 +35,10 @@
 
     <script src="lib/ionic/js/ionic.bundle.js"></script>
     <script src="lib/ngCordova/dist/ng-cordova.min.js"></script>
+   
     <script src="cordova.js"></script>
-    <script src="lib/filelogger/dist/filelogger.min.js"></script>
+    
+    
     <script src="lib/localforage/dist/localforage.js"></script>
     <script src="lib/localforage-cordovasqlitedriver/dist/localforage-cordovasqlitedriver.js"></script>
     <script src="js/ionicUtils.js"></script>
@@ -54,6 +59,7 @@
     <script src="lib/moment/min/moment-with-locales.min.js"></script>
     <script src="lib/ng-mfb/src/mfb-directive.js"></script>
     <script src="lib/angular-touch/angular-touch.min.js"></script>
+    <script src="lib/filelogger/dist/filelogger.min.js"></script>
 
 
     <!-- unmanaged externals -->
@@ -111,146 +117,25 @@
     <script src="js/MenuController.js"></script>
     <script src="js/EventsModalGraphCtrl.js"></script>
     <script src="js/InvalidApiCtrl.js"></script>
+
+
+
+    
 </head>
 <!-- <body ng-app="starter" > -->
 <!-- I want to start angular only after cordova device is ready, so I'll tag it on device ready -->
 
-<body bgcolor="#555555">
+<body  bgcolor="#555555">
     <!-- For some reason - which I haven't debugged yet, when I was using the ionic side menu template
       I was having problems with tabs/sliders in views, I think its to do with controls being alive in
       the menu. this approach puts controls in each page and that works well -->
     <!-- This is the Side menu options -->
     <!-- ng-cloak makes sure no HTML items load up before Angular is initialized -->
     <!-- This avoids sudden flashes of odd/mis-aligned icons-->
-    <ion-side-menus delegate-handle="sideMenu" ng-cloak>
-        <ion-side-menu-content>
-            <ion-nav-bar class="bar-stable nav-title-slide-ios7">
-                <ion-nav-back-button class="button-icon">
-                    <span class="icon ion-ios7-arrow-left"></span>
-                </ion-nav-back-button>
-            </ion-nav-bar>
-            <ion-nav-view></ion-nav-view>
-        </ion-side-menu-content>
-        <ion-side-menu>
-            <ion-header-bar class="bar bar-header bar-stable">
-                <h1 class="title">{{'kMenuOptions'|translate}}</h1>
-            </ion-header-bar>
-            <ion-content has-header="true" mouse-wheel-scroll>
-                <!-- <ion-scroll scrollbar-y="false" style="height:100%" >-->
-                <ion-list>
-                    <ion-item href="#/montage" menu-close>
-                        <!--<span ng-if="$root.runMode=='lowbw'" style="float:right;margin-top:-18px;background-color:#f1c40f;color:#000;font-size:11px;opacity:0.7;width:20px;border-radius: 0px 0px 5px 5px;display:inline-block;text-align:center;">&nbsp;<i class="icon ion-arrow-graph-down-left"></i>&nbsp;</span>-->
-                        <span class=" item-icon-left">
-                            <i class="icon ion-grid"></i>
-                        </span>{{'kMenuMontage'|translate}}
-                    </ion-item>
-                   
-                    <ion-item href="#/timeline" menu-close>
-                        <span class=" item-icon-left">
-                            <i class="icon ion-android-time"></i>
-                        </span>{{'kMenuTimeline'|translate}}
-                    </ion-item>
-                    <ion-item href="#/events/0/false" menu-close>
-                        <span class=" item-icon-left">
-                            <i class="icon ion-ios-calendar-outline"></i>
-                        </span>{{'kMenuEvents'|translate}}
-                    </ion-item>
-
-                     <ion-item href="#/montage-history" menu-close>
-                        <span class=" item-icon-left">
-                            <i class="icon ion-ios-keypad-outline"></i>
-                        </span>{{'kMenuEventMontage'|translate}}
-                    </ion-item>
 
-                    
-                    <ion-item href="#/monitors" menu-close>
-                        <span class=" item-icon-left">
-                            <i class="icon ion-ios-videocam-outline"></i>
-                        </span>{{'kMenuMonitors'|translate}}
-                    </ion-item>
-                    <ion-item href="#/state" menu-close>
-                        <span class=" item-icon-left">
-                            <i class="icon ion-information-circled"></i>
-                        </span> {{'kMenuSystemStatus'|translate}}
-                    </ion-item>
-                    <ion-item nav-clear menu-close href="#/login/false">
-                        <span class=" item-icon-left">
-                                <i class="icon ion-person"></i>
-                                {{'kMenuZMSettings'|translate}}
-                                <!--<span class="item-note" style="width:90px">
-                                    {{$root.getProfileName();}}
-                                </span>-->
-                        <span style="float:right;margin-top:-18px;background-color:#444444;color:#fff;font-size:11px;opacity:0.7;width:90px;border-radius: 0px 0px 5px 5px;:text-overflow:ellipsis;overflow:hidden;white-space:nowrap;display:inline-block;text-align:center;">&nbsp;{{$root.getProfileName();}}&nbsp;</span>
-                        </span>
-                    </ion-item>
-                    <ion-item nav-clear menu-close href="#/devoptions">
-                        <span class=" item-icon-left">
-                            <i class="icon ion-settings"></i>
-                        </span> {{'kMenuDevSettings'|translate}}
-                    </ion-item>
-                    <div ng-controller="MenuController">
-                        <ion-item ng-click="switchLang()" nav-clear menu-close href="">
-                            <span class=" item-icon-left">
-                            <i class="icon ion-earth"></i>
-                        </span> {{'kLanguage'|translate}}
-                        </ion-item>
-                    </div>
-                    <ion-item nav-clear menu-close href="#/help">
-                        <span class=" item-icon-left">
-                            <i class="icon ion-help"></i>
-                        </span> {{'kMenuHelp'|translate}}
-                    </ion-item>
-                    <ion-item nav-clear menu-close href="#/wizard">
-                        <span class=" item-icon-left">
-                            <i class="icon ion-wand"></i>
-                        </span> {{'kMenuWizard'|translate}}
-                    </ion-item>
-                    <div ng-if="$root.showBlog">
-                        <ion-item nav-clear menu-close href="#/news">
-                            <span class=" item-icon-left">
-                                <i class="icon ion-radio-waves"></i>
-                            </span>{{'kMenuNews'|translate}}<span style="color:#268d3a;"> {{$root.newBlogPost}}</span>
-                        </ion-item>
-                    </div>
-                    <ion-item nav-clear menu-close href="#/log">
-                        <span class=" item-icon-left">
-                            <i class="icon ion-clipboard"></i>
-                        </span> {{'kMenuLogs'|translate}}
-                    </ion-item>
-                    <div ng-if="$root.newVersionAvailable &&  $root.platformOS=='desktop'">
-                        <ion-item nav-clear menu-close href="">
-                            <span class=" item-icon-left">
-                                <i class="icon ion-email-unread"></i>
-                            </span> <span style="color:#268d3a;">{{$root.newVersionAvailable}}</span>
-                        </ion-item>
-                    </div>
-                   <!-- <div ng-if="$root.platformOS=='android'">
-                        <ion-item ng-click="$root.exitApp();">
-                            <span class=" item-icon-left">
-                            <i class="icon ion-close-circled"></i>
-                        </span> {{'kMenuExit'|translate}}
-                        </ion-item>
-                    </div>-->
-                    <ion-item style="color:rgb(106, 106, 106); font-size:90%;">
-                        <i class="ion-ios-location"></i> {{$root.getLocalTimeZone();}}
-                        <br/>
-                        <span ng-if="$root.isTzSupported()"><i class="icon icon-server"></i> {{$root.getServerTimeZoneNow();}}   </span>
-                    </ion-item>
-                </ion-list>
-                <!--</ion-scroll>-->
-            </ion-content>
-        </ion-side-menu>
-    </ion-side-menus>
     <!--  This is where is bootstrap angular - if I don't do this, then the window jumps around
     after the status bar comes on - because the window kicked in before phonegap got ready -->
-    <script>
-    window.ionic.Platform.ready(function()
-    {
-        console.log("******* PLATFORM READY ****");
-
-        angular.bootstrap(document, ['zmApp']);
-    });
-    </script>
+   
     <!-- keyboard input jump fix 
     https://forum.ionicframework.com/t/ionic-keyboard-scroll-issue-ios/34420/2?u=pliablepixels
     -->
@@ -259,6 +144,15 @@
    // window.addEventListener('native.keyboardshow', keyboardShowHandler);
    //alert ('Hello');
 
+
+              
+        window.ionic.Platform.ready(function()
+        {
+             console.log("******* PLATFORM READY ****");
+             angular.bootstrap(document, ['zmApp']);
+        });
+
+
     function keyboardShowHandler(e)
     {
         setTimeout(function()
@@ -270,6 +164,9 @@
         }, 0);
     }
     </script>
+
+
+    <ion-nav-view></ion-nav-view>
 </body>
 
 </html>
author	Pliable Pixels <pliablepixels@gmail.com>	2017-11-02 14:56:45 -0400
committer	Pliable Pixels <pliablepixels@gmail.com>	2017-11-02 14:56:45 -0400
commit	479b09f62d150cd56990be3d638c6b5f9dc5587c (patch)
tree	ba3361ab9418ebb755289f70450d25d51168e700 /www/index.html
parent	22c27c6b6e53c17604f03466f573241c6e801a15 (diff)