Move polymer-expressions and polymer-gestures from platform into polymer

googlearchive · Apr 17, 2014 · 6462c51 · 6462c51
1 parent d817018
commit 6462c51
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 108 deletions.
diff --git a/bower.json b/bower.json
@@ -14,9 +14,8 @@
   "dependencies": {
     "CustomElements": "Polymer/CustomElements#master",
     "HTMLImports": "Polymer/HTMLImports#master",
-    "polymer-gestures":"Polymer/polymer-gestures#master",
     "ShadowDOM": "Polymer/ShadowDOM#master",
-    "polymer-expressions": "Polymer/polymer-expressions#master",
+    "TemplateBinding": "Polymer/TemplateBinding#master",
     "tools": "Polymer/tools#master",
     "URL": "Polymer/URL#master"
   },

diff --git a/build-native.json b/build-native.json
@@ -14,8 +14,5 @@
   "src/loader.js",
   "src/styleloader.js",
 
-  "../polymer-gestures/build.json",
-
-  "../polymer-expressions/build.json",
   "src/patches-mdv.js"
 ]
diff --git a/build.json b/build.json
@@ -26,8 +26,7 @@
   "src/loader.js",
   "src/styleloader.js",
 
-  "../polymer-gestures/build.json",
+  "../TemplateBinding/build.json",
 
-  "../polymer-expressions/build.json",
   "src/patches-mdv.js"
 ]
diff --git a/platform.js b/platform.js
@@ -64,15 +64,11 @@ function processFlags(flags) {
         'src/loader.js',
         'src/styleloader.js',
 
-        '../polymer-gestures/polymer-gestures.js',
-
         // TODO(sjmiles): polymer-expressions.js does not load dependencies, but
         // the build.json does
         '../observe-js/src/observe.js',
         '../NodeBind/src/NodeBind.js',
         '../TemplateBinding/src/TemplateBinding.js',
-        '../polymer-expressions/third_party/esprima/esprima.js',
-        '../polymer-expressions/src/polymer-expressions.js',
         'src/patches-mdv.js'
       ]
     );

diff --git a/test/html/mdv-shadow.html b/test/html/mdv-shadow.html
diff --git a/test/html/template-repeat-wrappers.html b/test/html/template-repeat-wrappers.html
diff --git a/test/js/tests.js b/test/js/tests.js
@@ -15,8 +15,6 @@ htmlSuite('integration', function() {
   htmlTest('html/web-components.html');
   htmlTest('html/smoke.html');
   htmlTest('html/smoke.html?shadow&register');
-  htmlTest('html/mdv-shadow.html');
-  htmlTest('html/template-repeat-wrappers.html');
   htmlTest('html/ce-import.html');
   htmlTest('html/ce-import.html?shadow');
   htmlTest('html/ce-upgrade-order.html');