@breakside/jskit 2021.36.0 → 2021.39.0

package/Frameworks/DOM.jsframework/Info.json

@@ -1,7 +1,7 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.DOM",
-  "JSBundleVersion": "2021.36.0",
+  "JSBundleVersion": "2021.39.0",
   "JSDevelopmentLanguage": "en",
   "JSCopyright": "Copyright © 2020 Breakside Inc.",
   "JSBundleEnvironments": {
@@ -9,5 +9,5 @@
     "node": "DOM+Node.js"
   },
   "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-  "GitRevision": "a05794c19ef82e8d139b4741d4c40b71c8804921"
+  "GitRevision": "8e2a12a2f49c7be2623e2ac6d371a68b2cdfeaa5"
 }

package/Frameworks/DOM.jsframework/io.breakside.JSKit.DOM-bundle.js

@@ -3,7 +3,7 @@ JSBundle.bundles['io.breakside.JSKit.DOM'] = {
   "Info": {
     "JSBundleType": "framework",
     "JSBundleIdentifier": "io.breakside.JSKit.DOM",
-    "JSBundleVersion": "2021.36.0",
+    "JSBundleVersion": "2021.39.0",
     "JSDevelopmentLanguage": "en",
     "JSCopyright": "Copyright © 2020 Breakside Inc.",
     "JSBundleEnvironments": {
@@ -11,7 +11,7 @@ JSBundle.bundles['io.breakside.JSKit.DOM'] = {
       "node": "DOM+Node.js"
     },
     "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-    "GitRevision": "a05794c19ef82e8d139b4741d4c40b71c8804921"
+    "GitRevision": "8e2a12a2f49c7be2623e2ac6d371a68b2cdfeaa5"
   },
   "Resources": [],
   "ResourceLookup": {

package/Frameworks/FontKit.jsframework/Info.json

@@ -1,12 +1,12 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.FontKit",
-  "JSBundleVersion": "2021.36.0",
+  "JSBundleVersion": "2021.39.0",
   "JSDevelopmentLanguage": "en",
   "JSCopyright": "Copyright © 2020 Breakside Inc.",
   "JSBundleEnvironments": {
     "html": "FontKit+HTML.js"
   },
   "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-  "GitRevision": "a05794c19ef82e8d139b4741d4c40b71c8804921"
+  "GitRevision": "8e2a12a2f49c7be2623e2ac6d371a68b2cdfeaa5"
 }

package/Frameworks/FontKit.jsframework/io.breakside.JSKit.FontKit-bundle.js

@@ -3,14 +3,14 @@ JSBundle.bundles['io.breakside.JSKit.FontKit'] = {
   "Info": {
     "JSBundleType": "framework",
     "JSBundleIdentifier": "io.breakside.JSKit.FontKit",
-    "JSBundleVersion": "2021.36.0",
+    "JSBundleVersion": "2021.39.0",
     "JSDevelopmentLanguage": "en",
     "JSCopyright": "Copyright © 2020 Breakside Inc.",
     "JSBundleEnvironments": {
       "html": "FontKit+HTML.js"
     },
     "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-    "GitRevision": "a05794c19ef82e8d139b4741d4c40b71c8804921"
+    "GitRevision": "8e2a12a2f49c7be2623e2ac6d371a68b2cdfeaa5"
   },
   "Resources": [],
   "ResourceLookup": {

package/Frameworks/Foundation.jsframework/Info.json

@@ -1,7 +1,7 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.Foundation",
-  "JSBundleVersion": "2021.36.0",
+  "JSBundleVersion": "2021.39.0",
   "JSDevelopmentLanguage": "en",
   "JSCopyright": "Copyright © 2020 Breakside Inc.",
   "JSBundleEnvironments": {
@@ -9,5 +9,5 @@
     "node": "Foundation+Node.js"
   },
   "JSLicenseNotice": "Licensed under the Breakside Public License, Version 1.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nIf a copy of the License was not distributed with this file, you may\nobtain a copy at\n\n    http://breakside.io/licenses/LICENSE-1.0.txt\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n",
-  "GitRevision": "a05794c19ef82e8d139b4741d4c40b71c8804921"
+  "GitRevision": "8e2a12a2f49c7be2623e2ac6d371a68b2cdfeaa5"
 }

package/Frameworks/Foundation.jsframework/JS/JSColor+HTML.js

@@ -19,12 +19,21 @@
 JSColor.definePropertiesFromExtensions({
 
     _cachedCSSString: null,
+    _cachedCSSNumber: -1,
 
     cssString: function(){
-        if (this._cachedCSSString === null){
+        if (this._cachedCSSString === null || this._cachedCSSNumber !== JSColorSpace._cssCacheNumber){
             var rgbaColor = this.rgbaColor();
             this._cachedCSSString = 'rgba(%d, %d, %d, %f)'.sprintf(Math.round(rgbaColor.components[0] * 255), Math.round(rgbaColor.components[1] * 255), Math.round(rgbaColor.components[2] * 255), rgbaColor.components[3]);
+            this._cachedCSSNumber = JSColor._cssCacheNumber;
         }
         return this._cachedCSSString;
     }
-});
+
+});
+
+JSColor._cssCacheNumber = 0;
+
+JSColor.invalidateCSSCache = function(){
+    ++JSColor._cssCacheNumber;
+};

package/Frameworks/Foundation.jsframework/JS/JSColor.js

@@ -16,6 +16,7 @@
 // #import "JSObject.js"
 // #import "CoreTypes.js"
 // #import "JSColorSpace.js"
+/* global JSBundle, JSSpec */
 'use strict';
 
 (function(){
@@ -153,12 +154,19 @@ JSClass('JSColor', JSObject, {
     },
 
     initWithBlendedColor: function(base, otherColor, blendPercentage){
-        otherColor = otherColor.rgbaColor();
-        var original = base.rgbaColor();
-        var r = original.red   + (otherColor.red   - original.red)   * blendPercentage;
-        var g = original.green + (otherColor.green - original.green) * blendPercentage;
-        var b = original.blue  + (otherColor.blue  - original.blue)  * blendPercentage;
-        this.initWithRGBA(r, g, b, original.alpha);
+        while (base._space instanceof JSMappedColorSpace){
+            base = base._space.colorFromComponents(base._components);
+        }
+        while (otherColor._space instanceof JSMappedColorSpace){
+            otherColor = otherColor._space.colorFromComponents(otherColor._components);
+        }
+        if (base.space !== otherColor.space || !base.space.canMixComponents){
+            base = base.rgbaColor();
+            otherColor = otherColor.rgbaColor();
+        }
+        var components = base.space.mixedComponents(base.components, otherColor.components, blendPercentage);
+        components.push(base.alpha);
+        this.initWithSpaceAndComponents(base.space, components);
     },
 
     initWithSpec: function(spec){
@@ -180,12 +188,38 @@ JSClass('JSColor', JSObject, {
             }
             this.initWithRGBA.apply(this, components);
         }else if (spec.containsKey("white")){
-            this.initWithWhite(spec.valueForKey("white"));
+            var white = spec.valueForKey("white");
+            components = white.parseNumberArray();
+            this.initWithWhite.apply(this, components);
         }else if (spec.containsKey("blendBase") && spec.containsKey("with") && spec.containsKey("percent")){
             var base = spec.valueForKey("blendBase", JSColor);
             var otherColor = spec.valueForKey("with", JSColor);
             var blendPercentage = spec.valueForKey("percent") / 100;
             this.initWithBlendedColor(base, otherColor, blendPercentage);
+        }else if (spec.containsKey("space")){
+            var spaceName = spec.valueForKey("space");
+            var space = JSColorSpace[spaceName];
+            if (space === undefined){
+                throw new Error("Unknown color space: %s".sprintf(spaceName));
+            }
+            components = [];
+            for (var componentName in space.componentNames){
+                if (!spec.containsKey(componentName)){
+                    throw new Error("Missing component %s for color in space: %s".sprintf(componentName, spaceName));
+                }
+                components[space.componentNames[componentName]] = spec.valueForKey(componentName);
+            }
+            if (space instanceof JSMappedColorSpace){
+                components.push(1);
+            }
+            var alpha = 1;
+            if (spec.containsKey("alpha")){
+                alpha = spec.valueForKey("alpha");
+            }else if (space instanceof JSMappedColorSpace){
+                alpha = -1;
+            }
+            components.push(alpha);
+            this.initWithSpaceAndComponents(space, components);
         }
     },
 
@@ -196,12 +230,7 @@ JSClass('JSColor', JSObject, {
         if (this._space !== other._space){
             return false;
         }
-        for (var i = 0, l = this._components.length; i < l; ++i){
-            if (Math.round(this._components[i] * 255) != Math.round(other._components[i] * 255)){
-                return false;
-            }
-        }
-        return true;
+        return this._space.compareComponents(this._components, other._components) && Math.round(this.alpha * 255) === Math.round(other.alpha * 255);
     },
 
     toString: function(){
@@ -209,21 +238,29 @@ JSClass('JSColor', JSObject, {
     },
 
     getAlpha: function(){
-        return this.components[this.components.length - 1];
+        var alpha = this._components[this._space.numberOfComponents];
+        if (alpha < 0){
+            alpha = this._space.alphaFromComponents(this._components);
+        }
+        return alpha;
     },
 
     colorWithAlpha: function(alpha){
         var components = JSCopy(this._components);
-        components[components.length - 1] = alpha;
+        components[this._space.numberOfComponents] = alpha;
         return JSColor.initWithSpaceAndComponents(this._space, components);
     },
 
     colorDarkenedByPercentage: function(darkenPercentage){
-        return this.rgbaColor().colorByBlendingColor(JSColor.black, darkenPercentage);
+        var components = this._space.componentsDarkenedByPercentage(this._components, darkenPercentage);
+        components.push(this.alpha);
+        return JSColor.initWithSpaceAndComponents(this._space, components);
     },
 
     colorLightenedByPercentage: function(lightenPercentage){
-        return this.rgbaColor().colorByBlendingColor(JSColor.white, lightenPercentage);
+        var components = this._space.componentsLightenedByPercentage(this._components, lightenPercentage);
+        components.push(this.alpha);
+        return JSColor.initWithSpaceAndComponents(this._space, components);
     },
 
     colorByBlendingColor: function(otherColor, blendPercentage){
@@ -231,7 +268,6 @@ JSClass('JSColor', JSObject, {
     },
 
     rgbaColor: function(){
-        var components;
         if (this._space === JSColorSpace.rgb){
             return this;
         }
@@ -241,7 +277,6 @@ JSClass('JSColor', JSObject, {
     },
 
     grayColor: function(){
-        var components;
         if (this._space === JSColorSpace.gray){
             return this;
         }
@@ -268,7 +303,7 @@ JSClass('JSColor', JSObject, {
         }
         return {
             space: this._space.name,
-            components: JSCopy(this.components)
+            components: JSCopy(this._components)
         };
     },
 
@@ -344,7 +379,7 @@ Object.defineProperties(JSColor, {
         configurable: true,
         get: function JSColor_getClearColor(){
             var color = JSColor.initWithRGBA(0, 0, 0, 0);
-            Object.defineProperty(this, 'clear', {value: color});
+            Object.defineProperty(JSColor, 'clear', {value: color});
             return color;
         }
     },
@@ -353,7 +388,7 @@ Object.defineProperties(JSColor, {
         configurable: true,
         get: function JSColor_getWhiteColor(){
             var color = JSColor.initWithWhite(1.0);
-            Object.defineProperty(this, 'white', {value: color});
+            Object.defineProperty(JSColor, 'white', {value: color});
             return color;
         }
     },
@@ -362,7 +397,7 @@ Object.defineProperties(JSColor, {
         configurable: true,
         get: function JSColor_getBlackColor(){
             var color = JSColor.initWithWhite(0);
-            Object.defineProperty(this, 'black', {value: color});
+            Object.defineProperty(JSColor, 'black', {value: color});
             return color;
         }
     },
@@ -371,7 +406,7 @@ Object.defineProperties(JSColor, {
         configurable: true,
         get: function JSColor_getBlackColor(){
             var color = JSColor.initWithRGBA(1.0, 0, 0);
-            Object.defineProperty(this, 'red', {value: color});
+            Object.defineProperty(JSColor, 'red', {value: color});
             return color;
         }
     },
@@ -380,7 +415,7 @@ Object.defineProperties(JSColor, {
         configurable: true,
         get: function JSColor_getBlackColor(){
             var color = JSColor.initWithRGBA(0, 1.0, 0);
-            Object.defineProperty(this, 'green', {value: color});
+            Object.defineProperty(JSColor, 'green', {value: color});
             return color;
         }
     },
@@ -389,13 +424,14 @@ Object.defineProperties(JSColor, {
         configurable: true,
         get: function JSColor_getBlackColor(){
             var color = JSColor.initWithRGBA(0, 0, 1.0);
-            Object.defineProperty(this, 'blue', {value: color});
+            Object.defineProperty(JSColor, 'blue', {value: color});
             return color;
         }
     },
 
 });
 
+
 JSColor.contentType = "x-jskit/jscolor";
 
 })();

package/Frameworks/Foundation.jsframework/JS/JSColorSpace.js

@@ -15,6 +15,7 @@
 
 // #import "JSObject.js"
 // #import "CoreTypes.js"
+/* global JSSpec, JSBundle, JSColor */
 'use strict';
 
 (function(){
@@ -22,6 +23,7 @@
 JSClass("JSColorSpace", JSObject, {
 
     numberOfComponents: 0,
+    canMixComponents: true,
 
     rgbFromComponents: function(components){
         return JSColorSpace.rgb.componentsFromSpace(this, components);
@@ -31,6 +33,10 @@ JSClass("JSColorSpace", JSObject, {
         return JSColorSpace.gray.componentsFromSpace(this, components);
     },
 
+    alphaFromComponents: function(components){
+        return 1;
+    },
+
     xyzFromComponents: function(components){
     },
 
@@ -45,7 +51,36 @@ JSClass("JSColorSpace", JSObject, {
         }
         var xyz = space.xyzFromComponents(components);
         return this.componentsFromXYZ(xyz);
-    }
+    },
+
+    mixedComponents: function(a, b, percentage){
+        var mixed = [];
+        for (var i = 0; i < this.numberOfComponents; ++i){
+            mixed.push(a[i] + (b[i] - a[i]) * percentage);
+        }
+        return mixed;
+    },
+
+    componentsDarkenedByPercentage: function(components, percentage){
+        var rgb = this.rgbFromComponents(components);
+        var darkenedRGB = JSColorSpace.rgb.componentsDarkenedByPercentage(rgb, percentage);
+        return this.componentsFromSpace(JSColorSpace.rgb, darkenedRGB);
+    },
+
+    componentsLightenedByPercentage: function(components, percentage){
+        var rgb = this.rgbFromComponents(components);
+        var lightenedRGB = JSColorSpace.rgb.componentsLightenedByPercentage(rgb, percentage);
+        return this.componentsFromSpace(JSColorSpace.rgb, lightenedRGB);
+    },
+
+    compareComponents: function(a, b){
+        for (var i = 0; i < this.numberOfComponents; ++i){
+            if (a[i] !== b[i]){
+                return false;
+            }
+        }
+        return true;
+    },
 
 });
 
@@ -186,6 +221,22 @@ JSClass("JSRGBColorSpace", JSColorSpace, {
         return [(components[0] + components[1] + components[2]) / 3];
     },
 
+    componentsDarkenedByPercentage: function(components, percentage){
+        return [
+            components[0] - components[0] * percentage,
+            components[1] - components[1]  * percentage,
+            components[2] - components[2]  * percentage
+        ];
+    },
+
+    componentsLightenedByPercentage: function(components, percentage){
+        return [
+            components[0] + (1.0 - components[0]) * percentage,
+            components[1] + (1.0 - components[1]) * percentage,
+            components[2] + (1.0 - components[2]) * percentage
+        ];
+    },
+
     // MARK: - Lab conversions
 
     xyzFromComponents: function(components){
@@ -328,6 +379,15 @@ JSClass("JSRGBColorSpace", JSColorSpace, {
         ];
     },
 
+    compareComponents: function(a, b){
+        for (var i = 0; i < this.numberOfComponents; ++i){
+            if (Math.round(a[i] * 255) !== Math.round(b[i] * 255)){
+                return false;
+            }
+        }
+        return true;
+    }
+
 });
 
 JSClass("JSGrayColorSpace", JSColorSpace, {
@@ -346,6 +406,27 @@ JSClass("JSGrayColorSpace", JSColorSpace, {
         return [components[0]];
     },
 
+    compareComponents: function(a, b){
+        for (var i = 0; i < this.numberOfComponents; ++i){
+            if (Math.round(a[i] * 255) !== Math.round(b[i] * 255)){
+                return false;
+            }
+        }
+        return true;
+    },
+
+    componentsDarkenedByPercentage: function(components, percentage){
+        return [
+            components[0] - components[0] * percentage
+        ];
+    },
+
+    componentsLightenedByPercentage: function(components, percentage){
+        return [
+            components[0] + (1.0 - components[0]) * percentage
+        ];
+    }
+
 });
 
 JSClass("JSDerivedColorSpace", JSColorSpace, {
@@ -382,6 +463,133 @@ JSClass("JSDerivedColorSpace", JSColorSpace, {
 
 });
 
+JSClass("JSMappedColorSpace", JSColorSpace, {
+
+    canMixComponents: false,
+
+    colorFromComponents: function(components){
+    },
+
+    rgbFromComponents: function(components){
+        var rgba = this.colorFromComponents(components).rgbaColor().components;
+        return [
+            rgba[0],
+            rgba[1],
+            rgba[2],
+        ];
+    },
+
+    grayFromComponents: function(components){
+        var graya = this.colorFromComponents(components).grayColor().components;
+        return [
+            graya[0],
+        ];
+    },
+
+    alphaFromComponents: function(components){
+        return this.colorFromComponents(components).alpha;
+    },
+
+    xyzFromComponents: function(components){
+        var rgb = this.rgbFromComponents(components);
+        return JSColorSpace.rgb.xyzFromComponents(rgb);
+    },
+
+    componentsFromXYZ: function(xyz){
+        throw new Error("Unable to convert from xyz -> %s mapped color space".sprintf(this.name));
+    },
+
+});
+
+JSClass("JSIndexedColorSpace", JSMappedColorSpace, {
+
+    name: "indexed",
+    numberOfComponents: 2,
+    componentNames: {"index": 0},
+    colors: null,
+
+    init: function(){
+        this.colors = [];
+    },
+
+    addColor: function(color){
+        var index = this.colors.length;
+        this.colors.push(color);
+        return JSColor.initWithSpaceAndComponents(this, [index, 1, -1]);
+    },
+
+    setColorAtIndex: function(color, index){
+        this.colors[index] = color;
+    },
+
+    colorFromComponents: function(components){
+        var color = this.colors[components[0]];
+        if (components[1] < 1){
+            color = color.colorDarkenedByPercentage(1 - components[1]);
+        }else if (components[1] > 1){
+            color = color.colorLightenedByPercentage(components[1] - 1);
+        }
+        return color;
+    },
+
+    componentsDarkenedByPercentage: function(components, percentage){
+        return [
+            components[0],
+            components[1] * (1.0 - percentage)
+        ];
+    },
+
+    componentsLightenedByPercentage: function(components, percentage){
+        return [
+            components[0],
+            components[1] * (1.0 + percentage)
+        ];
+    }
+
+});
+
+JSClass("JSNamedColorSpace", JSMappedColorSpace, {
+
+    name: "named",
+    numberOfComponents: 2,
+    componentNames: {"name": 0},
+    colors: null,
+
+    init: function(){
+        this.colors = {};
+    },
+
+    setColorForName: function(name, color){
+        this.colors[name] = color;
+        return JSColor.initWithSpaceAndComponents(this, [name, 1, -1]);
+    },
+
+    colorFromComponents: function(components){
+        var color = this.colors[components[0]];
+        if (components[1] < 1){
+            color = color.colorDarkenedByPercentage(1 - components[1]);
+        }else if (components[1] > 1){
+            color = color.colorLightenedByPercentage(components[1] - 1);
+        }
+        return color;
+    },
+
+    componentsDarkenedByPercentage: function(components, percentage){
+        return [
+            components[0],
+            components[1] * (1.0 - percentage)
+        ];
+    },
+
+    componentsLightenedByPercentage: function(components, percentage){
+        return [
+            components[0],
+            components[1] * (1.0 + percentage)
+        ];
+    }
+
+});
+
 Object.defineProperties(JSColorSpace, {
 
     rgb: {

package/Frameworks/Foundation.jsframework/JS/JSSpec.js

@@ -66,7 +66,7 @@ JSClass("JSSpec", JSObject, {
         }else if (typeof(value) == 'object'){
             this._dictionaryValue = value;
         }
-        this._root = root;
+        this._root = root || this;
         this._cache = {};
     },
 

package/Frameworks/Foundation.jsframework/JS/JSSynchronizer.js

@@ -101,7 +101,15 @@ JSClass("JSSynchronizer", JSObject, {
             },
         };
         try{
-            this.action.call(this.target, context);
+            var promise = this.action.call(this.target, context);
+            if (promise instanceof Promise){
+                context.started();
+                promise.then(function(){
+                    context.completed();
+                }, function(error){
+                    context.completed(error);
+                });
+            }
         }catch (e){
             logger.error(e);
             this.error = e;

package/Frameworks/Foundation.jsframework/JS/JSURL.js

@@ -361,9 +361,48 @@ JSClass("JSURL", JSObject, {
         this._query = null;
     },
 
+    _createQuery: function(other){
+        var url = this;
+        var query = Object.create(JSFormFieldMap.prototype, {
+
+            add: {
+                value: function(name, value){
+                    JSFormFieldMap.prototype.add.call(this, name, value);
+                    url._encodedQuery = this.urlEncoded();
+                    if (url._encodedQuery.length === 0){
+                        url._encodedQuery = null;
+                    }
+                }
+            },
+
+            set: {
+                value: function(name, value){
+                    JSFormFieldMap.prototype.set.call(this, name, value);
+                    url._encodedQuery = this.urlEncoded();
+                    if (url._encodedQuery.length === 0){
+                        url._encodedQuery = null;
+                    }
+                }
+            },
+
+            unset: {
+                value: function(name, value){
+                    JSFormFieldMap.prototype.unset.call(this, name);
+                    url._encodedQuery = this.urlEncoded();
+                    if (url._encodedQuery.length === 0){
+                        url._encodedQuery = null;
+                    }
+                }
+            }
+
+        });
+        JSFormFieldMap.call(query, other);
+        return query;
+    },
+
     getQuery: function(){
         if (this._query === null){
-            this._query = JSFormFieldMap();
+            this._query = this._createQuery();
             if (this._encodedQuery !== null){
                 this._query.decode(this._encodedQuery, true);
             }
@@ -373,9 +412,9 @@ JSClass("JSURL", JSObject, {
 
     setQuery: function(query){
         if (query === null){
-            this._query = JSFormFieldMap();
+            this._query = this._createQuery();
         }else{
-            this._query = JSFormFieldMap(query);
+            this._query = this._createQuery(query);
         }
         this._encodedQuery = this._query.urlEncoded();
         if (this._encodedQuery.length === 0){