diff options
Diffstat (limited to 'client/js')
| -rw-r--r-- | client/js/controllers/image/edit.js | 3 | ||||
| -rw-r--r-- | client/js/controllers/image/image.js | 2 | ||||
| -rw-r--r-- | client/js/services/Image.js | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/client/js/controllers/image/edit.js b/client/js/controllers/image/edit.js index 3635e21..bab4064 100644 --- a/client/js/controllers/image/edit.js +++ b/client/js/controllers/image/edit.js @@ -5,8 +5,9 @@ */ mainApp.controller('editImageCtrl', ['$scope', 'Image', 'Loading', 'Identity', 'upload', function ($scope, Image, Loading, Identity, upload) { - $scope.$on('editImageEvent', function (eventName, image) { + $scope.$on('editImageEvent', function (eventName, image,axioms) { $scope.image = image; + $scope.axioms=axioms; $('#editImageModal').modal('show'); console.log(image) }); diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js index b74dc76..1702cb3 100644 --- a/client/js/controllers/image/image.js +++ b/client/js/controllers/image/image.js @@ -23,7 +23,7 @@ mainApp.controller('imageCtrl', ['$scope', 'Image', 'Loading', 'Identity','$root } $scope.edit=function(image){ - $rootScope.$broadcast("editImageEvent", image); + $rootScope.$broadcast("editImageEvent", image, Image.getData().axioms); } }]); diff --git a/client/js/services/Image.js b/client/js/services/Image.js index 795f85e..190bbb6 100644 --- a/client/js/services/Image.js +++ b/client/js/services/Image.js @@ -4,7 +4,9 @@ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) { // Data object var data = {}; data.images = null; // Images - + data.axioms={}; + data.axioms.protected=[true,false]; + data.axioms.visibility=["public", "private"]; /** * Parse uploadImage anwser * @param {type} response |