Merge branch 'loic-image-edition' into loic

This commit is contained in:
Loic GUEGAN 2016-04-27 17:03:29 +02:00
commit 9a93133272
7 changed files with 135 additions and 28 deletions

View file

@ -3,7 +3,7 @@
*
* @param {$scope} $scope The $scope service from angular
*/
mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity', function ($scope, Image, Loading, Identity)
mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity','$rootScope', function ($scope, Image, Loading, Identity, $rootScope)
{
// Update view
var callMeAfterGetImage = function () {
@ -20,4 +20,9 @@ mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity', funct
callMeAfterGetImage();
}
}
$scope.edit=function(image){
$rootScope.$broadcast("editImageEvent", image, Image.getData().axioms);
}
}]);