Title: [130306] trunk/Tools
- Revision
- 130306
- Author
- o...@chromium.org
- Date
- 2012-10-03 11:15:09 -0700 (Wed, 03 Oct 2012)
Log Message
Get rid of warning about non-existant platform name when loading garden-o-matic
https://bugs.webkit.org/show_bug.cgi?id=98282
Reviewed by Adam Barth.
If you loaded without a platform query parameter we'd return "null" as the platform name
instead of null.
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base_unittests.js:
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base.js (130305 => 130306)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base.js 2012-10-03 18:01:56 UTC (rev 130305)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base.js 2012-10-03 18:15:09 UTC (rev 130306)
@@ -438,12 +438,12 @@
base.getURLParameter = function(name)
{
- return decodeURI(
- (RegExp(name + '=' + '(.+?)(&|$)').exec(location.search)||[,null])[1]
- );
+ var match = RegExp(name + '=' + '(.+?)(&|$)').exec(location.search);
+ if (!match)
+ return null;
+ return decodeURI(match[1])
}
-
base.underscoredBuilderName = function(builderName)
{
return builderName.replace(/[ .()]/g, '_');
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base_unittests.js (130305 => 130306)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base_unittests.js 2012-10-03 18:01:56 UTC (rev 130305)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base_unittests.js 2012-10-03 18:15:09 UTC (rev 130306)
@@ -460,6 +460,10 @@
equals(base.relativizeTime(time), "2 days ago");
time.setDate(time.getDate() - 998);
equals(base.relativizeTime(time), "1000 days ago");
-})
+});
+test("getURLParameter", 1, function() {
+ ok(!base.getURLParameter('non-existant'));
+});
+
})();
Modified: trunk/Tools/ChangeLog (130305 => 130306)
--- trunk/Tools/ChangeLog 2012-10-03 18:01:56 UTC (rev 130305)
+++ trunk/Tools/ChangeLog 2012-10-03 18:15:09 UTC (rev 130306)
@@ -1,3 +1,15 @@
+2012-10-03 Ojan Vafai <o...@chromium.org>
+
+ Get rid of warning about non-existant platform name when loading garden-o-matic
+ https://bugs.webkit.org/show_bug.cgi?id=98282
+
+ Reviewed by Adam Barth.
+
+ If you loaded without a platform query parameter we'd return "null" as the platform name
+ instead of null.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/base_unittests.js:
+
2012-10-03 Balazs Kelemen <kbal...@webkit.org>
[Qt] Enable mock scrollbars
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
