diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-04-10 10:47:35 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-04-10 10:47:35 -0400 |
| commit | a29f9a676a6ea3bad56ede05cd1a1c82ffbbe8e9 (patch) | |
| tree | 7e6e6bfb23390a64344fdfe2272a5da04c2dd97c /www/js | |
| parent | 42bc21f7d0b4acfeefa5f4c2708203be78f57778 (diff) | |
#219 - everything upgraded
Former-commit-id: 15f58d10df83feda8199a1b904433e625ef36b44
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/TimelineModalCtrl.js | 5 | ||||
| -rw-r--r-- | www/js/app.js | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/www/js/TimelineModalCtrl.js b/www/js/TimelineModalCtrl.js index 05a94696..139493ec 100644 --- a/www/js/TimelineModalCtrl.js +++ b/www/js/TimelineModalCtrl.js @@ -202,6 +202,8 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', ' { $scope.eid = event.event.Event.Id; + + $scope.alarm_images=[]; /*data = { labels: [], @@ -504,7 +506,8 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', ' items[i].tap_selected = true; $scope.alarm_images.push({ relativePath:items[i].relativePath, - fid:items[i].fid, + fid:ite + ms[i].fid, fname:items[i].fname, score:items[i].score, time:moment(items[i].x).format("MMM D,"+ZMDataModel.getTimeFormat()), diff --git a/www/js/app.js b/www/js/app.js index ab4432c4..603c4867 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -134,17 +134,17 @@ angular.module('zmApp', [ //------------------------------------------------------------------ // switch between collection repeat or ng-repeat //------------------------------------------------------------------- -.directive('repeat', function ($compile, $rootScope) { +.directive('repeatsmart', function ($compile, $rootScope) { return { restrict: 'A', priority: 2000, terminal: true, link: function (scope, element) { var repeatDirective = ($rootScope.platformOS == 'desktop') ? 'ng-repeat' : 'collection-repeat'; - //console.log ("*********** REPEAT SCROLL IS " + repeatDirective); + console.log ("*********** REPEAT SCROLL IS " + repeatDirective); - element.attr(repeatDirective, element.attr('repeat')); - element.removeAttr('repeat'); + element.attr(repeatDirective, element.attr('repeatsmart')); + element.removeAttr('repeatsmart'); $compile(element)(scope); } }; @@ -1383,6 +1383,7 @@ angular.module('zmApp', [ //$httpProvider.defaults.withCredentials = true; $httpProvider.interceptors.push('timeoutHttpIntercept'); $ionicConfigProvider.navBar.alignTitle('center'); + //$ionicConfigProvider.scrolling.jsScrolling(false); $stateProvider .state('app', { |