@breakside/jskit 2022.23.0 → 2022.25.1

package/Root/Frameworks/Foundation/JSZip.js

@@ -1,6 +1,9 @@
 // #import "JSObject.js"
 // #import "Promise+JS.js"
 // #import "JSCRC32.js"
+// #import "JSDate.js"
+// #import "JSCalendar.js"
+// #import "Deflate.js"
 "use strict";
 
 JSClass("JSZip", JSObject, {
@@ -14,61 +17,89 @@ JSClass("JSZip", JSObject, {
     offset: 0,
 
     addFile: function(file, completion, target){
+        return this.addFileInDirectory(file, "", {}, completion, target);
+    },
+
+    addFileInDirectory: function(file, directory, attributes, completion, target){
         if (!completion){
             completion = Promise.completion(Promise.resolveNull);
         }
+        if (directory.startsWith("/")){
+            directory = directory.substr(1);
+        }
+        if (directory.length > 1 && !directory.endsWith("/")){
+            directory = directory + "/";
+        }
         file.readData(function(data){
             if (data === null){
                 completion.call(target, new Error("Failed to read file data"));
                 return;
             }
-            this.addDataForFilename(data, file.name, completion, target);
+            var error = null;
+            try{
+                this.addDataForFilename(data, directory + file.name, attributes);
+            }catch (e){
+                error = e;
+            }
+            completion.call(target, error);
         }, this);
         return completion.promise;
     },
 
-    addDataForFilename: function(data, name, completion, target){
-        if (!completion){
-            completion = Promise.completion(Promise.resolveNull);
-        }
-        var error = null;
-        try{
-            var encodedName = name.utf8();
-            var header = JSData.initWithLength(30 + encodedName.length);
-            var dataView = header.dataView();
-            var crc = JSCRC32(data);
-            dataView.setUint32(0, 0x04034b50, true);
-            dataView.setUint16(4, 20, true);
-            dataView.setUint16(6, 0, true);
-            dataView.setUint16(8, 0, true); // no compression
-            dataView.setUint16(10, 0, true);  // date
-            dataView.setUint16(12, 0, true); // date
-            dataView.setUint32(14, crc, true);
-            dataView.setUint32(18, data.length, true);
-            dataView.setUint32(22, data.length, true);
-            dataView.setUint16(26, encodedName.length, true);
-            dataView.setUint16(28, 0, true);
-            encodedName.copyTo(header, 30);
-            this.directory.push({
-                name: name,
-                offset: this.offset,
-                header: header
-            });
-            this.addChunk(header);
-            this.addChunk(data);
-        }catch (e){
-            error = e;
+    addDataForFilename: function(data, name, attributes, deflate){
+        var encodedName = name.utf8();
+        var header = JSData.initWithLength(30 + encodedName.length);
+        var dataView = header.dataView();
+        var crc = JSCRC32(data);
+        var dateComponents = JSCalendar.gregorian.componentsFromDate(JSCalendar.Unit.day | JSCalendar.Unit.month | JSCalendar.Unit.year | JSCalendar.Unit.hour | JSCalendar.Unit.minute | JSCalendar.Unit.second, attributes.updated !== undefined ? JSDate.initWithTimeIntervalSince1970(attributes.updated) : JSDate.now, JSTimeZone.local || JSTimeZone.utc);
+        var dosDate = ((dateComponents.year - 1980) << 9) | ((dateComponents.month) << 5) | (dateComponents.day);
+        var dosTime = ((dateComponents.hour) << 11) | ((dateComponents.minute) << 5) | (Math.floor(dateComponents.second / 2));
+        var storedData = data;
+        var method = 0;
+        if (deflate){
+            var stream = DeflateStream();
+            stream.input = data;
+            stream.output = JSData.initWithLength(data.length);
+            stream.deflate(true);
+            if (stream.state === DeflateStream.State.done){
+                storedData = stream.output.subdataInRange(JSRange(0, stream.outputOffset));
+                method = 8;
+            }
         }
-        completion.call(target, error);
-        return completion.promise;
+        // Local File Header (APPNOTE.txt 4.3.7)
+        // Everything is little-endian
+        dataView.setUint32(0, 0x04034b50, true);                // signtature
+        dataView.setUint16(4, 0x0014, true);                    // version needed to extract (2.0)
+        dataView.setUint16(6, 0, true);                         // general purpose flags
+        dataView.setUint16(8, method, true);                    // compression method (0=none, 8=deflate)
+        dataView.setUint16(10, dosTime, true);                  // last modified time (MS-DOS)
+        dataView.setUint16(12, dosDate, true);                  // last modified date (MS-DOS)
+        dataView.setUint32(14, crc, true);                      // crc-32 (magic number 0xdebb20e3, preconditioned to 0xffffffff, post-conditioned by one's compliment)
+        dataView.setUint32(18, storedData.length, true);        // compressed size
+        dataView.setUint32(22, data.length, true);              // uncompressed size
+        dataView.setUint16(26, encodedName.length, true);       // name length
+        dataView.setUint16(28, 0, true);                        // extra field length
+        encodedName.copyTo(header, 30);                         // name (NOT null-terminated)
+        this.directory.push({
+            name: name,
+            offset: this.offset,
+            header: header
+        });
+        this.chunks.push(header);
+        this.chunks.push(storedData);
+        this.offset += header.length + storedData.length;
+        this._data = null;
     },
 
-    close: function(completion, target){
-        if (!completion){
-            completion = Promise.completion(Promise.resolveNull);
-        }
-        var error = null;
-        try{
+    directory: null,
+
+    chunks: null,
+
+    data: JSReadOnlyProperty("_data", null),
+
+    getData: function(){
+        if (this._data === null){
+            var chunks = JSCopy(this.chunks);
             var i, l;
             var centralDirectoryOffset = this.offset;
             var centralDirectorySize = 0;
@@ -77,49 +108,39 @@ JSClass("JSZip", JSObject, {
             var dataView;
             var file;
             for (i = 0, l = this.directory.length; i < l; ++i){
+                // Central Directory File Header (APPNOTE.txt 4.3.12)
+                // Everything is little-endian
                 file = this.directory[i];
                 header = JSData.initWithLength(46 + (file.header.length - 30));
                 dataView = header.dataView();
-                dataView.setUint32(0, 0x02014b50, true);
-                dataView.setUint16(4, 0, true);
-                file.header.subdataInRange(JSRange(4, 26)).copyTo(header, 6);
-                dataView.setUint16(32, 0, true);
-                dataView.setUint16(34, 0, true);
-                dataView.setUint16(36, 0, true);
-                dataView.setUint32(38, 0, true);
-                dataView.setUint32(42, file.offset, true);
-                file.header.subdataInRange(JSRange(30, file.header.length - 30)).copyTo(header, 46);
+                dataView.setUint32(0, 0x02014b50, true);                        // signature
+                dataView.setUint16(4, 0x0314, true);                            // version made by (UNIX=3, 2.0)
+                file.header.subdataInRange(JSRange(4, 26)).copyTo(header, 6);   // copy from local header
+                dataView.setUint16(32, 0, true);                                // commenet length
+                dataView.setUint16(34, 0, true);                                // disk number start
+                dataView.setUint16(36, 0, true);                                // internal file attributes
+                dataView.setUint32(38, 0, true);                                // external file attributes
+                dataView.setUint32(42, file.offset, true);                      // offset of local header relative to first disk
+                file.header.subdataInRange(JSRange(30, file.header.length - 30)).copyTo(header, 46); // name (ALWAYS forward slashes for directories)
                 centralDirectorySize += header.length;
-                this.addChunk(header);
+                chunks.push(header);
             }
+            // End of Central Directory Record (APPNOTE.txt 4.3.16)
+            // everything is little-endian
             var end = JSData.initWithLength(22);
             dataView = end.dataView();
-            dataView.setUint32(0, 0x06054b50, true);
-            dataView.setUint16(4, 0, true);
-            dataView.setUint16(6, 0, true);
-            dataView.setUint16(8, this.directory.length, true);
-            dataView.setUint16(10, this.directory.length, true);
-            dataView.setUint32(12, centralDirectorySize, true);
-            dataView.setUint32(16, centralDirectoryOffset, true);
-            dataView.setUint16(20, 0, true);
-            this.addChunk(end);
-            this._data = JSData.initWithChunks(this.chunks);
-        }catch (e){
-            error = e;
+            dataView.setUint32(0, 0x06054b50, true);                    // signature
+            dataView.setUint16(4, 0, true);                             // number of this disk
+            dataView.setUint16(6, 0, true);                             // number of the disk with the start of central directory
+            dataView.setUint16(8, this.directory.length, true);         // number of central directory items on this disk
+            dataView.setUint16(10, this.directory.length, true);        // number of central directory items total
+            dataView.setUint32(12, centralDirectorySize, true);         // size of central directory
+            dataView.setUint32(16, centralDirectoryOffset, true);       // offset to central directory with respect to starting disk
+            dataView.setUint16(20, 0, true);                            // zip file comemnt length
+            chunks.push(end);
+            this._data = JSData.initWithChunks(chunks);
         }
-        completion.call(target, error);
-        return completion.promise;
-    },
-
-    addChunk: function(chunk){
-        this.chunks.push(chunk);
-        this.offset += chunk.length;
-    },
-
-    directory: null,
-
-    chunks: null,
-
-    data: JSReadOnlyProperty("_data", null),
+        return this._data;
+    }
 
 });

package/Root/Frameworks/Foundation/String+JS.js

@@ -244,6 +244,25 @@ Object.defineProperties(String.prototype, {
         }
     },
 
+    rangeForParagraphAtIndex: {
+        enumerable: false,
+        value: function String_rangeForParagraphAtIndex(index){
+            var iterator1 = this.userPerceivedCharacterIterator(index);
+            var startIndex = iterator1.range.location;
+            var iterator2 = UserPerceivedCharacterIterator(iterator1);
+            iterator1.decrement();
+            while (!iterator1.isParagraphBreak){
+                startIndex = iterator1.range.location;
+                iterator1.decrement();
+            }
+            while (!iterator2.isParagraphBreak){
+                iterator2.increment();
+            }
+            var endIndex = iterator2.range.end;
+            return JSRange(startIndex, endIndex - startIndex);
+        }
+    },
+
     // -------------------------------------------------------------------------
     // MARK: - Changing a String
 
@@ -1159,6 +1178,22 @@ Object.defineProperties(UserPerceivedCharacterIterator.prototype, {
             // can start with CR, we know the second character must be LF.
             return this._unicodeIterator.character.isLineBreak;
         }
+    },
+
+    isParagraphBreak: {
+        enumerable: true,
+        configurable: false,
+        get: function UserPerceivedCharacterIterator_isMandatoryLineBreak(){
+            if (this._unicodeIterator.character === null){
+                return true;
+            }
+            // Note that even though we're only checking the first character,
+            // it will match the multi-char CRLF sequence, which is considered
+            // to be a single user perceived character.  In this case, only
+            // the CR is checked, but since no other user perceived character
+            // can start with CR, we know the second character must be LF.
+            return this._unicodeIterator.character.isParagraphBreak;
+        }
     }
 
 });

package/Root/Frameworks/Foundation/UnicodeChar.js

@@ -778,6 +778,14 @@ UnicodeChar.prototype = Object.create(Object.prototype, {
             Object.defineProperty(this, 'isLineBreak', {value: this.code === UnicodeChar.LineBreaks.newLine || this.code === UnicodeChar.LineBreaks.formFeed || this.code === UnicodeChar.LineBreaks.carriageReturn || this.code === UnicodeChar.LineBreaks.nextLine || this.code === UnicodeChar.LineBreaks.lineSeparator || this.code === UnicodeChar.LineBreaks.paragraphSeparator});
             return this.isLineBreak;
         }
+    },
+
+    isParagraphBreak: {
+        configurable: true,
+        get: function UnicodeChar_lazy_isParagraphBreak(){
+            Object.defineProperty(this, 'isParagraphBreak', {value: this.code === UnicodeChar.LineBreaks.newLine || this.code === UnicodeChar.LineBreaks.formFeed || this.code === UnicodeChar.LineBreaks.carriageReturn || this.code === UnicodeChar.LineBreaks.nextLine || this.code === UnicodeChar.LineBreaks.paragraphSeparator});
+            return this.isParagraphBreak;
+        }
     }
 
 });

package/Root/Frameworks/ImageKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.ImageKit
-JSBundleVersion: 2022.23.0
+JSBundleVersion: 2022.25.1
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/MediaKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.MediaKit
-JSBundleVersion: 2022.23.0
+JSBundleVersion: 2022.25.1
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/MediaKitUI/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.MediaKitUI
-JSBundleVersion: 2022.23.0
+JSBundleVersion: 2022.25.1
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/NotificationKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.NotificationKit
-JSBundleVersion: 2022.23.0
+JSBundleVersion: 2022.25.1
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2021 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/PDFKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.PDFKit
-JSBundleVersion: 2022.23.0
+JSBundleVersion: 2022.25.1
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSLicenseNotice: |

package/Root/Frameworks/QRKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.QRKit
-JSBundleVersion: 2022.23.0
+JSBundleVersion: 2022.25.1
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSLicenseNotice: |

package/Root/Frameworks/SearchKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.SearchKit
-JSBundleVersion: 2022.23.0
+JSBundleVersion: 2022.25.1
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSLicenseNotice: |

package/Root/Frameworks/SecurityKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.SecurityKit
-JSBundleVersion: 2022.23.0
+JSBundleVersion: 2022.25.1
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/ServerKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.ServerKit
-JSBundleVersion: 2022.23.0
+JSBundleVersion: 2022.25.1
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/ServerKitTesting/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.ServerKitTesting
-JSBundleVersion: 2022.23.0
+JSBundleVersion: 2022.25.1
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSLicenseNotice: |

package/Root/Frameworks/TestKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.TestKit
-JSBundleVersion: 2022.23.0
+JSBundleVersion: 2022.25.1
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSLicenseNotice: |

package/Root/Frameworks/UIKit/Info.yaml

@@ -1,6 +1,6 @@
 JSBundleType: framework
 JSBundleIdentifier: io.breakside.JSKit.UIKit
-JSBundleVersion: 2022.23.0
+JSBundleVersion: 2022.25.1
 JSDevelopmentLanguage: en
 JSCopyright: Copyright © 2020 Breakside Inc.
 JSBundleEnvironments:

package/Root/Frameworks/UIKit/UIBasicAnimation.js

@@ -88,7 +88,7 @@ JSClass('UIBasicAnimation', UIPropertyAnimation, {
         var progress = this.timingFunction(this._state.currentPercentage);
         this.isComplete = this._state.isComplete();
         this._updateContext[this._updateProperty] = this.interpolation(this._fromValue, this._toValue, progress);
-        if (this._updateContext === this._layer.presentation && this._updateProperty === "bounds"){
+        if (this._updateContext === this._layer.presentation && (this._updateProperty === "bounds" || this._updateProperty === "imageFrame")){
             this._layer.setNeedsDisplay();
         }
     },

package/Root/Frameworks/UIKit/UIHTMLApplication.js

@@ -29,6 +29,7 @@ JSClass("UIHTMLApplication", UIApplication, {
     initWithBundle: function(bundle, windowServer){
         UIHTMLApplication.$super.initWithBundle.call(this, bundle, windowServer);
         this.domWindow = this.windowServer.domWindow;
+        this.rememberStateInPath = this.bundle.info.UIHTMLUseURLPathForState === true;
     },
 
     setup: function(completion, target){
@@ -69,7 +70,7 @@ JSClass("UIHTMLApplication", UIApplication, {
         if (options === undefined){
             options = {};
         }
-        if (options.replacingApplication){
+        if (options.replacingApplication || url.scheme === "mailto" || url.scheme === "tel"){
             var application = this;
             var open = function(){
                 application.domWindow.location.href = url.encodedString;
@@ -93,17 +94,15 @@ JSClass("UIHTMLApplication", UIApplication, {
         this.stop(reload);
     },
 
-    baseURL: JSReadOnlyProperty('_baseURL'),
+    baseURL: JSReadOnlyProperty('_baseURL', null),
+    rememberStateInPath: false,
 
     setState: function(state){
-        UIHTMLApplication.$super.setState.call(this, state);
-        var url = JSURL.initWithURL(this.baseURL);
-        if (state.path !== "/"){
-            url.fragment = state.path;
-        }
-        if (!this._isHandlingHashChange){
-            var href = url.encodedString;
-            if (href != this.domWindow.location.href){
+        if (!state.isEqual(this.state)){
+            UIHTMLApplication.$super.setState.call(this, state);
+            if (!this._isHandlingBrowserStateChange){
+                var url = this.urlForState(state);
+                var href = url.encodedString;
                 this.domWindow.history.pushState(null, null, url.encodedString);
             }
         }
@@ -111,11 +110,20 @@ JSClass("UIHTMLApplication", UIApplication, {
 
     setStateReplacingHTMLState: function(state){
         UIHTMLApplication.$super.setState.call(this, state);
+        var url = this.urlForState(state);
+        this.domWindow.history.replaceState(null, null, url.encodedString);
+    },
+
+    urlForState: function(state){
         var url = JSURL.initWithURL(this.baseURL);
-        if (state.path !== "/"){
-            url.fragment = state.path;
+        if (state.pathComponents.length > 1){
+            if (this.rememberStateInPath){
+                url.appendPathComponents(state.pathComponents.slice(1));
+            }else{
+                url.fragment = state.path;
+            }
         }
-        this.domWindow.history.replaceState(null, null, url.encodedString);
+        return url;
     },
 
     addEventListeners: function(){
@@ -123,6 +131,7 @@ JSClass("UIHTMLApplication", UIApplication, {
         this.domWindow.addEventListener("unhandledrejection", this);
         this.domWindow.addEventListener("beforeunload", this);
         this.domWindow.addEventListener("hashchange", this);
+        this.domWindow.addEventListener("popstate", this);
     },
 
     handleEvent: function(e){
@@ -160,7 +169,10 @@ JSClass("UIHTMLApplication", UIApplication, {
     },
 
     _event_hashchange: function(e){
-        this._isHandlingHashChange = true;
+        if (this.rememberStateInPath){
+            return;
+        }
+        this._isHandlingBrowserStateChange = true;
         try{
             var requestedURL = JSURL.initWithString(this.domWindow.location.href);
             var requestedFragment = requestedURL.fragment;
@@ -185,7 +197,33 @@ JSClass("UIHTMLApplication", UIApplication, {
             }
             this.setStateReplacingHTMLState(state);
         }finally{
-            this._isHandlingHashChange = false;
+            this._isHandlingBrowserStateChange = false;
+        }
+    },
+
+    _event_popstate: function(e){
+        if (!this.rememberStateInPath){
+            return;
+        }
+        this._isHandlingBrowserStateChange = true;
+        try{
+            var requestedURL = JSURL.initWithString(this.domWindow.location.href);
+            var relativeURL = JSURL.initWithString(requestedURL.encodedStringRelativeTo(this._baseURL));
+            var requestedState = UIState.initWithPath(relativeURL.path);
+            var state = null;
+            if (this.delegate && this.delegate.applicationDidRequestState){
+                state = this.delegate.applicationDidRequestState(this, requestedState);
+            }
+            if (state === null || state === undefined){
+                state = this.state;
+            }
+            if (state.isEqual(requestedState)){
+                UIHTMLApplication.$super.setState.call(this, state);
+            }else{
+                this.setStateReplacingHTMLState(state);
+            }
+        }finally{
+            this._isHandlingBrowserStateChange = false;
         }
     },
 

package/Root/Frameworks/UIKit/UIHTMLContentEditableTextInputManager.js

@@ -155,6 +155,9 @@ JSClass('UIHTMLContentEditableTextInputManager', UITextInputManager, {
             var selection = this.textInputClient.textInputSelections()[0];
             var anchor = textFrame.domSelectionPointForCharacterAtIndex(selection.startLocation);
             var focus = textFrame.domSelectionPointForCharacterAtIndex(selection.insertionLocation);
+            if (anchor.offset < 0 || focus.offset < 0){
+                throw new Error("negative dom offset");
+            }
             domSelection.setBaseAndExtent(anchor.node, anchor.offset, focus.node, focus.offset);
             // logger.debug("setting dom selection: %d->%d", anchor.offset, focus.offset);
             if (domSelection.anchorNode){
@@ -274,9 +277,41 @@ JSClass('UIHTMLContentEditableTextInputManager', UITextInputManager, {
     },
 
     focus: function(e){
+        if (UIDevice.shared && UIDevice.shared.primaryPointerType === UIUserInterface.PointerType.touch){
+            if (this.textInputClient instanceof UIView){
+                this._cancelNullFirstResponder(this.textInputClient);
+            }
+        }
     },
 
     blur: function(e){
+        if (UIDevice.shared && UIDevice.shared.primaryPointerType === UIUserInterface.PointerType.touch){
+            if (this.textInputClient instanceof UIView){
+                if (this.textInputClient.window){
+                    if (this.textInputClient.window.firstResponder === this.textInputClient){
+                        this._scheduleNullFirstResponder(this.textInputClient);
+                    }
+                }
+            }
+        }
+    },
+
+    _nullFirstResponderTimer: null,
+
+    _scheduleNullFirstResponder: function(view){
+        this._nullFirstResponderTimer = JSTimer.scheduledTimerWithInterval(0.2, function(){
+            this._nullFirstResponderTimer = null;
+            if (view.window && view.window.firstResponder === view){
+                view.window.firstResponder = null;
+            }
+        }, this);
+    },
+
+    _cancelNullFirstResponder: function(responder){
+        if (this._nullFirstResponderTimer){
+            this._nullFirstResponderTimer.invalidate();
+            this._nullFirstResponderTimer = null;
+        }
     },
 
     select: function(e){
@@ -784,6 +819,7 @@ JSTextLayoutManager.definePropertiesFromExtensions({
             container = this._textContainers[i];
             offset += container._textFrame.recalculateRange(offset);
             container._textFrame.recalculateSize();
+            container.framesetter._updateSizesAndPositionsOfLinesInFrame(container._textFrame);
         }
     }
 

package/Root/Frameworks/UIKit/UIHTMLDisplayServer.js

@@ -477,7 +477,7 @@ JSClass("UIHTMLDisplayServer", UIDisplayServer, {
             this.layerRemoved(layer);
         }else{
             var context = this.contextsByObjectID[attachment.objectID];
-            if (context !== null){
+            if (context){
                 context.destroy();
                 delete this.contextsByObjectID[attachment.objectID];
             }

package/Root/Frameworks/UIKit/UIHTMLTextField.js

@@ -738,7 +738,7 @@ JSClass("UIHTMLTextField", UIControl, {
         var selection;
         for (var i = selections.length - 1; i >= 0; --i){
             selection = selections[i];
-            this.inputElement.setRangeText(replacement, selection.location, selection.end, "end");
+            this.inputElement.setRangeText(replacement, selection.range.location, selection.range.end, "end");
         }
         this._text = this.inputElement.value;
         this._sendChangeNotificaions();