fix(edit): fix saving issue in edit mode

Fix usage of $document closes #286
sensebox · Nov 26, 2018 · f81a9d8 · f81a9d8
1 parent b56092b
commit f81a9d8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/app/scripts/controllers/account.box.edit.general.js b/app/scripts/controllers/account.box.edit.general.js
@@ -5,9 +5,9 @@
     .module('openSenseMapApp')
     .controller('EditBoxGeneralController', EditBoxGeneralController);
 
-  EditBoxGeneralController.$inject = ['$state', '$document', 'notifications', 'boxData', 'AccountService'];
+  EditBoxGeneralController.$inject = ['$document', 'notifications', 'boxData', 'AccountService'];
 
-  function EditBoxGeneralController ($state, $document, notifications, boxData, AccountService) {
+  function EditBoxGeneralController ($document, notifications, boxData, AccountService) {
     var vm = this;
     vm.editingMarker = {};
     vm.password = '';
@@ -25,7 +25,7 @@
     }
 
     function save () {
-      var imgsrc = angular.element($document.getElementById('flowUploadImage')).attr('src');
+      var imgsrc = angular.element($document[0].getElementById('flowUploadImage')).attr('src');
       var data = {
         name: vm.editingMarker.name,
         description: vm.editingMarker.description,

diff --git a/app/scripts/controllers/signup.login.js b/app/scripts/controllers/signup.login.js
@@ -6,9 +6,9 @@
     .module('openSenseMapApp')
     .controller('SignupLoginController', SignupLoginController);
 
-  SignupLoginController.$inject = ['$rootScope', '$scope', '$state', '$window', '$document', '$q', 'AccountService'];
+  SignupLoginController.$inject = ['$rootScope', '$scope', '$state', '$q', 'AccountService'];
 
-  function SignupLoginController ($rootScope, $scope, $state, $window, $document, $q, AccountService) {
+  function SignupLoginController ($rootScope, $scope, $state, $q, AccountService) {
     var vm = this;
 
     vm.signup = {

diff --git a/app/scripts/services/boxesService.js b/app/scripts/services/boxesService.js
@@ -30,24 +30,27 @@
         return getBoxesWithProgress({ minimal: true, classify: true })
           .then(function (response) {
             boxes = response;
+
             return boxes;
           });
-      } else {
-        return Promise.resolve(boxes);
       }
+
+      return Promise.resolve(boxes);
     }
 
-    function getBoxesFullMetadata() {
+    function getBoxesFullMetadata () {
       if (!fullMetadataLoaded) {
         return getBoxesWithProgress({ minimal: false, classify: true })
           .then(function (response) {
             fullMetadataLoaded = true;
             boxes = response;
+
             return boxes;
           });
-      } else {
-        return Promise.resolve(boxes);
       }
+
+      return Promise.resolve(boxes);
+
     }
 
     function getBoxesWithProgress (params) {