Merge branch 'release/1.1.2'

pagekit · Feb 2, 2017 · 37df5c7 · 37df5c7
2 parents 1e9b78c + d08bc27
commit 37df5c7
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 103 deletions.
diff --git a/README.md b/README.md
@@ -22,9 +22,9 @@ $ bower install vue-resource
 ```
 
 ### CDN
-Available on [jsdelivr](https://cdn.jsdelivr.net/vue.resource/1.1.1/vue-resource.min.js), [cdnjs](https://cdnjs.com/libraries/vue-resource) or [unpkg](https://unpkg.com/[email protected].1/dist/vue-resource.min.js).
+Available on [jsdelivr](https://cdn.jsdelivr.net/vue.resource/1.1.2/vue-resource.min.js), [cdnjs](https://cdnjs.com/libraries/vue-resource) or [unpkg](https://unpkg.com/[email protected].2/dist/vue-resource.min.js).
 ```html
-<script src="https://cdn.jsdelivr.net/vue.resource/1.1.1/vue-resource.min.js"></script>
+<script src="https://cdn.jsdelivr.net/vue.resource/1.1.2/vue-resource.min.js"></script>
 ```
 
 ## Example

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "vue-resource",
   "main": "dist/vue-resource.js",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "The HTTP client for Vue.js",
   "homepage": "https://github.com/vuejs/vue-resource",
   "license": "MIT",

diff --git a/dist/vue-resource.common.js b/dist/vue-resource.common.js
@@ -1,5 +1,5 @@
 /*!
- * vue-resource v1.1.1
+ * vue-resource v1.1.2
  * https://github.com/vuejs/vue-resource
  * Released under the MIT License.
  */
@@ -270,6 +270,8 @@ var hasOwnProperty = ref.hasOwnProperty;
 var ref$1 = [];
 var slice = ref$1.slice;
 
+var inBrowser = typeof window !== 'undefined';
+
 var Util = function (Vue) {
     util = Vue.util;
     debug = Vue.config.debug || !Vue.config.silent;
@@ -309,9 +311,7 @@ function isString(val) {
     return typeof val === 'string';
 }
 
-function isBoolean(val) {
-    return val === true || val === false;
-}
+
 
 function isFunction(val) {
     return typeof val === 'function';
@@ -639,9 +639,6 @@ var template = function (options) {
  * Service for URL templating.
  */
 
-var ie = document.documentMode;
-var el = document.createElement('a');
-
 function Url(url, params) {
 
     var self = this || {}, options$$1 = url, transform;
@@ -711,7 +708,9 @@ Url.params = function (obj) {
 
 Url.parse = function (url) {
 
-    if (ie) {
+    var el = document.createElement('a');
+
+    if (document.documentMode) {
         el.href = url;
         url = el.href;
     }
@@ -801,34 +800,29 @@ var xdrClient = function (request) {
  * CORS Interceptor.
  */
 
-var ORIGIN_URL = Url.parse(location.href);
-var SUPPORTS_CORS = 'withCredentials' in new XMLHttpRequest();
+var SUPPORTS_CORS = inBrowser && 'withCredentials' in new XMLHttpRequest();
 
 var cors = function (request, next) {
 
-    if (!isBoolean(request.crossOrigin) && crossOrigin(request)) {
-        request.crossOrigin = true;
-    }
+    if (inBrowser) {
 
-    if (request.crossOrigin) {
+        var orgUrl = Url.parse(location.href);
+        var reqUrl = Url.parse(request.getUrl());
 
-        if (!SUPPORTS_CORS) {
-            request.client = xdrClient;
-        }
+        if (reqUrl.protocol !== orgUrl.protocol || reqUrl.host !== orgUrl.host) {
 
-        delete request.emulateHTTP;
+            request.crossOrigin = true;
+            request.emulateHTTP = false;
+
+            if (!SUPPORTS_CORS) {
+                request.client = xdrClient;
+            }
+        }
     }
 
     next();
 };
 
-function crossOrigin(request) {
-
-    var requestUrl = Url.parse(Url(request));
-
-    return (requestUrl.protocol !== ORIGIN_URL.protocol || requestUrl.host !== ORIGIN_URL.host);
-}
-
 /**
  * Body Interceptor.
  */

diff --git a/dist/vue-resource.es2015.js b/dist/vue-resource.es2015.js
@@ -1,5 +1,5 @@
 /*!
- * vue-resource v1.1.1
+ * vue-resource v1.1.2
  * https://github.com/vuejs/vue-resource
  * Released under the MIT License.
  */
@@ -268,6 +268,8 @@ var hasOwnProperty = ref.hasOwnProperty;
 var ref$1 = [];
 var slice = ref$1.slice;
 
+var inBrowser = typeof window !== 'undefined';
+
 var Util = function (Vue) {
     util = Vue.util;
     debug = Vue.config.debug || !Vue.config.silent;
@@ -307,9 +309,7 @@ function isString(val) {
     return typeof val === 'string';
 }
 
-function isBoolean(val) {
-    return val === true || val === false;
-}
+
 
 function isFunction(val) {
     return typeof val === 'function';
@@ -637,9 +637,6 @@ var template = function (options) {
  * Service for URL templating.
  */
 
-var ie = document.documentMode;
-var el = document.createElement('a');
-
 function Url(url, params) {
 
     var self = this || {}, options$$1 = url, transform;
@@ -709,7 +706,9 @@ Url.params = function (obj) {
 
 Url.parse = function (url) {
 
-    if (ie) {
+    var el = document.createElement('a');
+
+    if (document.documentMode) {
         el.href = url;
         url = el.href;
     }
@@ -799,34 +798,29 @@ var xdrClient = function (request) {
  * CORS Interceptor.
  */
 
-var ORIGIN_URL = Url.parse(location.href);
-var SUPPORTS_CORS = 'withCredentials' in new XMLHttpRequest();
+var SUPPORTS_CORS = inBrowser && 'withCredentials' in new XMLHttpRequest();
 
 var cors = function (request, next) {
 
-    if (!isBoolean(request.crossOrigin) && crossOrigin(request)) {
-        request.crossOrigin = true;
-    }
+    if (inBrowser) {
 
-    if (request.crossOrigin) {
+        var orgUrl = Url.parse(location.href);
+        var reqUrl = Url.parse(request.getUrl());
 
-        if (!SUPPORTS_CORS) {
-            request.client = xdrClient;
-        }
+        if (reqUrl.protocol !== orgUrl.protocol || reqUrl.host !== orgUrl.host) {
 
-        delete request.emulateHTTP;
+            request.crossOrigin = true;
+            request.emulateHTTP = false;
+
+            if (!SUPPORTS_CORS) {
+                request.client = xdrClient;
+            }
+        }
     }
 
     next();
 };
 
-function crossOrigin(request) {
-
-    var requestUrl = Url.parse(Url(request));
-
-    return (requestUrl.protocol !== ORIGIN_URL.protocol || requestUrl.host !== ORIGIN_URL.host);
-}
-
 /**
  * Body Interceptor.
  */

diff --git a/dist/vue-resource.js b/dist/vue-resource.js
@@ -1,5 +1,5 @@
 /*!
- * vue-resource v1.1.1
+ * vue-resource v1.1.2
  * https://github.com/vuejs/vue-resource
  * Released under the MIT License.
  */
@@ -274,6 +274,8 @@ var hasOwnProperty = ref.hasOwnProperty;
 var ref$1 = [];
 var slice = ref$1.slice;
 
+var inBrowser = typeof window !== 'undefined';
+
 var Util = function (Vue) {
     util = Vue.util;
     debug = Vue.config.debug || !Vue.config.silent;
@@ -313,9 +315,7 @@ function isString(val) {
     return typeof val === 'string';
 }
 
-function isBoolean(val) {
-    return val === true || val === false;
-}
+
 
 function isFunction(val) {
     return typeof val === 'function';
@@ -643,9 +643,6 @@ var template = function (options) {
  * Service for URL templating.
  */
 
-var ie = document.documentMode;
-var el = document.createElement('a');
-
 function Url(url, params) {
 
     var self = this || {}, options$$1 = url, transform;
@@ -715,7 +712,9 @@ Url.params = function (obj) {
 
 Url.parse = function (url) {
 
-    if (ie) {
+    var el = document.createElement('a');
+
+    if (document.documentMode) {
         el.href = url;
         url = el.href;
     }
@@ -805,34 +804,29 @@ var xdrClient = function (request) {
  * CORS Interceptor.
  */
 
-var ORIGIN_URL = Url.parse(location.href);
-var SUPPORTS_CORS = 'withCredentials' in new XMLHttpRequest();
+var SUPPORTS_CORS = inBrowser && 'withCredentials' in new XMLHttpRequest();
 
 var cors = function (request, next) {
 
-    if (!isBoolean(request.crossOrigin) && crossOrigin(request)) {
-        request.crossOrigin = true;
-    }
+    if (inBrowser) {
 
-    if (request.crossOrigin) {
+        var orgUrl = Url.parse(location.href);
+        var reqUrl = Url.parse(request.getUrl());
 
-        if (!SUPPORTS_CORS) {
-            request.client = xdrClient;
-        }
+        if (reqUrl.protocol !== orgUrl.protocol || reqUrl.host !== orgUrl.host) {
 
-        delete request.emulateHTTP;
+            request.crossOrigin = true;
+            request.emulateHTTP = false;
+
+            if (!SUPPORTS_CORS) {
+                request.client = xdrClient;
+            }
+        }
     }
 
     next();
 };
 
-function crossOrigin(request) {
-
-    var requestUrl = Url.parse(Url(request));
-
-    return (requestUrl.protocol !== ORIGIN_URL.protocol || requestUrl.host !== ORIGIN_URL.host);
-}
-
 /**
  * Body Interceptor.
  */