Merge pull request #2059 from camptocamp/use_corejs_typeahead

Depend on corejs-typeahead
camptocamp · Nov 25, 2016 · 466d094 · 466d094
2 parents 7be7f77 + b63b16a
commit 466d094
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -41,7 +41,7 @@ GMF_APPS_LIBS_JS_FILES += \
 	node_modules/proj4/dist/proj4-src.js \
 	node_modules/d3/d3.js \
 	node_modules/file-saver/FileSaver.js \
-	node_modules/typeahead.js/dist/typeahead.bundle.js \
+	node_modules/corejs-typeahead/dist/typeahead.bundle.js \
 	node_modules/jsts/dist/jsts.min.js \
 	third-party/jquery-ui/jquery-ui.js
 else
@@ -62,7 +62,7 @@ GMF_APPS_LIBS_JS_FILES += \
 	node_modules/proj4/dist/proj4.js \
 	node_modules/d3/d3.min.js \
 	node_modules/file-saver/FileSaver.min.js \
-	node_modules/typeahead.js/dist/typeahead.bundle.min.js \
+	node_modules/corejs-typeahead/dist/typeahead.bundle.min.js \
 	node_modules/jsts/dist/jsts.min.js \
 	third-party/jquery-ui/jquery-ui.min.js
 endif
@@ -445,7 +445,7 @@ dist/gmf.js.map: dist/gmf.js
 	mkdir -p $(dir $@)
 	cp $< $@
 
-.build/examples-hosted/lib/typeahead.bundle.min.js: node_modules/typeahead.js/dist/typeahead.bundle.min.js
+.build/examples-hosted/lib/typeahead.bundle.min.js: node_modules/corejs-typeahead/dist/typeahead.bundle.min.js
 	mkdir -p $(dir $@)
 	cp $< $@
 
@@ -533,7 +533,7 @@ node_modules/angular/angular.min.js: .build/node_modules.timestamp
 		-e 's|\.\./node_modules/angular-ui-date/dist/date.js|lib/date.min.js|' \
 		-e 's|\.\./node_modules/d3/d3.js|lib/d3.min.js|' \
 		-e 's|\.\./node_modules/file-saver/FileSaver.min.js|lib/FileSaver.min.js|' \
-		-e 's|\.\./node_modules/typeahead.js/dist/typeahead.bundle.js|lib/typeahead.bundle.min.js|' \
+		-e 's|\.\./node_modules/corejs-typeahead/dist/typeahead.bundle.js|lib/typeahead.bundle.min.js|' \
 		-e 's|\.\./node_modules/proj4/dist/proj4\.js|lib/proj4.js|' \
 		-e 's|\.\./node_modules/jsts/dist/jsts\.min\.js|lib/jsts.min.js|' \
 		-e 's|/@?main=$*.js|$*.js|' \
@@ -565,7 +565,7 @@ node_modules/angular/angular.min.js: .build/node_modules.timestamp
 		-e 's|\.\./node_modules/angular-ui-slider/src/slider.js|lib/slider.min.js|' \
 		-e 's|\.\./node_modules/d3/d3\.js|lib/d3.min.js|' \
 		-e 's|\.\./node_modules/file-saver/FileSaver.min.js|lib/FileSaver.min.js|' \
-		-e 's|\.\./node_modules/typeahead.js/dist/typeahead.bundle\.js|lib/typeahead.bundle.min.js|' \
+		-e 's|\.\./node_modules/corejs-typeahead/dist/typeahead.bundle\.js|lib/typeahead.bundle.min.js|' \
 		-e 's|\.\./node_modules/proj4/dist/proj4\.js|lib/proj4.js|' \
 		-e 's|\.\./node_modules/jsts/dist/jsts\.min\.js|lib/jsts.min.js|' \
 		-e 's|/@?main=$*\.js|$*.js|' \

diff --git a/contribs/gmf/apps/desktop/index.html b/contribs/gmf/apps/desktop/index.html
@@ -240,7 +240,7 @@
     <script src="../../../../node_modules/angular-animate/angular-animate.js"></script>
     <script src="../../../../node_modules/angular-sanitize/angular-sanitize.js"></script>
     <script src="../../../../node_modules/angular-touch/angular-touch.js"></script>
-    <script src="../../../../node_modules/typeahead.js/dist/typeahead.bundle.js"></script>
+    <script src="../../../../node_modules/corejs-typeahead/dist/typeahead.bundle.js"></script>
     <script src="../../../../node_modules/angular-ui-date/dist/date.js"></script>
     <script src="../../../../node_modules/angular-float-thead/angular-floatThead.js"></script>
     <script src="../../../../node_modules/floatthead/dist/jquery.floatThead.min.js"></script>

diff --git a/contribs/gmf/apps/desktop_alt/index.html b/contribs/gmf/apps/desktop_alt/index.html
@@ -259,7 +259,7 @@
     <script src="../../../../node_modules/angular-float-thead/angular-floatThead.js"></script>
     <script src="../../../../node_modules/floatthead/dist/jquery.floatThead.min.js"></script>
     <script src="../../../../node_modules/angular-ui-slider/src/slider.js"></script>
-    <script src="../../../../node_modules/typeahead.js/dist/typeahead.bundle.js"></script>
+    <script src="../../../../node_modules/corejs-typeahead/dist/typeahead.bundle.js"></script>
     <script src="../../../../node_modules/proj4/dist/proj4-src.js"></script>
     <script src="../../../../node_modules/angular-gettext/dist/angular-gettext.js"></script>
     <script src="../../../../node_modules/angular-dynamic-locale/dist/tmhDynamicLocale.js"></script>

diff --git a/contribs/gmf/apps/mobile/index.html b/contribs/gmf/apps/mobile/index.html
@@ -149,7 +149,7 @@
     <script src="../../../../node_modules/angular-float-thead/angular-floatThead.js"></script>
     <script src="../../../../node_modules/floatthead/dist/jquery.floatThead.min.js"></script>
     <script src="../../../../node_modules/angular-ui-slider/src/slider.js"></script>
-    <script src="../../../../node_modules/typeahead.js/dist/typeahead.bundle.js"></script>
+    <script src="../../../../node_modules/corejs-typeahead/dist/typeahead.bundle.js"></script>
     <script src="../../../../node_modules/proj4/dist/proj4-src.js"></script>
     <script src="../../../../node_modules/angular-gettext/dist/angular-gettext.js"></script>
     <script src="../../../../node_modules/angular-dynamic-locale/dist/tmhDynamicLocale.js"></script>

diff --git a/contribs/gmf/apps/oeedit/index.html b/contribs/gmf/apps/oeedit/index.html
@@ -168,7 +168,7 @@
     <script src="../../../../node_modules/angular-animate/angular-animate.js"></script>
     <script src="../../../../node_modules/angular-sanitize/angular-sanitize.js"></script>
     <script src="../../../../node_modules/angular-touch/angular-touch.js"></script>
-    <script src="../../../../node_modules/typeahead.js/dist/typeahead.bundle.js"></script>
+    <script src="../../../../node_modules/corejs-typeahead/dist/typeahead.bundle.js"></script>
     <script src="../../../../node_modules/angular-ui-date/dist/date.js"></script>
     <script src="../../../../node_modules/angular-float-thead/angular-floatThead.js"></script>
     <script src="../../../../node_modules/floatthead/dist/jquery.floatThead.min.js"></script>

diff --git a/contribs/gmf/examples/search.html b/contribs/gmf/examples/search.html
@@ -177,7 +177,7 @@
     <script src="../../../node_modules/floatthead/dist/jquery.floatThead.min.js"></script>
     <script src="../../../node_modules/angular-ui-slider/src/slider.js"></script>
     <script src="../../../node_modules/angular-dynamic-locale/dist/tmhDynamicLocale.js"></script>
-    <script src="../../../node_modules/typeahead.js/dist/typeahead.bundle.js"></script>
+    <script src="../../../node_modules/corejs-typeahead/dist/typeahead.bundle.js"></script>
     <script src="../../../node_modules/proj4/dist/proj4.js"></script>
     <script src="../../../node_modules/bootstrap/dist/js/bootstrap.js"></script>
     <script src="/@?main=search.js"></script>

diff --git a/examples/search.html b/examples/search.html
@@ -89,7 +89,7 @@
     <script src="../node_modules/angular-ui-date/dist/date.js"></script>
     <script src="../node_modules/angular-float-thead/angular-floatThead.js"></script>
     <script src="../node_modules/floatthead/dist/jquery.floatThead.min.js"></script>
-    <script src="../node_modules/typeahead.js/dist/typeahead.bundle.js"></script>
+    <script src="../node_modules/corejs-typeahead/dist/typeahead.bundle.js"></script>
     <script src="../node_modules/proj4/dist/proj4.js"></script>
     <script src="/@?main=search.js"></script>
     <script src="default.js"></script>

diff --git a/karma-conf.js b/karma-conf.js
@@ -44,7 +44,7 @@ module.exports = function(config) {
       'node_modules/proj4/dist/proj4-src.js',
       'node_modules/d3/d3.js',
       'node_modules/file-saver/FileSaver.js',
-      'node_modules/typeahead.js/dist/typeahead.bundle.js',
+      'node_modules/corejs-typeahead/dist/typeahead.bundle.js',
       'third-party/jquery-ui/jquery-ui.js',
       'node_modules/angular-mocks/angular-mocks.js',
       'test/spec/beforeeach.js',

diff --git a/package.json b/package.json
@@ -63,7 +63,7 @@
     "temp": "0.8.3",
     "ttf2eot": "1.3.0",
     "ttf2woff": "2.0.1",
-    "typeahead.js": "0.11.1",
+    "corejs-typeahead": "1.0.1",
     "walk": "2.3.9",
     "file-saver": "1.3.3"
   }