From 31e9d026098596803caab621d52504b83c37db15 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Tue, 4 Mar 2014 13:08:28 +0100 Subject: [PATCH] merged with master --- js/directives.js | 1 + js/services.js | 10 +--------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/js/directives.js b/js/directives.js index 2d963cdd..2d2bb171 100644 --- a/js/directives.js +++ b/js/directives.js @@ -513,6 +513,7 @@ angular.module('myApp.directives', ['myApp.filters']) } scope.$watchCollection('thumb.location', function (newLocation) { + // console.log('new loc', newLocation, arguments); var counterSaved = ++counter; if (!newLocation || newLocation.empty) { element.attr('src', scope.thumb && scope.thumb.placeholder || 'img/blank.gif'); diff --git a/js/services.js b/js/services.js index 20d14af0..b17ab611 100644 --- a/js/services.js +++ b/js/services.js @@ -277,15 +277,7 @@ angular.module('myApp.services', []) templateUrl: 'partials/user_modal.html?2', controller: 'UserModalController', scope: scope, - windowClass: 'user_modal_window', - resolve: { - userFull: MtpApiManager.invokeApi('users.getFullUser', { - id: getUserInput(userID) - }).then(function (result) { - saveApiUser(result.user); - return result; - }) - } + windowClass: 'user_modal_window' }); }