@breakside/jskit 2022.22.1 → 2022.23.0

package/Frameworks/DOM.jsframework/Info.json

@@ -1,7 +1,7 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.DOM",
-  "JSBundleVersion": "2022.22.1",
+  "JSBundleVersion": "2022.23.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": "5fd19ed5f4d9bc2a74be2eef1e45ad5c0de02cc9"
+  "GitRevision": "e2a77335b26d1a321448e73eb7b733cdd0714cc8"
 }

package/Frameworks/DOM.jsframework/JS/XMLSerializer.js

@@ -113,10 +113,15 @@ XMLSerializer.prototype = {
                     str += " " + node.name;
                 }
                 if (node.publicId.length > 0){
-                    str += " " + node.publicId;
-                }
-                if (node.systemId.length > 0){
-                    str += " " + node.systemId;
+                    value = node.publicId.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;");
+                    str += ' PUBLIC "%s"'.sprintf(value);
+                    if (node.systemId.length > 0){
+                        value = node.systemId.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;");
+                        str += ' "%s"'.sprintf(value);
+                    }
+                }else if (node.systemId.length > 0){
+                    value = node.systemId.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;");
+                    str += ' SYSTEM "%s"'.sprintf(value);
                 }
                 str += ">\n";
             }

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": "2022.22.1",
+    "JSBundleVersion": "2022.23.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": "5fd19ed5f4d9bc2a74be2eef1e45ad5c0de02cc9"
+    "GitRevision": "e2a77335b26d1a321448e73eb7b733cdd0714cc8"
   },
   "Resources": [],
   "ResourceLookup": {

package/Frameworks/DOM.jsframework/sources.json

@@ -4,14 +4,16 @@
     "files": [
       "DOM.js"
     ],
-    "features": []
+    "features": [],
+    "globals": []
   },
   "html": {
     "frameworks": [],
     "files": [
       "DOM+HTML.js"
     ],
-    "features": []
+    "features": [],
+    "globals": []
   },
   "node": {
     "frameworks": [
@@ -33,6 +35,11 @@
       "XMLSerializer.js",
       "DOM+Node.js"
     ],
-    "features": []
+    "features": [],
+    "globals": [
+      "DOM",
+      "DOMParser",
+      "XMLSerializer"
+    ]
   }
 }

package/Frameworks/FontKit.jsframework/Info.json

@@ -1,12 +1,12 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.FontKit",
-  "JSBundleVersion": "2022.22.1",
+  "JSBundleVersion": "2022.23.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": "5fd19ed5f4d9bc2a74be2eef1e45ad5c0de02cc9"
+  "GitRevision": "e2a77335b26d1a321448e73eb7b733cdd0714cc8"
 }

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": "2022.22.1",
+    "JSBundleVersion": "2022.23.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": "5fd19ed5f4d9bc2a74be2eef1e45ad5c0de02cc9"
+    "GitRevision": "e2a77335b26d1a321448e73eb7b733cdd0714cc8"
   },
   "Resources": [],
   "ResourceLookup": {

package/Frameworks/FontKit.jsframework/sources.json

@@ -12,7 +12,38 @@
       "FNTFontDescriptor.js",
       "FontKit.js"
     ],
-    "features": []
+    "features": [],
+    "globals": [
+      "FNTOpenTypeFont",
+      "FNTOpenTypeFontTable",
+      "FNTOpenTypeFontTableHead",
+      "FNTOpenTypeFontTableName",
+      "FNTOpenTypeFontTableHhea",
+      "FNTOpenTypeFontTableHmtx",
+      "FNTOpenTypeFontTableCmap",
+      "FNTOpenTypeFontTableOS2",
+      "FNTOpenTypeFontTableMaxp",
+      "FNTOpenTypeFontTablePost",
+      "FNTOpenTypeFontTableCFF",
+      "FNTOpenTypeFontTableGlyf",
+      "FNTOpenTypeFontTableLoca",
+      "FNTOpenTypeFontCmap",
+      "FNTOpenTypeFontCmapNull",
+      "FNTOpenTypeFontCmap0",
+      "FNTOpenTypeFontCmap4",
+      "FNTOpenTypeFontCmap6",
+      "FNTOpenTypeFontCmap10",
+      "FNTOpenTypeFontCmap12",
+      "FNTOpenTypeFontCmap13",
+      "FNTOpenTypeGlyph",
+      "FNTOpenTypeSimpleGlyph",
+      "FNTOpenTypeCompoundGlyph",
+      "FNTOpenTypeConstructor",
+      "FNTType1Font",
+      "FNTAdobeNamesToUnicode",
+      "FNTCompactFontFormat",
+      "FNTFontDescriptor"
+    ]
   },
   "html": {
     "frameworks": [],
@@ -20,6 +51,7 @@
       "FNTFontDescriptor+HTML.js",
       "FontKit+HTML.js"
     ],
-    "features": []
+    "features": [],
+    "globals": []
   }
 }

package/Frameworks/Foundation.jsframework/Info.json

@@ -1,7 +1,7 @@
 {
   "JSBundleType": "framework",
   "JSBundleIdentifier": "io.breakside.JSKit.Foundation",
-  "JSBundleVersion": "2022.22.1",
+  "JSBundleVersion": "2022.23.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": "5fd19ed5f4d9bc2a74be2eef1e45ad5c0de02cc9"
+  "GitRevision": "e2a77335b26d1a321448e73eb7b733cdd0714cc8"
 }

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

@@ -16,6 +16,8 @@
 // #import "Javascript.js"
 // #import "JSObject.js"
 // #import "JSTextAttachment.js"
+// #import "JSFont.js"
+// #import "JSColor.js"
 'use strict';
 
 (function(){
@@ -40,6 +42,123 @@ JSClass("JSAttributedString", JSObject, {
         this._runs = [run];
     },
 
+    initFromDictionary: function(dictionary){
+        this._string = typeof(dictionary.string) === "string" ? dictionary.string : "";
+        this._runs = [];
+        var i, l;
+        var runDictionary;
+        var run;
+        var attributes;
+        var name;
+        var location = 0;
+        var length;
+        var maxLength = this._string.length;
+        var decodeAttribute = function(name, value){
+            switch (name){
+                case JSAttributedString.Attribute.font:
+                    return JSAttributedString.AttributeDecoder.font(value);
+                case JSAttributedString.Attribute.textColor:
+                case JSAttributedString.Attribute.backgroundColor:
+                    return JSAttributedString.AttributeDecoder.color(value);
+                case JSAttributedString.Attribute.link:
+                    return JSAttributedString.AttributeDecoder.url(value);
+                case JSAttributedString.Attribute.cursor:
+                    return JSAttributedString.AttributeDecoder.skip(value);
+                case JSAttributedString.Attribute.attachment:
+                    // TODO:
+                    return JSAttributedString.AttributeDecoder.skip(value);
+                case JSAttributedString.Attribute.maskCharacter:
+                    return JSAttributedString.AttributeDecoder.string(value);
+                case JSAttributedString.Attribute.bold:
+                case JSAttributedString.Attribute.italic:
+                case JSAttributedString.Attribute.underline:
+                case JSAttributedString.Attribute.strike:
+                    return JSAttributedString.AttributeDecoder.boolean(value);
+                case JSAttributedString.Attribute.lineHeight:
+                case JSAttributedString.Attribute.lineSpacing:
+                    return JSAttributedString.AttributeDecoder.number(value);
+                case JSAttributedString.Attribute.textAlignment:
+                    // TODO: validate
+                case JSAttributedString.Attribute.lineBreakMode:
+                    // TODO: validate
+                default:
+                    return value;
+            }
+            
+        };
+        if (dictionary.runs instanceof Array){
+            for (i = 0, l = dictionary.runs.length; i < l && maxLength > 0; ++i){
+                runDictionary = dictionary.runs[i];
+                attributes = {};
+                length = typeof(runDictionary.length) === "number" ? Math.min(maxLength, Math.floor(runDictionary.length)) : 0;
+                if (length > 0 && typeof(runDictionary.attributes) === "object"){
+                    for (name in runDictionary.attributes){
+                        attributes[name] = decodeAttribute(name, runDictionary.attributes[name]);
+                    }
+                    this._runs.push(JSAttributedStringRun(JSRange(location, length), attributes));
+                }
+                location += length;
+                maxLength -= length;
+            }
+        }
+        if (maxLength > 0){
+            this._runs.push(JSAttributedStringRun(JSRange(location, maxLength), {}));
+        }
+        if (this._runs.length === 0){
+            this._runs.push(JSAttributedStringRun(JSRange(0, 0), {}));
+        }
+    },
+
+    dictionaryRepresentation: function(){
+        var dictionary = {
+            string: this._string,
+            runs: []
+        };
+        var i, l;
+        var run;
+        var name;
+        var runDictionary;
+        var encodeAttribute = function(name, value){
+            switch (name){
+                case JSAttributedString.Attribute.font:
+                    return JSAttributedString.AttributeEncoder.font(value);
+                case JSAttributedString.Attribute.textColor:
+                case JSAttributedString.Attribute.backgroundColor:
+                    return JSAttributedString.AttributeEncoder.color(value);
+                case JSAttributedString.Attribute.link:
+                    return JSAttributedString.AttributeEncoder.url(value);
+                case JSAttributedString.Attribute.cursor:
+                    return JSAttributedString.Attribute.Encoder.skip(value);
+                case JSAttributedString.Attribute.attachment:
+                    // TODO:
+                    return JSAttributedString.Attribute.Encoder.skip(value);
+                case JSAttributedString.Attribute.bold:
+                case JSAttributedString.Attribute.italic:
+                case JSAttributedString.Attribute.underline:
+                case JSAttributedString.Attribute.strike:
+                case JSAttributedString.Attribute.lineHeight:
+                case JSAttributedString.Attribute.lineSpacing:
+                case JSAttributedString.Attribute.textAlignment:
+                case JSAttributedString.Attribute.lineBreakMode:
+                case JSAttributedString.Attribute.maskCharacter:
+                default:
+                    return value;
+            }
+        };
+        for (i = 0, l = this._runs.length; i < l; ++i){
+            run = this._runs[i];
+            runDictionary = {
+                length: run.range.length,
+                attributes: {}
+            };
+            for (name in run.attributes){
+                runDictionary.attributes[name] = encodeAttribute(name, run.attributes[name]);
+            }
+            dictionary.runs.push(runDictionary);
+        }
+        return dictionary;
+    },
+
     initWithAttributedString: function(attributedString, defaultAttributes){
         this._string = attributedString.string;
         this._runs = [];
@@ -294,6 +413,44 @@ JSClass("JSAttributedString", JSObject, {
         return new JSAttributedStringRunIterator(this, index);
     },
 
+    longestRangeOfAttributeAtIndex: function(attributeName, index){
+        return this.longestRangeOfAttributesAtIndex([attributeName], index);
+    },
+
+    longestRangeOfAttributesAtIndex: function(attributeNames, index){
+        var runIndex = this._runIndexForStringIndex(index);
+        var run = this._runs[runIndex];
+        var range = JSRange(run.range);
+        var attributes = {};
+        var i, l;
+        for (i = 0, l = attributeNames.length; i < l; ++i){
+            attributes[attributeNames[i]] = run.attributes[attributeNames[i]];
+        }
+        i = runIndex - 1;
+        while (i >= 0){
+            run = this._runs[i];
+            if (run.containsEqualAttributes(attributes)){
+                range.length = range.end - run.range.location;
+                range.location = run.range.location;
+            }else{
+                break;
+            }
+            --i;
+        }
+        i = runIndex + 1;
+        l = this._runs.length;
+        while (i < l){
+            run = this._runs[i];
+            if (run.containsEqualAttributes(attributes)){
+                range.length = run.range.end - range.location;
+            }else{
+                break;
+            }
+            ++i;
+        }
+        return range;
+    },
+
     // MARK: - Formatting
 
     replaceFormat: function(){
@@ -339,7 +496,7 @@ JSClass("JSAttributedString", JSObject, {
         var runA;
         for (var runIndex = lastRunIndex - 1; runIndex >= expandedRunRange.location; --runIndex){
             runA = this._runs[runIndex];
-            if (runA.hasIdenticalAttributes(runB)){
+            if (runA.onlyContainsEqualAttributes(runB.attributes)){
                 this._runs.splice(runIndex, 1);
                 runB.range.location = runA.range.location;
                 runB.range.length += runA.range.length;
@@ -358,7 +515,7 @@ JSClass("JSAttributedString", JSObject, {
         }
         var runA = this._runs[runIndex - 1];
         var runB = this._runs[runIndex];
-        if (runA.hasIdenticalAttributes(runB)){
+        if (runA.onlyContainsEqualAttributes(runB.attributes)){
             this._runs.splice(runIndex, 1);
             runA.range.length += runB.range.length;
         }
@@ -443,6 +600,31 @@ JSAttributedString.Attribute = {
     link: "link"
 };
 
+JSAttributedString.AttributeEncoder = {
+    skip: function(value){ return undefined; },
+    identity: function(value){ return value; },
+    dataBase64: function(value){ return value.base64StringRepresentation(); },
+    dataBase64URL: function(value){ return value.base64URLStringRepresentation(); },
+    dataHex: function(value){ return value.hexStringRepresentation(); },
+    url: function(value){ return value.encodedString; },
+    font: function(value){ return value.dictionaryRepresentation(); },
+    color: function(value){ return value.dictionaryRepresentation(); },
+};
+
+JSAttributedString.AttributeDecoder = {
+    skip: function(value){ return undefined; },
+    identity: function(value){ return value; },
+    dataBase64: function(value){ return value.dataByDecodingBase64(); },
+    dataBase64URL: function(value){ return value.dataByDecodingBase64URL(); },
+    dataHex: function(value){ return value.dataByDecodingHex(); },
+    url: function(value){ return JSURL.initWithString(value); },
+    font: function(value){ return JSFont.initFromDictionary(value); },
+    color: function(value){ return JSColor.initFromDictionary(value); },
+    boolean: function(value){ return typeof(value) === "boolean" ? value : undefined; },
+    number: function(value){ return typeof(value) === "number" ? value : undefined; },
+    string: function(value){ return typeof(value) === "string" ? value : undefined; },
+};
+
 JSAttributedString.SpecialCharacter = {
     attachment: 0xFFFC,
     attachmentUTF16: "\uFFFC"
@@ -471,35 +653,46 @@ function JSAttributedStringRun(range, attributes){
 
 JSAttributedStringRun.prototype = {
 
-    hasIdenticalAttributes: function(other){
+    containsEqualAttributes: function(attributes){
         var attribute;
         var a, b;
-        for (attribute in this.attributes){
-            if (attribute in other.attributes){
-                a = this.attributes[attribute];
-                b = other.attributes[attribute];
-                if (a.isEqual){
-                    if (!a.isEqual(b)){
-                        return false;
-                    }
-                }else if (b.isEqual){
-                    if (!b.isEqual(a)){
-                        return false;
-                    }
-                }else if (a != b){
+        for (attribute in attributes){
+            a = attributes[attribute];
+            b = this.attributes[attribute];
+            if (a === undefined){
+                if (!!b){
                     return false;
                 }
-            }else{
+            }else if (a === null){
+                if (b !== null && b !== undefined){
+                    return false;
+                }
+            }else if (a.isEqual){
+                if (b === null || b === undefined){
+                    return false;
+                }
+                if (!a.isEqual(b)){
+                    return false;
+                }
+            }else if (a != b){
                 return false;
             }
         }
-        for (attribute in other.attributes){
-            if (!(attribute in this.attributes)){
+        return true;
+    },
+
+    onlyContainsEqualAttributes: function(attributes){
+        if (!this.containsEqualAttributes(attributes)){
+            return false;
+        }
+        var attribute;
+        for (attribute in this.attributes){
+            if (!(attribute in attributes)){
                 return false;
             }
         }
         return true;
-    }
+    },
 
 };
 

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

@@ -49,7 +49,7 @@ JSClass("JSFont", JSObject, {
         var weight;
         var style;
         var size;
-        var defaults = JSFont._systemFontDescriptor;
+        var defaults = JSFontDescriptor.system;
         // if ('descriptor' in values){
         //     values = values.descriptor;
         // }
@@ -78,7 +78,7 @@ JSClass("JSFont", JSObject, {
             size = JSFont.Size.normal;
         }
         if (family){
-            var descriptor = JSResourceFontDescriptor.descriptorWithFamily(family, weight, style);
+            var descriptor = JSFontDescriptor.descriptorWithFamily(family, weight, style);
             if (descriptor !== null){
                 return JSFont.initWithDescriptor(descriptor, size);
             }
@@ -86,6 +86,30 @@ JSClass("JSFont", JSObject, {
         return null;
     },
 
+    initFromDictionary: function(dictionary){
+        var descriptor = JSFontDescriptor.descriptorWithFamily(dictionary.family, dictionary.weight, dictionary.style);
+        if (descriptor === null){
+            if (dictionary.url){
+                descriptor = JSURLFontDescriptor.initWithURL(JSURL.initWithString(dictionary.url), dictionary.family, dictionary.weight, dictionary.style);
+                JSFontDescriptor.registerDescriptor(descriptor);
+            }
+        }
+        if (descriptor !== null){
+            return JSFont.initWithDescriptor(descriptor, dictionary.size);
+        }
+        return null;
+    },
+
+    dictionaryRepresentation: function(){
+        return {
+            url: this.descriptor instanceof JSURLFontDescriptor ? this._descriptor.url : undefined,
+            family: this._descriptor.family,
+            weight: this._descriptor.weight,
+            style: this._descriptor.style,
+            size: this.pointSize
+        };
+    },
+
     getFullName: function(){
         return this._descriptor.name;
     },
@@ -187,7 +211,7 @@ JSClass("JSFont", JSObject, {
 });
 
 JSFont.fontWithFamily = function(family, pointSize, weight, style){
-    var descriptor = JSResourceFontDescriptor.descriptorWithFamily(family, weight || JSFont.Weight.regular, style || JSFont.Style.normal);
+    var descriptor = JSFontDescriptor.descriptorWithFamily(family, weight || JSFont.Weight.regular, style || JSFont.Style.normal);
     return JSFont.initWithDescriptor(descriptor, pointSize);
 };
 
@@ -204,12 +228,12 @@ JSFont.registerBundleFonts = function(bundle){
 
 JSFont._registerFontResource = function(bundle, metadata){
     var descriptor = JSResourceFontDescriptor.initWithMetadata(bundle, metadata);
+    JSFontDescriptor.registerDescriptor(descriptor);
     return descriptor;
 };
 
-JSFont._systemFontDescriptor = null;
-
-JSFont.registerSystemFontResource = function(name){
+JSFont.registerSystemFontResource = function(name, bundle){
+    bundle = bundle || JSBundle.mainBundle;
     var ext;
     var extIndex = name.lastIndexOf('.');
     var i, l;
@@ -221,33 +245,33 @@ JSFont.registerSystemFontResource = function(name){
         extGuessed = true;
         ext = "ttf";
     }
-    var metadata = JSBundle.mainBundle.metadataForResourceName(name, ext);
+    var metadata = bundle.metadataForResourceName(name, ext);
     if (extGuessed && metadata === null){
         ext = "otf";
-        metadata = JSBundle.mainBundle.metadataForResourceName(name, ext);
+        metadata = bundle.metadataForResourceName(name, ext);
     }
-    this._systemFontDescriptor = JSResourceFontDescriptor.descriptorsByName[metadata.font.unique_identifier];
+    JSFontDescriptor.system = JSResourceFontDescriptor.descriptorsByName[metadata.font.unique_identifier];
 };
 
 JSFont.registerSystemFont = function(familyName, weight, style){
-    this._systemFontDescriptor = JSResourceFontDescriptor.descriptorWithFamily(familyName, weight || JSFont.Weight.regular, style || JSFont.Style.normal);
+    JSFontDescriptor.system = JSFontDescriptor.descriptorWithFamily(familyName, weight || JSFont.Weight.regular, style || JSFont.Style.normal);
 };
 
 JSFont.registerSystemFontDescriptor = function(descriptor){
-    this._systemFontDescriptor = descriptor;
+    JSFontDescriptor.system = descriptor;
 };
 
 JSFont.unregisterAllFonts = function(){
-    JSResourceFontDescriptor.descriptorsByFamily = {};
+    JSFontDescriptor.descriptorsByFamily = {};
     JSResourceFontDescriptor.descriptorsByName = {};
-    this._systemFontDescriptor = null;
+    JSFontDescriptor.system = null;
 };
 
 JSFont.systemFontOfSize = function(pointSize){
-    if (this._systemFontDescriptor === null){
+    if (JSFontDescriptor.system === null){
         return null;
     }
-    return JSFont.initWithDescriptor(this._systemFontDescriptor, pointSize);
+    return JSFont.initWithDescriptor(JSFontDescriptor.system, pointSize);
 };
 
 JSFont.Size = {

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

@@ -94,4 +94,12 @@ JSDataFontDescriptor.definePropertiesFromExtensions({
 
 });
 
+JSURLFontDescriptor.definePropertiesFromExtensions({
+
+    htmlURLString: function(){
+        return this.url.encodedString;
+    }
+
+});
+
 })();