From 87ebb223f05a58290d80a32d87f9ea643468899d Mon Sep 17 00:00:00 2001
From: Arjun Roychowdhury <pliablepixels@gmail.com>
Date: Tue, 13 Oct 2015 13:07:19 -0400
Subject: https://github.com/pliablepixels/zmNinja/issues/34 - the problem was
 not using ng-show in template

---
 www/external/angular-circular-navigation.js |  2 +-
 www/js/TimelineCtrl.js                      |  3 ++-
 www/templates/timeline.html                 | 17 +++++++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'www')

diff --git a/www/external/angular-circular-navigation.js b/www/external/angular-circular-navigation.js
index 0c99f858..17488768 100644
--- a/www/external/angular-circular-navigation.js
+++ b/www/external/angular-circular-navigation.js
@@ -35,7 +35,7 @@
 	      if (typeof $scope.options.button.onclick === 'function')
 	      {
 		// PP - console.log ("FUNCTION");
-              	$scope.options.isOpen = !$scope.options.isOpen;
+              	//$scope.options.isOpen = !$scope.options.isOpen;
 		$scope.options.button.onclick();
 	      }
 	      else
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
index 3157e516..1afa1141 100644
--- a/www/js/TimelineCtrl.js
+++ b/www/js/TimelineCtrl.js
@@ -446,6 +446,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
     $scope.toggleNav = function () {
         if (navControls == true) {
             navControls = !navControls;
+           // $scope.navControls = navControls;
             // give out animation time
             $timeout(function () {
                 $scope.navControls = navControls;
@@ -734,7 +735,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
         size: 'small',
 
         background: '#982112',
-        isOpen: false,
+        isOpen: true,
         toggleOnClick: false,
         button: {
             cssClass: 'fa  fa-compress fa-2x',
diff --git a/www/templates/timeline.html b/www/templates/timeline.html
index b0ec1409..c3633b72 100644
--- a/www/templates/timeline.html
+++ b/www/templates/timeline.html
@@ -14,12 +14,13 @@
 
 <ion-nav-buttons side="right">
 
-
+<button class="button button-icon button-clear ion-android-more-vertical" ng-click="popover.show($event); ">&nbsp;&nbsp;&nbsp;</button>
+    
     <button class="button button-icon button-clear ion-arrow-move" ng-click="toggleNav();"></button>
     <!--
  <button class="button button-icon button-clear ion-log-in" ng-click="zoom(-0.2)"></button>
         <button class="button button-icon button-clear ion-log-out" ng-click="zoom(0.2)"></button>&nbsp;-->
-     <a style="" class="button button-icon icon ion-android-more-vertical" ng-click="popover.show($event)";> </a>
+     
     </ion-nav-buttons>
     <!--<ion-content data-tap-disabled="true">-->
     <ion-content>
@@ -47,8 +48,12 @@
     </ion-content>
 
 </ion-view>
-<div class="timelinebuttons" ng-if="graphLoaded && navControls">
-                <circular id ="timeline-ctrl" options="radialMenuOptions"  class="animated bounceInRight">
-                </circular>
-    <!-- -->
+
+<div ng-show="graphLoaded && navControls">
+    <div class="timelinebuttons">
+        <circular id="timeline-ctrl" options="radialMenuOptions" class="animated bounceInRight">
+            <!---->
+        </circular>
+        <!-- -->
+    </div>
 </div>
-- 
cgit v1.2.3