update to 1.14.2

rweng · Mar 1, 2015 · 2d1c166 · 2d1c166
1 parent d0a81c9
commit 2d1c166
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 75 deletions.
diff --git a/vendor/assets/javascripts/IPv6.js b/vendor/assets/javascripts/IPv6.js
@@ -2,7 +2,7 @@
  * URI.js - Mutating URLs
  * IPv6 Support
  *
- * Version: 1.14.1
+ * Version: 1.14.2
  *
  * Author: Rodney Rehm
  * Web: http://medialize.github.io/URI.js/

diff --git a/vendor/assets/javascripts/SecondLevelDomains.js b/vendor/assets/javascripts/SecondLevelDomains.js
@@ -2,7 +2,7 @@
  * URI.js - Mutating URLs
  * Second Level Domain (SLD) Support
  *
- * Version: 1.14.1
+ * Version: 1.14.2
  *
  * Author: Rodney Rehm
  * Web: http://medialize.github.io/URI.js/

diff --git a/vendor/assets/javascripts/URI.js b/vendor/assets/javascripts/URI.js
@@ -1,7 +1,7 @@
 /*!
  * URI.js - Mutating URLs
  *
- * Version: 1.14.1
+ * Version: 1.14.2
  *
  * Author: Rodney Rehm
  * Web: http://medialize.github.io/URI.js/
@@ -57,7 +57,7 @@
     return this;
   }
 
-  URI.version = '1.14.1';
+  URI.version = '1.14.2';
 
   var p = URI.prototype;
   var hasOwn = Object.prototype.hasOwnProperty;
@@ -462,15 +462,20 @@
       if (parts.port === '/') {
         parts.port = null;
       }
-    } else if (string.indexOf(':') !== string.lastIndexOf(':')) {
-      // IPv6 host contains multiple colons - but no port
-      // this notation is actually not allowed by RFC 3986, but we're a liberal parser
-      parts.hostname = string.substring(0, pos) || null;
-      parts.port = null;
     } else {
-      t = string.substring(0, pos).split(':');
-      parts.hostname = t[0] || null;
-      parts.port = t[1] || null;
+      var firstColon = string.indexOf(':');
+      var firstSlash = string.indexOf('/');
+      var nextColon = string.indexOf(':', firstColon + 1);
+      if (nextColon !== -1 && (firstSlash === -1 || nextColon < firstSlash)) {
+        // IPv6 host contains multiple colons - but no port
+        // this notation is actually not allowed by RFC 3986, but we're a liberal parser
+        parts.hostname = string.substring(0, pos) || null;
+        parts.port = null;
+      } else {
+        t = string.substring(0, pos).split(':');
+        parts.hostname = t[0] || null;
+        parts.port = t[1] || null;
+      }
     }
 
     if (parts.hostname && string.substring(pos).charAt(0) !== '/') {
@@ -689,7 +694,7 @@
         data[name] = undefined;
       }
     } else {
-      throw new TypeError('URI.addQuery() accepts an object, string as the first parameter');
+      throw new TypeError('URI.removeQuery() accepts an object, string as the first parameter');
     }
   };
   URI.hasQuery = function(data, name, value, withinArray) {

diff --git a/vendor/assets/javascripts/URI.min.js b/vendor/assets/javascripts/URI.min.js
diff --git a/vendor/assets/javascripts/URITemplate.js b/vendor/assets/javascripts/URITemplate.js
@@ -2,7 +2,7 @@
  * URI.js - Mutating URLs
  * URI Template Support - http://tools.ietf.org/html/rfc6570
  *
- * Version: 1.14.1
+ * Version: 1.14.2
  *
  * Author: Rodney Rehm
  * Web: http://medialize.github.io/URI.js/

diff --git a/vendor/assets/javascripts/jquery.URI.js b/vendor/assets/javascripts/jquery.URI.js
@@ -2,7 +2,7 @@
  * URI.js - Mutating URLs
  * jQuery Plugin
  *
- * Version: 1.14.1
+ * Version: 1.14.2
  *
  * Author: Rodney Rehm
  * Web: http://medialize.github.io/URI.js/jquery-uri-plugin.html

diff --git a/vendor/assets/javascripts/jquery.URI.min.js b/vendor/assets/javascripts/jquery.URI.min.js