timeline joystick controller fix

5 files changed, 15 insertions, 11 deletions

diff --git a/.DS_Store b/.DS_Store
index df2cf64e..b1578a43 100644
--- a/.DS_Store
+++ b/.DS_Store
diff --git a/www/.DS_Store b/www/.DS_Store
index e5db5491..39cf68c3 100644
--- a/www/.DS_Store
+++ b/www/.DS_Store
diff --git a/www/external/angular-circular-navigation.js b/www/external/angular-circular-navigation.js
index f8ac7034..0c99f858 100644
--- a/www/external/angular-circular-navigation.js
+++ b/www/external/angular-circular-navigation.js
@@ -8,6 +8,7 @@
   'use strict';
 
   /*global define, module, exports, require */
+  // options.isOpen
 
   /* istanbul ignore next */
   var angular = window.angular ? window.angular : 'undefined' !== typeof require ? require('angular') : undefined;
@@ -21,7 +22,7 @@
           options: '='
         },
         template: '<button ng-click="toggleMenu()" class="cn-button {{options.button.size}}" ng-class="options.button.cssClass" style="background: {{options.button.background ? options.button.background : options.background}}; color: {{options.button.color ? options.button.color :options.color}};">{{options.content}}</button>' +
-          '<div class="cn-wrapper {{options.size}} items-{{options.items.length}}" ng-class="{\'opened-nav\': options.isOpen}"><ul>' +
+          '<div class="cn-wrapper {{options.size}} items-{{options.items.length}}" ng-class="{\'opened-nav\':options.isOpen}"><ul>' +
           '<li ng-repeat="item in options.items">' +
           '<a ng-hide="item.empty" ng-click="perform(options, item)" ng-class="{\'is-active\': item.isActive}" class="{{item.cssClass}}" style="background: {{item.background ? item.background : options.background}}; color: {{item.color ? item.color : options.color}};">' +
           '<span>{{item.content}}</span>' +
@@ -33,7 +34,8 @@
 	     //PP
 	      if (typeof $scope.options.button.onclick === 'function')
 	      {
-	//	console.log ("FUNCTION");
+		// PP - console.log ("FUNCTION");
+              	$scope.options.isOpen = !$scope.options.isOpen;
 		$scope.options.button.onclick();
 	      }
 	      else
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
index d30118c0..1fdb03a9 100644
--- a/www/js/TimelineCtrl.js
+++ b/www/js/TimelineCtrl.js
@@ -430,8 +430,8 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
         }
         else
         {
-            element.removeClass("animated bounceInRight");
-            element.addClass("animated bounceOutLeft");
+           element.removeClass("animated bounceInRight");
+           element.addClass("animated bounceOutLeft");
         }
 
     };
@@ -677,15 +677,15 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
 
         $scope.radialMenuOptions = {
         content: '',
-        size:"small",
+        size:'small',
 
         background: '#982112',
-        isOpen: true,
+        isOpen: false,
         toggleOnClick: false,
         button: {
-            cssClass: "fa  fa-compress fa-2x",
-            size:"small",
-            onclick: function() { timeline.fit();}
+            cssClass: 'fa  fa-compress fa-2x',
+            size:'small',
+            onclick: function() { console.log ("fitting");timeline.fit();}
         },
         items: [
             {
@@ -791,7 +791,8 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
                 }
             },
     ]};
-
+    
+   
 
 
 
diff --git a/www/templates/timeline.html b/www/templates/timeline.html
index 79e7010d..6436c694 100644
--- a/www/templates/timeline.html
+++ b/www/templates/timeline.html
@@ -48,6 +48,7 @@
 
 </ion-view>
 <div class="timelinebuttons" ng-if="graphLoaded && navControls">
-                <circular id ="timeline-ctrl" options="radialMenuOptions" class="animated bounceInRight">
+                <circular id ="timeline-ctrl" options="radialMenuOptions"  class="animated bounceInRight">
                 </circular>
+    <!-- -->
 </div>