summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorKris Maglione <maglione.k@gmail.com>2013-04-23 21:23:45 -0700
committerKris Maglione <maglione.k@gmail.com>2013-04-23 21:23:45 -0700
commitda332e7c2cd9b597215509edaac64e1775081bef (patch)
tree309e41720d4dc384d2c0b8604be95652b9422ec7 /common
parentb375af935710ace22192b751e0a96b32f139d8a2 (diff)
downloadpentadactyl-da332e7c2cd9b597215509edaac64e1775081bef.tar.gz
Do a better job of finding a scrollable element.
Diffstat (limited to 'common')
-rw-r--r--common/modules/base.jsm9
-rw-r--r--common/modules/buffer.jsm2
2 files changed, 8 insertions, 3 deletions
diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index 31efa0f0..f2a7af36 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -228,9 +228,14 @@ function properties(obj, prototypes, debugger_) {
// currently.
let filter = function filter(prop) {
try {
- return k in obj;
+ return prop in obj;
+ }
+ catch (e) {
+ util.reportError("Filtering properties for " +
+ String.quote(obj) + ", " +
+ "error checking presence of " +
+ String.quote(prop) + ": " + e);
}
- catch (e) {}
return false;
};
return array.uniq([k for (k in obj)].concat(
diff --git a/common/modules/buffer.jsm b/common/modules/buffer.jsm
index 8c228744..1d84eb14 100644
--- a/common/modules/buffer.jsm
+++ b/common/modules/buffer.jsm
@@ -1277,7 +1277,7 @@ var Buffer = Module("Buffer", {
* The pattern used to search for a scrollable element when we have
* no starting point.
*/
- SCROLLABLE_SEARCH_SELECTOR: "div",
+ SCROLLABLE_SEARCH_SELECTOR: "html, body, div",
PageInfo: Struct("PageInfo", "name", "title", "action")
.localize("title"),