From d105052b20c2e6cc14d4d2e86ff95cf157582f77 Mon Sep 17 00:00:00 2001 From: Gunther Brunner Date: Fri, 10 Oct 2014 16:01:39 +0900 Subject: [PATCH] In Angular 1.3.0-rc.5, $animate defers changes till the next digest. Disabled animation for now. --- .../stf/image-onload/image-onload-animate-directive.js | 4 ++++ res/app/control-panes/screenshots/screenshots.jade | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/res/app/components/stf/image-onload/image-onload-animate-directive.js b/res/app/components/stf/image-onload/image-onload-animate-directive.js index 247b42e0..a34bb72b 100644 --- a/res/app/components/stf/image-onload/image-onload-animate-directive.js +++ b/res/app/components/stf/image-onload/image-onload-animate-directive.js @@ -5,6 +5,10 @@ module.exports = function imageOnloadAnimateDirective($parse, $animate) { $animate.addClass(element, 'ng-image-not-loaded') element.bind('load', function () { $animate.removeClass(element, 'ng-image-not-loaded') + + //if(!scope.$$phase) { + // scope.$digest() + //} // console.log('image is loaded') }) } diff --git a/res/app/control-panes/screenshots/screenshots.jade b/res/app/control-panes/screenshots/screenshots.jade index b2103c80..ce9f6945 100644 --- a/res/app/control-panes/screenshots/screenshots.jade +++ b/res/app/control-panes/screenshots/screenshots.jade @@ -39,6 +39,6 @@ h5 {{ device.name }} h6 {{ shot.body.date | date:'HH:mm:ss' }} a(ng-href='{{ shot.body.href }}', target='_blank') - img(ng-src='{{ shot.body.href + shotSizeUrlParameter(480) }}', image-onload-animate).screenshot-image + img(ng-src='{{ shot.body.href + shotSizeUrlParameter(480) }}').screenshot-image .clearfix