diff options
Diffstat (limited to 'client/js/controllers/image')
| -rwxr-xr-x | client/js/controllers/image/image.js | 13 | ||||
| -rw-r--r-- | client/js/controllers/image/upload.js | 14 |
2 files changed, 19 insertions, 8 deletions
diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js index 1702cb3..7ce3bb9 100755 --- a/client/js/controllers/image/image.js +++ b/client/js/controllers/image/image.js @@ -3,7 +3,7 @@ * * @param {$scope} $scope The $scope service from angular */ -mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity','$rootScope', function ($scope, Image, Loading, Identity, $rootScope) +mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity', '$rootScope', function ($scope, Image, Loading, Identity, $rootScope) { // Update view @@ -21,9 +21,14 @@ mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity','$root callMeAfterGetImage(); } } - - $scope.edit=function(image){ + + $scope.edit = function (image) { $rootScope.$broadcast("editImageEvent", image, Image.getData().axioms); - + } + + $scope.showUploadImageModal = function () { + $rootScope.$broadcast("showUploadImageModalEvent"); + + }; }]); diff --git a/client/js/controllers/image/upload.js b/client/js/controllers/image/upload.js index 6737269..8d62b50 100644 --- a/client/js/controllers/image/upload.js +++ b/client/js/controllers/image/upload.js @@ -22,10 +22,11 @@ mainApp.controller('uploadImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', */ $scope.doUpload = function () { - console.log($('#imageToUpload').prop('files')[0]); + /* console.log($('#imageToUpload').prop('files')[0]); Image.uploadImage($('#imageToUpload').prop('files')[0], function () { - alert("done") - }) + alert("done"); + });*/ + Image.uploadImage("loic",function(){}) /*$("#drop-area-div").dmUploader({ extraData: { "token" : Identity.getToken(), @@ -57,6 +58,11 @@ mainApp.controller('uploadImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', }; + // Manager logout event + $scope.$on('showUploadImageModalEvent', function () { + $scope.token = Identity.getToken(); + + $('#uploadImageModal').modal("show"); + }); - $scope.token = Identity.getToken(); }]); |