From b974c13751312558903f7ea0a874d82353b0b17c Mon Sep 17 00:00:00 2001
From: Mike Pennisi <mike@mikepennisi.com>
Date: Fri, 26 Jun 2015 12:11:04 -0400
Subject: [PATCH] Move website scripts to a dedicated directory
Some JavaScript source files are only relevant in the context of the
Test262 website. They should not be explicitly included by individual
tests, so their presence in the `harness/` directory alongside "include"
files is misleading.
Move the scripts to a location within the `website/` directory to
better-reflect their intended use. Update the relevant HTML templates
with the new locations.
---
tools/packaging/templates/runner.bestPractice.html | 12 ++++++------
tools/packaging/templates/runner.intl402.html | 12 ++++++------
tools/packaging/templates/runner.test262.html | 12 ++++++------
{harness => website/scripts}/ed.js | 0
{harness => website/scripts}/gs.js | 0
{harness => website/scripts}/helper.js | 0
{harness => website/scripts/lib}/jquery-1.4.2.min.js | 0
{harness => website/scripts/lib}/jquery.base64.js | 0
.../scripts/lib}/jqueryprogressbar.js | 0
{harness => website/scripts}/sections.js | 0
{harness => website/scripts}/sth.js | 0
11 files changed, 18 insertions(+), 18 deletions(-)
rename {harness => website/scripts}/ed.js (100%)
rename {harness => website/scripts}/gs.js (100%)
rename {harness => website/scripts}/helper.js (100%)
rename {harness => website/scripts/lib}/jquery-1.4.2.min.js (100%)
rename {harness => website/scripts/lib}/jquery.base64.js (100%)
rename {harness => website/scripts/lib}/jqueryprogressbar.js (100%)
rename {harness => website/scripts}/sections.js (100%)
rename {harness => website/scripts}/sth.js (100%)
diff --git a/tools/packaging/templates/runner.bestPractice.html b/tools/packaging/templates/runner.bestPractice.html
index 60c3bbef6f..f2f0f8638e 100644
--- a/tools/packaging/templates/runner.bestPractice.html
+++ b/tools/packaging/templates/runner.bestPractice.html
@@ -2,18 +2,18 @@
<html dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<script type="text/javascript" src="harness/jquery-1.4.2.min.js"></script>
-<script type="text/javascript" src="harness/sections.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="scripts/sections.js"></script>
<script type="text/javascript">
//Globals
var STANDARD = "ECMA-262";
var TEST_LIST_PATH = "json/testcaseslist.json";
</script>
-<script type="text/javascript" src="harness/sth.js"></script>
+<script type="text/javascript" src="scripts/sth.js"></script>
<script type="text/javascript" src="harness/sta.js"></script>
-<script type="text/javascript" src="harness/jqueryprogressbar.js"></script>
-<script type="text/javascript" src="harness/helper.js"></script>
-<script type="text/javascript" src="harness/jquery.base64.js"></script>
+<script type="text/javascript" src="scripts/lib/jqueryprogressbar.js"></script>
+<script type="text/javascript" src="scripts/helper.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery.base64.js"></script>
<script type="text/javascript">
//To support all the browsers
$(window).resize(ResizeLoadIndicator);
diff --git a/tools/packaging/templates/runner.intl402.html b/tools/packaging/templates/runner.intl402.html
index 11f8321f06..3f479225b7 100644
--- a/tools/packaging/templates/runner.intl402.html
+++ b/tools/packaging/templates/runner.intl402.html
@@ -2,18 +2,18 @@
<html dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<script type="text/javascript" src="harness/jquery-1.4.2.min.js"></script>
-<script type="text/javascript" src="harness/sections.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="scripts/sections.js"></script>
<script type="text/javascript">
//Globals
var STANDARD = "ECMA-402";
var TEST_LIST_PATH = "json/testcaseslist.json";
</script>
-<script type="text/javascript" src="harness/sth.js"></script>
+<script type="text/javascript" src="scripts/sth.js"></script>
<script type="text/javascript" src="harness/sta.js"></script>
-<script type="text/javascript" src="harness/jqueryprogressbar.js"></script>
-<script type="text/javascript" src="harness/helper.js"></script>
-<script type="text/javascript" src="harness/jquery.base64.js"></script>
+<script type="text/javascript" src="scripts/lib/jqueryprogressbar.js"></script>
+<script type="text/javascript" src="scripts/helper.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery.base64.js"></script>
<script type="text/javascript">
//To support all the browsers
$(window).resize(ResizeLoadIndicator);
diff --git a/tools/packaging/templates/runner.test262.html b/tools/packaging/templates/runner.test262.html
index 9f51b6b02b..cfb1539186 100644
--- a/tools/packaging/templates/runner.test262.html
+++ b/tools/packaging/templates/runner.test262.html
@@ -2,18 +2,18 @@
<html dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<script type="text/javascript" src="harness/jquery-1.4.2.min.js"></script>
-<script type="text/javascript" src="harness/sections.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="scripts/sections.js"></script>
<script type="text/javascript">
//Globals
var STANDARD = "ECMA-262";
var TEST_LIST_PATH = "json/testcaseslist.json";
</script>
-<script type="text/javascript" src="harness/sth.js"></script>
+<script type="text/javascript" src="scripts/sth.js"></script>
<script type="text/javascript" src="harness/sta.js"></script>
-<script type="text/javascript" src="harness/jqueryprogressbar.js"></script>
-<script type="text/javascript" src="harness/helper.js"></script>
-<script type="text/javascript" src="harness/jquery.base64.js"></script>
+<script type="text/javascript" src="scripts/lib/jqueryprogressbar.js"></script>
+<script type="text/javascript" src="scripts/helper.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery.base64.js"></script>
<script type="text/javascript">
//To support all the browsers
$(window).resize(ResizeLoadIndicator);
diff --git a/harness/ed.js b/website/scripts/ed.js
similarity index 100%
rename from harness/ed.js
rename to website/scripts/ed.js
diff --git a/harness/gs.js b/website/scripts/gs.js
similarity index 100%
rename from harness/gs.js
rename to website/scripts/gs.js
diff --git a/harness/helper.js b/website/scripts/helper.js
similarity index 100%
rename from harness/helper.js
rename to website/scripts/helper.js
diff --git a/harness/jquery-1.4.2.min.js b/website/scripts/lib/jquery-1.4.2.min.js
similarity index 100%
rename from harness/jquery-1.4.2.min.js
rename to website/scripts/lib/jquery-1.4.2.min.js
diff --git a/harness/jquery.base64.js b/website/scripts/lib/jquery.base64.js
similarity index 100%
rename from harness/jquery.base64.js
rename to website/scripts/lib/jquery.base64.js
diff --git a/harness/jqueryprogressbar.js b/website/scripts/lib/jqueryprogressbar.js
similarity index 100%
rename from harness/jqueryprogressbar.js
rename to website/scripts/lib/jqueryprogressbar.js
diff --git a/harness/sections.js b/website/scripts/sections.js
similarity index 100%
rename from harness/sections.js
rename to website/scripts/sections.js
diff --git a/harness/sth.js b/website/scripts/sth.js
similarity index 100%
rename from harness/sth.js
rename to website/scripts/sth.js
--
GitLab