Permalink
Browse files

Upgraded arbor.js to work around broken FF webdriver support.

  • Loading branch information...
1 parent b060d21 commit 3ee8e458298f821a0dd140a4853981c38daef93c @jakewins jakewins committed Nov 24, 2011
View
4 server/src/main/resources/webadmin-html/js/lib/arbor-graphics.js
@@ -40,7 +40,9 @@
var len = arguments.length
var args = []
for (var i=0; i<len; i++) args.push(arguments[i])
- console.log.apply(this, args)
+ try {
+ console.log.apply(this, args)
+ } catch(e){}
}
var dirname = function(path){
View
4 server/src/main/resources/webadmin-html/js/lib/arbor-tween.js
@@ -70,7 +70,9 @@
var len = arguments.length
var args = []
for (var i=0; i<len; i++) args.push(arguments[i])
- console.log.apply(this, args)
+ try {
+ console.log.apply(this, args)
+ } catch(e){}
}
var dirname = function(path){
View
11 server/src/main/resources/webadmin-html/js/lib/arbor.js
@@ -42,7 +42,7 @@
var args = []
for (var i=0; i<len; i++) args.push(arguments[i])
try {
- console.log.apply(this, args)
+ console.log.apply(this, args)
} catch(e){}
}
@@ -204,7 +204,11 @@
// in chrome, web workers aren't available to pages with file:// urls
var chrome_local_file = window.location.protocol == "file:" &&
navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
- var USE_WORKER = (window.Worker !== undefined && !chrome_local_file)
+ var ff_localhost = window.location.host.indexOf("localhost") == 0 &&
+ (navigator.userAgent.toLowerCase().indexOf('firefox/9.0') > -1 ||
+ navigator.userAgent.toLowerCase().indexOf('firefox/8.0') > -1)
+
+ var USE_WORKER = (window.Worker !== undefined && !chrome_local_file && !ff_localhost)
var _physics = null
var _tween = null
@@ -431,6 +435,7 @@
return that.init()
}
+
/* atoms.js */
//
// atoms.js
@@ -1916,4 +1921,4 @@
}
})
-})(this.jQuery)
+})(this.jQuery)

0 comments on commit 3ee8e45

Please sign in to comment.