fixes

TrigerSoft · Jan 21, 2016 · 1495cf5 · 1495cf5
1 parent d45fd75
commit 1495cf5
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/src/Umbraco.Web.UI.Client/.vscode/tasks.json b/src/Umbraco.Web.UI.Client/.vscode/tasks.json
@@ -5,7 +5,7 @@
     "tasks": [
         {
             "taskName": "build-dev",
-            "args": [],
+            "args": ["--apibaseurl=http://localhost:39246/configuration/dev/"],
             "isBuildCommand": true,
             "isWatching": false,
             "problemMatcher": [
@@ -16,7 +16,7 @@
         },
         {
             "taskName": "build",
-            "args": ["--minify=true"],
+            "args": ["--minify=true", "--apibaseurl=../../configuration/dev/"],
             "isBuildCommand": false,
             "isWatching": false,
             "problemMatcher": [

diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js
@@ -36,7 +36,8 @@ module.exports = function (grunt) {
     // Project configuration.
     grunt.initConfig({
         buildVersion: grunt.option('buildversion') || '7',
-        minify: grunt.option('minify'), //--minify=true
+        minify: grunt.option('minify'), //see tasks.json
+        apibaseurl: grunt.option('apibaseurl'),
         connect: {
             devserver: {
                 options: {

diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/_utils.js
@@ -5,7 +5,7 @@ angular.module('umbraco.mocks').
         //by default we will perform authorization
         var doAuth = true;
         var _compilation = null;
-        var remoteBaseUrl = "http://localhost:39246/configuration/dev/";
+        var remoteBaseUrl = API_BASE_URL;
 
         var compile = function() {
             return $.ajax({

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/deploy.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/deploy.resource.js
@@ -186,7 +186,9 @@ function runResource($q, $http, umbDataFormatter, umbRequestHelper) {
                         "Test",
                         [
                             { seconds: seconds }
-                        ]));
+                        ])).then(function(r) {
+                            return r.data;
+                        });
         }
     };
 }

diff --git a/src/Umbraco.Web.UI.Client/src/index.html b/src/Umbraco.Web.UI.Client/src/index.html
@@ -1,7 +1,6 @@
 <!doctype html>
 <html lang="en">
 <head>
-    <base href="/belle/" />
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 

diff --git a/src/Umbraco.Web.UI.Client/src/loader.dev.js b/src/Umbraco.Web.UI.Client/src/loader.dev.js
@@ -1,3 +1,5 @@
+var API_BASE_URL = '<%=  apibaseurl%>';
+
 (function() {
 
 var deps = [
@@ -54,7 +56,7 @@ var deps = [
 
   var min = '<%=  minify%>';
 
-  deps.splice.apply(deps, [-2, 0].concat(min ? umbMinDeps : umbFullDeps));
+  deps.push.apply(deps, (min ? umbMinDeps : umbFullDeps));
 
 LazyLoad.js(
     deps,

diff --git a/...o.Web.UI.Client/src/views/propertyeditors/readonlylistview/readonlylistview.controller.js b/...o.Web.UI.Client/src/views/propertyeditors/readonlylistview/readonlylistview.controller.js
@@ -192,6 +192,7 @@ function readOnlyListViewController($scope, $injector) {
         }
         if (runId) {
             $scope.listViewResultSet = null;
+            $scope.pagination = [];
             unsubscribe = contentResource.pollChildren($scope, "add-results", config.contentId, runId)
         }
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                             "Test",
                             [
                                 { seconds: seconds }
-                            ]));
+                            ])).then(function(r) {
+                                return r.data;
+                            });
             }
         };
     }
@@ Expand Down @@