Robin Thoni 8 лет назад
Родитель
Сommit
b6226f56b8
3 измененных файлов: 34 добавлений и 10 удалений
  1. 5
    10
      public/app/controllers/upload.controller.js
  2. 1
    0
      public/app/index.html
  3. 28
    0
      public/sdk/Business/errordialog.js

+ 5
- 10
public/app/controllers/upload.controller.js Просмотреть файл

@@ -1,12 +1,12 @@
1 1
 angular.module('app')
2
-    .controller('UploadController', ['$scope', '$state', '$mdDialog', 'EffectsBusiness', 'ImagesBusiness', 'luticateAuthCache',
3
-        function($scope, $state, $mdDialog, EffectsBusiness, ImagesBusiness, luticateAuthCache) {
2
+    .controller('UploadController', ['$scope', '$state', '$mdDialog', 'EffectsBusiness', 'ImagesBusiness', 'luticateAuthCache', 'errorDialogMd',
3
+        function($scope, $state, $mdDialog, EffectsBusiness, ImagesBusiness, luticateAuthCache, errorDialogMd) {
4 4
 
5 5
             $scope.image = null;
6 6
             
7 7
             var promiseImage = {
8 8
                 id: "promiseImage",
9
-                groups: ["imageView"]
9
+                loaderGroups: ["imageView"]
10 10
             };
11 11
 
12 12
             $scope.input = angular.element(angular.element("#filePicker")[0]);
@@ -45,10 +45,7 @@ angular.module('app')
45 45
                 }, promiseImage).then(function(data)
46 46
                 {
47 47
                     $scope.image.content = data.image;
48
-                }, function (error)
49
-                {
50
-                    console.log(error);
51
-                });
48
+                }, errorDialogMd.errorDialog);
52 49
             };
53 50
 
54 51
             $scope.isUploadVisible = function () {
@@ -67,9 +64,7 @@ angular.module('app')
67 64
                 }, promiseImage).then(function(data)
68 65
                 {
69 66
                     console.log(data);
70
-                }, function (error) {
71
-                    console.log(error);
72
-                });
67
+                }, errorDialogMd.errorDialog);
73 68
             };
74 69
 
75 70
             $scope.test = function()

+ 1
- 0
public/app/index.html Просмотреть файл

@@ -58,6 +58,7 @@
58 58
 
59 59
     <!-- SDK -->
60 60
     <script src="../sdk/sdk.js"></script>
61
+    <script src="../sdk/Business/errordialog.js"></script>
61 62
     <script src="../sdk/DataAccess/effects.js"></script>
62 63
     <script src="../sdk/Business/effects.js"></script>
63 64
     <script src="../sdk/DataAccess/images.js"></script>

+ 28
- 0
public/sdk/Business/errordialog.js Просмотреть файл

@@ -0,0 +1,28 @@
1
+/**
2
+ * Created by robin on 4/24/16.
3
+ */
4
+
5
+(function () {
6
+    angular.module("appSdk").factory("errorDialogMd", ['luticateDialogErrorHelper', '$mdDialog', function (luticateDialogErrorHelper, $mdDialog) {
7
+        var Factory = {};
8
+
9
+        Factory.errorMessage = function(data)
10
+        {
11
+            return luticateDialogErrorHelper.errorMessage(data);
12
+        };
13
+
14
+        Factory.errorDialog = function(data)
15
+        {
16
+            $mdDialog.show(
17
+                $mdDialog.alert()
18
+                    // .parent(angular.element(document.querySelector('#popupContainer')))
19
+                    .clickOutsideToClose(true)
20
+                    .title('Error')
21
+                    .textContent(Factory.errorMessage(data))
22
+                    .ok('OK')
23
+            );
24
+        };
25
+
26
+        return Factory;
27
+    }]);
28
+})();

Загрузка…
Отмена
Сохранить