Skip to content

Commit 260f73e

Browse files
committed
Remove json2.js from the FirefoxDriver.
Firefox has had native JSON support since Firefox 3.5
1 parent 47b32e2 commit 260f73e

File tree

5 files changed

+0
-285
lines changed

5 files changed

+0
-285
lines changed

Diff for: javascript/firefox-driver/BUCK

-5
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ zip(name = 'js-resources',
6060
out = 'js-resources.src.zip',
6161
srcs = [
6262
':evaluate.js',
63-
':json2.js',
6463
':modules',
6564
],
6665
)
@@ -76,10 +75,6 @@ export_file(name = 'evaluate.js',
7675
src = 'js/evaluate.js',
7776
)
7877

79-
export_file(name = 'json2.js',
80-
src = 'js/json2.js',
81-
)
82-
8378
folder(name = 'winnt-x86-msvc',
8479
out = 'WINNT_x86-msvc',
8580
srcs = [

Diff for: javascript/firefox-driver/build.desc

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ mozilla_extension(name = "webdriver",
6464
{ ":web-element-cache" : "resource/modules/web-element-cache.js" },
6565
{ "js/timer.js" : "resource/modules/timer.js" },
6666
{ "js/evaluate.js" : "resource/evaluate.js" },
67-
{ "js/json2.js" : "resource/json2.js" },
6867
],
6968
chrome = "extension/chrome.manifest",
7069
install = "extension/install.rdf")

Diff for: javascript/firefox-driver/js/json2.js

-273
This file was deleted.

Diff for: javascript/firefox-driver/js/nsCommandProcessor.js

-5
Original file line numberDiff line numberDiff line change
@@ -357,11 +357,6 @@ DelayedCommand.prototype.executeInternal_ = function() {
357357
* @constructor
358358
*/
359359
var nsCommandProcessor = function() {
360-
// Since we only support 3.0+, this check is enough to see if we're on 3.0
361-
if (!bot.userAgent.isProductVersion('3.5')) {
362-
eval(Utils.loadUrl('resource://fxdriver/json2.js'));
363-
}
364-
365360
this.wrappedJSObject = this;
366361
this.wm = Components.classes['@mozilla.org/appshell/window-mediator;1'].
367362
getService(Components.interfaces.nsIWindowMediator);

Diff for: javascript/node/update_copyright.js

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ var BASE_PATH = path.normalize(path.join(__dirname, '..'));
4747
var IGNORE_PATHS = [
4848
path.join(BASE_PATH, 'atoms/test/jquery.min.js'),
4949
path.join(BASE_PATH, 'firefox-driver/extension/components/httpd.js'),
50-
path.join(BASE_PATH, 'firefox-driver/js/json2.js'),
5150
path.join(BASE_PATH, 'jsunit'),
5251
path.join(BASE_PATH, 'selenium-core/lib'),
5352
path.join(BASE_PATH, 'selenium-core/scripts/ui-element.js'),

0 commit comments

Comments
 (0)