Working on...

Author: hikalkan

SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/Abp/Framework/scripts/libs/angular/abp.ng.js

@@ -1,4 +1,4 @@
-(function(abp, angular) {
+(function (abp, angular) {
 
     if (!angular) {
         return;
@@ -9,59 +9,61 @@
     var abpModule = angular.module('abp', []);
 
     abpModule.config([
-        '$httpProvider', function($httpProvider) {
+        '$httpProvider', function ($httpProvider) {
             //$httpProvider.defaults.transformResponse.push(function (a) {
             //    return a;
             //});
         }
     ]);
 
     abpModule.factory('abp.$http', [
-        '$q', '$http', function($q, $http) {
-            return function (options) {
+        '$q', '$http', function ($q, $http) {
 
-                options.transformResponse = function(strData) {
-                    var data = strData && JSON.parse(strData);
-                    if (data) {
-                        if (data.targetUrl) {
-                            location.href = data.targetUrl;
-                        }
-
-                        if (data.success === true) {
-                            return data.result;
-                        } else { //data.success === false
-                            if (data.error) {
-                                abp.message.error(data.error.message);
-                            }
-
-                            if (data.unAuthorizedRequest && !data.targetUrl) {
-                                location.reload();
-                            }
-
-                            if (data.targetUrl) {
-                                location.href = data.targetUrl;
-                            }
-
-                            //TODO: ERROR
-                            return null;
-                        }
-                    } else { //no data sent to back
-                        return strData;
-                    }
-                };
+            //var defaultOptions = {
+            //    transformResponse: function (strData) {
+            //        if (!strData) {
+            //            return strData;
+            //        }
+
+            //        var data = JSON.parse(strData);
+            //        if (!data) { //Needless check?
+            //            return strData;
+            //        }
+
+            //        if (data.targetUrl) { //TODO: Check if it works and does not prevent return value!
+            //            location.href = data.targetUrl;
+            //        }
+
+            //        if (data.success === true) {
+            //            return data.result;
+            //        } else { //data.success === false
+            //            if (data.error) {
+            //                abp.log.error(data.error.details);
+            //                abp.message.error(data.error.message);
+            //            }
+
+            //            if (data.unAuthorizedRequest && !data.targetUrl) {
+            //                location.reload();
+            //            }
 
-                return $http(options);
+            //            return data;
+            //        }
+
+            //    }
+            //};
+
+            return function (options) {
+
+                return $http($.extend({}, defaultOptions, options));
             };
         }
     ]);
 
     abpModule.factory('services.tasksystem.task', [
-        'abp.$http', function($http) {
-            return new function() {
-                //this.getTasks = abp.services.tasksystem.task.getTasks;
-
+        'abp.$http', function ($http) {
+            return new function () {
                 //Working on this code!
-                this.getTasks = function(input) {
+                this.getTasks = function (input) {
                     return $http({
                         url: '/api/services/tasksystem/task/GetTasks',
                         method: 'POST',

SimpleTaskSystemSPA_AngularJs_EntityFramework/SimpleTaskSystem.Web/App/Main/views/task/list.js

@@ -16,7 +16,6 @@
         });
 
         vm.refreshTasks = function () {
-            //NOTE: Working on task service!
             taskService.getTasks({
                 state: $scope.selectedTaskState > 0 ? $scope.selectedTaskState : null
             }).success(function (data) {