@breakside/jskit 2023.17.1 → 2023.18.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Frameworks/DOM.jsframework/Info.json +2 -2
- package/Frameworks/DOM.jsframework/io.breakside.JSKit.DOM-bundle.js +2 -2
- package/Frameworks/FontKit.jsframework/Info.json +2 -2
- package/Frameworks/FontKit.jsframework/io.breakside.JSKit.FontKit-bundle.js +2 -2
- package/Frameworks/Foundation.jsframework/Info.json +2 -2
- package/Frameworks/Foundation.jsframework/JS/JSBundle.js +16 -1
- package/Frameworks/Foundation.jsframework/JS/JSFileManager+HTML.js +0 -1
- package/Frameworks/Foundation.jsframework/JS/JSLog.js +1 -1
- package/Frameworks/Foundation.jsframework/io.breakside.JSKit.Foundation-bundle.js +2 -2
- package/Frameworks/SecurityKit.jsframework/Info.json +2 -2
- package/Frameworks/SecurityKit.jsframework/io.breakside.JSKit.SecurityKit-bundle.js +2 -2
- package/Info.json +2 -2
- package/Node/io.breakside.jskit-bundle.js +2 -2
- package/Root/Frameworks/APIKit/Info.yaml +1 -1
- package/Root/Frameworks/APIKitTesting/Info.yaml +1 -1
- package/Root/Frameworks/AuthKit/Info.yaml +1 -1
- package/Root/Frameworks/CSSOM/Info.yaml +1 -1
- package/Root/Frameworks/ChartKit/Info.yaml +1 -1
- package/Root/Frameworks/ConferenceKit/Info.yaml +1 -1
- package/Root/Frameworks/DBKit/Info.yaml +1 -1
- package/Root/Frameworks/DOM/Info.yaml +1 -1
- package/Root/Frameworks/Dispatch/Info.yaml +1 -1
- package/Root/Frameworks/FontKit/Info.yaml +1 -1
- package/Root/Frameworks/Foundation/Info.yaml +1 -1
- package/Root/Frameworks/Foundation/JSBundle.js +16 -1
- package/Root/Frameworks/Foundation/JSFileManager+HTML.js +0 -1
- package/Root/Frameworks/Foundation/JSLog.js +1 -1
- package/Root/Frameworks/ImageKit/Info.yaml +1 -1
- package/Root/Frameworks/MediaKit/Info.yaml +1 -1
- package/Root/Frameworks/MediaKitUI/Info.yaml +1 -1
- package/Root/Frameworks/NotificationKit/Info.yaml +1 -1
- package/Root/Frameworks/PDFKit/Info.yaml +1 -1
- package/Root/Frameworks/QRKit/Info.yaml +1 -1
- package/Root/Frameworks/SearchKit/Info.yaml +1 -1
- package/Root/Frameworks/SecurityKit/Info.yaml +1 -1
- package/Root/Frameworks/ServerKit/Info.yaml +1 -1
- package/Root/Frameworks/ServerKitTesting/Info.yaml +1 -1
- package/Root/Frameworks/TestKit/Info.yaml +1 -1
- package/Root/Frameworks/UIKit/Info.yaml +1 -1
- package/Root/Frameworks/UIKit/UIWindow.js +16 -14
- package/Root/Frameworks/UIKit/UIWindowServer.js +9 -4
- package/Root/Frameworks/UIKitTesting/Info.yaml +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"JSBundleType": "framework",
|
|
3
3
|
"JSBundleIdentifier": "io.breakside.JSKit.DOM",
|
|
4
|
-
"JSBundleVersion": "2023.
|
|
4
|
+
"JSBundleVersion": "2023.18.1",
|
|
5
5
|
"JSDevelopmentLanguage": "en",
|
|
6
6
|
"JSCopyright": "Copyright © 2020 Breakside Inc.",
|
|
7
7
|
"JSBundleEnvironments": {
|
|
@@ -9,5 +9,5 @@
|
|
|
9
9
|
"node": "DOM+Node.js"
|
|
10
10
|
},
|
|
11
11
|
"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",
|
|
12
|
-
"GitRevision": "
|
|
12
|
+
"GitRevision": "7ef605c86ea7881c37f9ad68175bb2690ec5559d"
|
|
13
13
|
}
|
|
@@ -3,7 +3,7 @@ JSBundle.bundles['io.breakside.JSKit.DOM'] = {
|
|
|
3
3
|
"Info": {
|
|
4
4
|
"JSBundleType": "framework",
|
|
5
5
|
"JSBundleIdentifier": "io.breakside.JSKit.DOM",
|
|
6
|
-
"JSBundleVersion": "2023.
|
|
6
|
+
"JSBundleVersion": "2023.18.1",
|
|
7
7
|
"JSDevelopmentLanguage": "en",
|
|
8
8
|
"JSCopyright": "Copyright © 2020 Breakside Inc.",
|
|
9
9
|
"JSBundleEnvironments": {
|
|
@@ -11,7 +11,7 @@ JSBundle.bundles['io.breakside.JSKit.DOM'] = {
|
|
|
11
11
|
"node": "DOM+Node.js"
|
|
12
12
|
},
|
|
13
13
|
"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",
|
|
14
|
-
"GitRevision": "
|
|
14
|
+
"GitRevision": "7ef605c86ea7881c37f9ad68175bb2690ec5559d"
|
|
15
15
|
},
|
|
16
16
|
"Resources": [],
|
|
17
17
|
"ResourceLookup": {
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"JSBundleType": "framework",
|
|
3
3
|
"JSBundleIdentifier": "io.breakside.JSKit.FontKit",
|
|
4
|
-
"JSBundleVersion": "2023.
|
|
4
|
+
"JSBundleVersion": "2023.18.1",
|
|
5
5
|
"JSDevelopmentLanguage": "en",
|
|
6
6
|
"JSCopyright": "Copyright © 2020 Breakside Inc.",
|
|
7
7
|
"JSBundleEnvironments": {
|
|
8
8
|
"html": "FontKit+HTML.js"
|
|
9
9
|
},
|
|
10
10
|
"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",
|
|
11
|
-
"GitRevision": "
|
|
11
|
+
"GitRevision": "7ef605c86ea7881c37f9ad68175bb2690ec5559d"
|
|
12
12
|
}
|
|
@@ -3,14 +3,14 @@ JSBundle.bundles['io.breakside.JSKit.FontKit'] = {
|
|
|
3
3
|
"Info": {
|
|
4
4
|
"JSBundleType": "framework",
|
|
5
5
|
"JSBundleIdentifier": "io.breakside.JSKit.FontKit",
|
|
6
|
-
"JSBundleVersion": "2023.
|
|
6
|
+
"JSBundleVersion": "2023.18.1",
|
|
7
7
|
"JSDevelopmentLanguage": "en",
|
|
8
8
|
"JSCopyright": "Copyright © 2020 Breakside Inc.",
|
|
9
9
|
"JSBundleEnvironments": {
|
|
10
10
|
"html": "FontKit+HTML.js"
|
|
11
11
|
},
|
|
12
12
|
"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",
|
|
13
|
-
"GitRevision": "
|
|
13
|
+
"GitRevision": "7ef605c86ea7881c37f9ad68175bb2690ec5559d"
|
|
14
14
|
},
|
|
15
15
|
"Resources": [],
|
|
16
16
|
"ResourceLookup": {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"JSBundleType": "framework",
|
|
3
3
|
"JSBundleIdentifier": "io.breakside.JSKit.Foundation",
|
|
4
|
-
"JSBundleVersion": "2023.
|
|
4
|
+
"JSBundleVersion": "2023.18.1",
|
|
5
5
|
"JSDevelopmentLanguage": "en",
|
|
6
6
|
"JSCopyright": "Copyright © 2020 Breakside Inc.",
|
|
7
7
|
"JSBundleEnvironments": {
|
|
@@ -9,5 +9,5 @@
|
|
|
9
9
|
"node": "Foundation+Node.js"
|
|
10
10
|
},
|
|
11
11
|
"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",
|
|
12
|
-
"GitRevision": "
|
|
12
|
+
"GitRevision": "7ef605c86ea7881c37f9ad68175bb2690ec5559d"
|
|
13
13
|
}
|
|
@@ -16,8 +16,13 @@
|
|
|
16
16
|
// #import "JSObject.js"
|
|
17
17
|
// #import "JSLocale.js"
|
|
18
18
|
// #import "JSFile.js"
|
|
19
|
+
// #import "JSLog.js"
|
|
19
20
|
'use strict';
|
|
20
21
|
|
|
22
|
+
(function(){
|
|
23
|
+
|
|
24
|
+
var logger = JSLog("foundation", "bundle");
|
|
25
|
+
|
|
21
26
|
JSClass('JSBundle', JSObject, {
|
|
22
27
|
|
|
23
28
|
_dict: null,
|
|
@@ -252,6 +257,14 @@ JSClass('JSBundle', JSObject, {
|
|
|
252
257
|
if (metadata !== null){
|
|
253
258
|
return metadata.strings[key];
|
|
254
259
|
}
|
|
260
|
+
var langs;
|
|
261
|
+
if (locale){
|
|
262
|
+
langs = this._getSupportedLanguagesForLocaleIdentifiers([locale.identifier]);
|
|
263
|
+
}else{
|
|
264
|
+
this._updateSupportedUserLanguagesIfNeeded();
|
|
265
|
+
langs = this._supportedPreferredLanguages;
|
|
266
|
+
}
|
|
267
|
+
logger.warn("Missing localization key '%{public}' in %{public} for %{public}", key, table, langs.join(","));
|
|
255
268
|
return key;
|
|
256
269
|
},
|
|
257
270
|
|
|
@@ -312,4 +325,6 @@ Object.defineProperty(JSBundle, 'mainBundle', {
|
|
|
312
325
|
});
|
|
313
326
|
return bundle;
|
|
314
327
|
}
|
|
315
|
-
});
|
|
328
|
+
});
|
|
329
|
+
|
|
330
|
+
})();
|
|
@@ -237,7 +237,7 @@ var jslog_formatter = {
|
|
|
237
237
|
error: function(e, options){
|
|
238
238
|
// var frames = e.frames;
|
|
239
239
|
// return e.toString() + ' \u2014 ' + frames[0].method + ' \u2014 ' + frames[0].filename + ':' + frames[0].lineno;
|
|
240
|
-
return e
|
|
240
|
+
return String(e);
|
|
241
241
|
},
|
|
242
242
|
|
|
243
243
|
public: String.printf_formatter.s
|
|
@@ -3,7 +3,7 @@ JSBundle.bundles['io.breakside.JSKit.Foundation'] = {
|
|
|
3
3
|
"Info": {
|
|
4
4
|
"JSBundleType": "framework",
|
|
5
5
|
"JSBundleIdentifier": "io.breakside.JSKit.Foundation",
|
|
6
|
-
"JSBundleVersion": "2023.
|
|
6
|
+
"JSBundleVersion": "2023.18.1",
|
|
7
7
|
"JSDevelopmentLanguage": "en",
|
|
8
8
|
"JSCopyright": "Copyright © 2020 Breakside Inc.",
|
|
9
9
|
"JSBundleEnvironments": {
|
|
@@ -11,7 +11,7 @@ JSBundle.bundles['io.breakside.JSKit.Foundation'] = {
|
|
|
11
11
|
"node": "Foundation+Node.js"
|
|
12
12
|
},
|
|
13
13
|
"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",
|
|
14
|
-
"GitRevision": "
|
|
14
|
+
"GitRevision": "7ef605c86ea7881c37f9ad68175bb2690ec5559d"
|
|
15
15
|
},
|
|
16
16
|
"Resources": [
|
|
17
17
|
{
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"JSBundleType": "framework",
|
|
3
3
|
"JSBundleIdentifier": "io.breakside.JSKit.SecurityKit",
|
|
4
|
-
"JSBundleVersion": "2023.
|
|
4
|
+
"JSBundleVersion": "2023.18.1",
|
|
5
5
|
"JSDevelopmentLanguage": "en",
|
|
6
6
|
"JSCopyright": "Copyright © 2020 Breakside Inc.",
|
|
7
7
|
"JSBundleEnvironments": {
|
|
@@ -9,5 +9,5 @@
|
|
|
9
9
|
"node": "SecurityKit+Node.js"
|
|
10
10
|
},
|
|
11
11
|
"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",
|
|
12
|
-
"GitRevision": "
|
|
12
|
+
"GitRevision": "7ef605c86ea7881c37f9ad68175bb2690ec5559d"
|
|
13
13
|
}
|
|
@@ -3,7 +3,7 @@ JSBundle.bundles['io.breakside.JSKit.SecurityKit'] = {
|
|
|
3
3
|
"Info": {
|
|
4
4
|
"JSBundleType": "framework",
|
|
5
5
|
"JSBundleIdentifier": "io.breakside.JSKit.SecurityKit",
|
|
6
|
-
"JSBundleVersion": "2023.
|
|
6
|
+
"JSBundleVersion": "2023.18.1",
|
|
7
7
|
"JSDevelopmentLanguage": "en",
|
|
8
8
|
"JSCopyright": "Copyright © 2020 Breakside Inc.",
|
|
9
9
|
"JSBundleEnvironments": {
|
|
@@ -11,7 +11,7 @@ JSBundle.bundles['io.breakside.JSKit.SecurityKit'] = {
|
|
|
11
11
|
"node": "SecurityKit+Node.js"
|
|
12
12
|
},
|
|
13
13
|
"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",
|
|
14
|
-
"GitRevision": "
|
|
14
|
+
"GitRevision": "7ef605c86ea7881c37f9ad68175bb2690ec5559d"
|
|
15
15
|
},
|
|
16
16
|
"Resources": [],
|
|
17
17
|
"ResourceLookup": {
|
package/Info.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"JSBundleType": "node",
|
|
3
3
|
"JSBundleIdentifier": "io.breakside.jskit",
|
|
4
|
-
"JSBundleVersion": "2023.
|
|
4
|
+
"JSBundleVersion": "2023.18.1",
|
|
5
5
|
"JSExecutableName": "jskit",
|
|
6
6
|
"NPMOrganization": "breakside",
|
|
7
7
|
"JSResources": [
|
|
8
8
|
"Tests/HTMLTestRunner.js",
|
|
9
9
|
"Tests/NodeTestRunner.js"
|
|
10
10
|
],
|
|
11
|
-
"GitRevision": "
|
|
11
|
+
"GitRevision": "7ef605c86ea7881c37f9ad68175bb2690ec5559d"
|
|
12
12
|
}
|
|
@@ -3,14 +3,14 @@ JSBundle.bundles['io.breakside.jskit'] = {
|
|
|
3
3
|
"Info": {
|
|
4
4
|
"JSBundleType": "node",
|
|
5
5
|
"JSBundleIdentifier": "io.breakside.jskit",
|
|
6
|
-
"JSBundleVersion": "2023.
|
|
6
|
+
"JSBundleVersion": "2023.18.1",
|
|
7
7
|
"JSExecutableName": "jskit",
|
|
8
8
|
"NPMOrganization": "breakside",
|
|
9
9
|
"JSResources": [
|
|
10
10
|
"Tests/HTMLTestRunner.js",
|
|
11
11
|
"Tests/NodeTestRunner.js"
|
|
12
12
|
],
|
|
13
|
-
"GitRevision": "
|
|
13
|
+
"GitRevision": "7ef605c86ea7881c37f9ad68175bb2690ec5559d"
|
|
14
14
|
},
|
|
15
15
|
"Resources": [
|
|
16
16
|
{
|
|
@@ -16,8 +16,13 @@
|
|
|
16
16
|
// #import "JSObject.js"
|
|
17
17
|
// #import "JSLocale.js"
|
|
18
18
|
// #import "JSFile.js"
|
|
19
|
+
// #import "JSLog.js"
|
|
19
20
|
'use strict';
|
|
20
21
|
|
|
22
|
+
(function(){
|
|
23
|
+
|
|
24
|
+
var logger = JSLog("foundation", "bundle");
|
|
25
|
+
|
|
21
26
|
JSClass('JSBundle', JSObject, {
|
|
22
27
|
|
|
23
28
|
_dict: null,
|
|
@@ -252,6 +257,14 @@ JSClass('JSBundle', JSObject, {
|
|
|
252
257
|
if (metadata !== null){
|
|
253
258
|
return metadata.strings[key];
|
|
254
259
|
}
|
|
260
|
+
var langs;
|
|
261
|
+
if (locale){
|
|
262
|
+
langs = this._getSupportedLanguagesForLocaleIdentifiers([locale.identifier]);
|
|
263
|
+
}else{
|
|
264
|
+
this._updateSupportedUserLanguagesIfNeeded();
|
|
265
|
+
langs = this._supportedPreferredLanguages;
|
|
266
|
+
}
|
|
267
|
+
logger.warn("Missing localization key '%{public}' in %{public} for %{public}", key, table, langs.join(","));
|
|
255
268
|
return key;
|
|
256
269
|
},
|
|
257
270
|
|
|
@@ -312,4 +325,6 @@ Object.defineProperty(JSBundle, 'mainBundle', {
|
|
|
312
325
|
});
|
|
313
326
|
return bundle;
|
|
314
327
|
}
|
|
315
|
-
});
|
|
328
|
+
});
|
|
329
|
+
|
|
330
|
+
})();
|
|
@@ -237,7 +237,7 @@ var jslog_formatter = {
|
|
|
237
237
|
error: function(e, options){
|
|
238
238
|
// var frames = e.frames;
|
|
239
239
|
// return e.toString() + ' \u2014 ' + frames[0].method + ' \u2014 ' + frames[0].filename + ':' + frames[0].lineno;
|
|
240
|
-
return e
|
|
240
|
+
return String(e);
|
|
241
241
|
},
|
|
242
242
|
|
|
243
243
|
public: String.printf_formatter.s
|
|
@@ -859,8 +859,8 @@ JSClass('UIWindow', UIView, {
|
|
|
859
859
|
if (moves.length > 0){
|
|
860
860
|
event = UIEvent.initMouseEventWithType(UIEvent.Type.mouseMoved, timestamp, this, locationInWindow, modifiers, 0);
|
|
861
861
|
for (areaIndex = 0, areaCount = moves.length; areaIndex < areaCount; ++areaIndex){
|
|
862
|
+
area = moves[areaIndex];
|
|
862
863
|
if ((area.trackingType & UIMouseTrackingArea.TrackingType.move) !== 0){
|
|
863
|
-
area = moves[areaIndex];
|
|
864
864
|
area.mouseMoved(event);
|
|
865
865
|
}
|
|
866
866
|
}
|
|
@@ -1082,19 +1082,21 @@ JSClass('UIWindow', UIView, {
|
|
|
1082
1082
|
for (var id in touchesByView){
|
|
1083
1083
|
touches = touchesByView[id];
|
|
1084
1084
|
view = touches[0].view;
|
|
1085
|
-
|
|
1086
|
-
|
|
1087
|
-
|
|
1088
|
-
|
|
1089
|
-
|
|
1090
|
-
|
|
1091
|
-
|
|
1092
|
-
|
|
1093
|
-
|
|
1094
|
-
|
|
1095
|
-
|
|
1096
|
-
|
|
1097
|
-
|
|
1085
|
+
if (view.window === this){
|
|
1086
|
+
switch (event.type){
|
|
1087
|
+
case UIEvent.Type.touchesBegan:
|
|
1088
|
+
view.touchesBegan(touches, event);
|
|
1089
|
+
break;
|
|
1090
|
+
case UIEvent.Type.touchesMoved:
|
|
1091
|
+
view.touchesMoved(touches, event);
|
|
1092
|
+
break;
|
|
1093
|
+
case UIEvent.Type.touchesCanceled:
|
|
1094
|
+
view.touchesCanceled(touches, event);
|
|
1095
|
+
break;
|
|
1096
|
+
case UIEvent.Type.touchesEnded:
|
|
1097
|
+
view.touchesEnded(touches, event);
|
|
1098
|
+
break;
|
|
1099
|
+
}
|
|
1098
1100
|
}
|
|
1099
1101
|
}
|
|
1100
1102
|
},
|
|
@@ -414,7 +414,7 @@ JSClass("UIWindowServer", JSObject, {
|
|
|
414
414
|
var view = null;
|
|
415
415
|
if (window !== null){
|
|
416
416
|
view = window.hitTest(window.convertPointFromScreen(this.mouseLocation));
|
|
417
|
-
while (view !== null && view.tooltip === null){
|
|
417
|
+
while (view !== null && (view.tooltip === null || view.tooltip === "")){
|
|
418
418
|
view = view.superview;
|
|
419
419
|
}
|
|
420
420
|
if (view === this._tooltipSourceView){
|
|
@@ -705,10 +705,10 @@ JSClass("UIWindowServer", JSObject, {
|
|
|
705
705
|
var window = this.windowForEventAtLocation(this.mouseLocation);
|
|
706
706
|
if (window !== null){
|
|
707
707
|
var view = window.hitTest(window.convertPointFromScreen(this.mouseLocation));
|
|
708
|
-
while (view !== null && view.tooltip === null){
|
|
708
|
+
while (view !== null && (view.tooltip === null || view.tooltip === "")){
|
|
709
709
|
view = view.superview;
|
|
710
710
|
}
|
|
711
|
-
if (view !== null && view.tooltip !== null){
|
|
711
|
+
if (view !== null && view.tooltip !== null && view.tooltip !== ""){
|
|
712
712
|
this.showTooltipForView(view, this.mouseLocation);
|
|
713
713
|
}
|
|
714
714
|
}
|
|
@@ -724,12 +724,17 @@ JSClass("UIWindowServer", JSObject, {
|
|
|
724
724
|
var windowIndex;
|
|
725
725
|
var location;
|
|
726
726
|
var event;
|
|
727
|
+
var hasWindowReceivingAllEvents = false;
|
|
727
728
|
for (windowIndex = this.windowStack.length - 1; windowIndex >= 0 && window === null; --windowIndex){
|
|
728
729
|
location = this.windowStack[windowIndex].convertPointFromScreen(this.mouseLocation);
|
|
729
|
-
|
|
730
|
+
hasWindowReceivingAllEvents = hasWindowReceivingAllEvents || this.windowStack[windowIndex].receivesAllEvents;
|
|
731
|
+
if (this.windowStack[windowIndex].userInteractionEnabled && this.windowStack[windowIndex].containsPoint(location)){
|
|
730
732
|
window = this.windowStack[windowIndex];
|
|
731
733
|
}
|
|
732
734
|
}
|
|
735
|
+
if (hasWindowReceivingAllEvents && window !== null && !window.receivesAllEvents){
|
|
736
|
+
window = null;
|
|
737
|
+
}
|
|
733
738
|
if (this._mouseTrackingWindow !== null){
|
|
734
739
|
if (window !== this._mouseTrackingWindow){
|
|
735
740
|
this._mouseTrackingWindow.sendMouseTrackingEvents(this._mouseTrackingWindow.convertPointFromScreen(this.mouseLocation), timestamp, modifiers, true);
|