Index: third_party/google_input_tools/src/chrome/os/inputview/dom.js |
diff --git a/third_party/google_input_tools/src/chrome/os/inputview/dom.js b/third_party/google_input_tools/src/chrome/os/inputview/dom.js |
index 69ab55ebed05b4fb8f1ee7152c0b8fefd228de73..f58ab61a976c692f33b006e05c6bd9ff30702cb5 100644 |
--- a/third_party/google_input_tools/src/chrome/os/inputview/dom.js |
+++ b/third_party/google_input_tools/src/chrome/os/inputview/dom.js |
@@ -61,8 +61,6 @@ i18n.input.common.dom.isEditable = function(element) { |
case 'INPUT': |
return (element.type.toUpperCase() == 'TEXT' || |
element.type.toUpperCase() == 'SEARCH'); |
- case 'DIV': |
- return element.isContentEditable; |
case 'IFRAME': |
// Accessing iframe's contents or properties throws exception when the |
// iframe is not hosted on the same domain. |
@@ -76,9 +74,9 @@ i18n.input.common.dom.isEditable = function(element) { |
} catch (e) { |
return false; |
} |
+ default: |
+ return !!element.isContentEditable; |
} |
- |
- return false; |
}; |
@@ -192,7 +190,7 @@ i18n.input.common.dom.createIframeWrapper = function(opt_doc) { |
var css = i18n.input.common.GlobalSettings.alternativeImageUrl ? |
i18n.input.common.GlobalSettings.css.replace( |
- /\/\/ssl.gstatic.com\/inputtools\/images/g, |
+ /^(?:https?:)?\/\/ssl.gstatic.com\/inputtools\/images/g, |
i18n.input.common.GlobalSettings.alternativeImageUrl) : |
i18n.input.common.GlobalSettings.css; |
goog.style.installStyles( |