Merge branch 'master' into defer-enteredView

googlearchive · Sep 17, 2013 · e269681 · e269681
2 parents 16a6b37 + c26a6ca
commit e269681
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 22 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "MutationObservers"]
 	path = MutationObservers
 	url = https://github.com/Polymer/MutationObservers.git
-[submodule "tools"]
-	path = tools
-	url = https://github.com/Polymer/tools.git
diff --git a/conf/karma.conf.js b/conf/karma.conf.js
@@ -1,20 +1,20 @@
 module.exports = function(karma) {
-  var common = require('../tools/test/karma-common.conf.js');
+  var common = require('../../tools/test/karma-common.conf.js');
 
   karma.set(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',
-      'custom-elements.js',
-      'test/js/*.js',
-      {pattern: 'src/*', included: false},
-      {pattern: 'MutationObservers/*.js', included: false},
-      {pattern: 'test/html/*.html', included: false},
+      'CustomElements/conf/mocha.conf.js',
+      'CustomElements/node_modules/chai/chai.js',
+      'CustomElements/custom-elements.js',
+      'CustomElements/test/js/*.js',
+      {pattern: 'CustomElements/src/*', included: false},
+      {pattern: 'CustomElements/MutationObservers/*.js', included: false},
+      {pattern: 'CustomElements/test/html/*.html', included: false},
       {pattern: 'tools/**/*.js', included: false}
     ]
   }));

diff --git a/conf/mocha.conf.js b/conf/mocha.conf.js
@@ -1,4 +1,4 @@
 mocha.setup({
   ui:'tdd',
-  htmlbase: '/base/test/'
+  htmlbase: '/base/CustomElements/test/'
 });
diff --git a/custom-elements.js b/custom-elements.js
@@ -32,7 +32,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/gruntfile.js b/gruntfile.js
@@ -41,7 +41,7 @@ module.exports = function(grunt) {
           outdir: 'docs',
           linkNatives: 'true',
           tabtospace: 2,
-          themedir: 'tools/doc/themes/polymerase'
+          themedir: '../tools/doc/themes/polymerase'
         }
       }
     },

diff --git a/test/html/attributes.html b/test/html/attributes.html
@@ -2,8 +2,8 @@
 <html>
   <head>
     <title>HTML Imports Test</title>
-    <script src="../../tools/test/htmltest.js"></script>
-    <script src="../../tools/test/chai/chai.js"></script>
+    <script src="../../../tools/test/htmltest.js"></script>
+    <script src="../../../tools/test/chai/chai.js"></script>
     <script src="../../custom-elements.js"></script>
   </head>
   <body>

diff --git a/test/runner.html b/test/runner.html
@@ -8,10 +8,10 @@
   <head>
     <title>Test: Custom Elements</title>
     <meta charset="UTF-8">
-    <link rel="stylesheet" href="../tools/test/mocha/mocha.css" />
-    <script src="../tools/test/mocha/mocha.js"></script>
-    <script src="../tools/test/chai/chai.js"></script>
-    <script src="../tools/test/mocha-htmltest.js"></script>
+    <link rel="stylesheet" href="../../tools/test/mocha/mocha.css" />
+    <script src="../../tools/test/mocha/mocha.js"></script>
+    <script src="../../tools/test/chai/chai.js"></script>
+    <script src="../../tools/test/mocha-htmltest.js"></script>
     <script src="../custom-elements.js"></script>
   </head>
   <body>

diff --git a/tools b/tools