remove tools submodule

Yvonne Yip · Yvonne Yip · commit a65fd2c74dd2 · 2013-09-13T14:42:20.000-07:00
diff --git a/.gitmodules b/.gitmodules
diff --git a/conf/karma.conf.js b/conf/karma.conf.js
@@ -1,19 +1,19 @@
 module.exports = function(karma) {
-  var common = require('../tools/test/karma-common.conf.js');
+  var common = require('../../tools/test/karma-common.conf.js');
   karma.configure(common.mixin_common_opts(karma, {
     // base path, that will be used to resolve files and exclude
-    basePath: '../',
+    basePath: '../../',
 
     // list of files / patterns to load in the browser
     files: [
       'tools/test/mocha-htmltest.js',
-      'conf/mocha.conf.js',
-      'node_modules/chai/chai.js',
-      'test/js/*.js',
-      'html-imports.js',
+      'HTMLImports/conf/mocha.conf.js',
+      'HTMLImports/node_modules/chai/chai.js',
+      'HTMLImports/test/js/*.js',
+      'HTMLImports/html-imports.js',
       {pattern: 'tools/**/*.js', included: false},
-      {pattern: 'src/*', included: false},
-      {pattern: 'test/**/*', included: false}
+      {pattern: 'HTMLImports/src/*', included: false},
+      {pattern: 'HTMLImports/test/**/*', included: false}
     ],
   }));
 };
diff --git a/conf/mocha.conf.js b/conf/mocha.conf.js
@@ -1 +1 @@
-mocha.setup({ui:'tdd',htmlbase:'/base/test/'});
+mocha.setup({ui:'tdd',htmlbase:'/base/HTMLImports/test/'});
diff --git a/html-imports.js b/html-imports.js
@@ -28,7 +28,7 @@ var src = script.attributes.src.value;
 var basePath = src.slice(0, src.indexOf(thisFile));
 
 if (!window.PolymerLoader) {
-  var path = basePath + 'tools/loader/loader.js';
+  var path = basePath + '../tools/loader/loader.js';
   document.write('<script src="' + path + '"></script>');
 }
 document.write('<script>PolymerLoader.load("' + scopeName + '")</script>');
diff --git a/test/html/HTMLImports.html b/test/html/HTMLImports.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>HTML Imports Test</title>
-    <script src="../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
     <script src="../../node_modules/chai/chai.js"></script>
     <script src="../../html-imports.js"></script>
     <link rel="import" href="imports/import-1.html">
diff --git a/test/html/parser.html b/test/html/parser.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>parser Test</title>
-    <script src="../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
     <script src="../../node_modules/chai/chai.js"></script>
     <script src="../../html-imports.js"></script>
     <link rel="import" href="imports/parsed-import-1.html">
diff --git a/test/html/path.html b/test/html/path.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title>HTMLImports Path Tests</title>
-  <script src="../../tools/test/htmltest.js"></script>
+  <script src="../../../tools/test/htmltest.js"></script>
   <script src="../../node_modules/chai/chai.js"></script>
   <script src="../../html-imports.js"></script>
   <script>
diff --git a/test/html/style-links.html b/test/html/style-links.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Style Links Test</title>
-    <script src="../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
     <script src="../../node_modules/chai/chai.js"></script>
     <script src="../../html-imports.js"></script>
     <link rel="import" href="imports/style-links.html">
diff --git a/test/html/template-script.html b/test/html/template-script.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>template script test</title>
-    <script src="../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
     <script src="../../node_modules/chai/chai.js"></script>
     <script src="../../html-imports.js"></script>
     <link rel="import" href="imports/template-import.html">
diff --git a/test/runner.html b/test/runner.html
@@ -11,7 +11,7 @@
     <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
     <script src="../node_modules/mocha/mocha.js"></script>
     <script src="../node_modules/chai/chai.js"></script>
-    <script src="../tools/test/mocha-htmltest.js"></script>
+    <script src="../../tools/test/mocha-htmltest.js"></script>
     <script src="../html-imports.js"></script>
   </head>
   <body>
diff --git a/tools b/tools

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-mocha.setup({ui:'tdd',htmlbase:'/base/test/'});`
	`1`	`+mocha.setup({ui:'tdd',htmlbase:'/base/HTMLImports/test/'});`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ var src = script.attributes.src.value;`
`28`	`28`	`var basePath = src.slice(0, src.indexOf(thisFile));`
`29`	`29`
`30`	`30`	`if (!window.PolymerLoader) {`
`31`		`- var path = basePath + 'tools/loader/loader.js';`
	`31`	`+ var path = basePath + '../tools/loader/loader.js';`
`32`	`32`	`document.write('<script src="' + path + '"></script>');`
`33`	`33`	`}`
`34`	`34`	`document.write('<script>PolymerLoader.load("' + scopeName + '")</script>');`