lib/commonAPI/coreapi/public/api/rhoapi.js in rhodes-5.5.2 vs lib/commonAPI/coreapi/public/api/rhoapi.js in rhodes-5.5.15
- old
+ new
@@ -495,11 +495,11 @@
ffHackMethod: false,
js185: false
};
(function propertySupportCheck() {
- propsSupport.ffHackKeywords = (function supported_firefoxHack_keywords() {
+/* propsSupport.ffHackKeywords = (function supported_firefoxHack_keywords() {
var testObj = {};
var okGet = false;
var okSet = false;
try {
testObj = {
@@ -512,11 +512,11 @@
}
};
testObj.propSet = testObj.propGet;
} catch (ex) {};
return okGet && okSet;
- })();
+ })();*/
propsSupport.ffHackMethod = (function supported_firefoxHack_method() {
var testObj = {};
var okGet = false;
var okSet = false;
@@ -1045,19 +1045,21 @@
}
}
});
addBridge(rhoPlatform.id.WM, function() {
- var bridge = new WebkitBridge();
+ var bridgeClass = typeof(WebkitBridge) !== "undefined" ? WebkitBridge : IEBridge;
+ var bridge = new bridgeClass();
return {
apiCall: function (cmdText, async, resultHandler) {
var apiResult = bridge.framework(cmdText);
resultHandler(JSON.parse(apiResult));
}
}
});
+
addBridge(rhoPlatform.id.RHOSIMULATOR, function() {
return {
apiCall: function (cmdText, async, resultHandler) {
var nativeApiResult = {};
@@ -1094,9 +1096,10 @@
[/RhoSimulator/ , bridges[rhoPlatform.id.RHOSIMULATOR]],
[/Android/ , bridges[rhoPlatform.id.ANDROID] ],
[/iPhone|iPod|iPad/ , bridges[rhoPlatform.id.IPHONE] ],
[/Windows\s+Phone/ , bridges[rhoPlatform.id.WP8] ],
[/Windows\s+(?:Mobile|CE)|WM [0-9]/, bridges[rhoPlatform.id.WM] ],
+ [/MSIE/ , bridges[rhoPlatform.id.WM] ],
[/Windows/ , bridges[rhoPlatform.id.WIN32] ]
];
// autodetect a bridge type
var detectedPlatformBridge = null;