Merge pull request #1 from catrielmuller/master

Autocomplete / Model Check
fedemiguez · Nov 19, 2015 · a77ecdb · a77ecdb
2 parents 62806ae + 1dd3801
commit a77ecdb
Show file tree

Hide file tree

Showing 134 changed files with 26,849 additions and 76,308 deletions.
diff --git a/bower.json b/bower.json
@@ -2,11 +2,13 @@
   "name": "sample",
   "private": "true",
   "devDependencies": {
-    "ionic": "driftyco/ionic-bower#1.0.0-rc.2",
+    "ionic": "driftyco/ionic-bower#v1.1.1",
     "ionic-material": "0.4.2",
     "ion-md-input": "0.0.2"
   },
   "dependencies": {
-    "ionic-datepicker": "~0.9.0"
+    "ionic-datepicker": "~0.9.0",
+    "ion-autocomplete": "~0.3.1",
+    "checklist-model": "~0.6.0"
   }
 }
diff --git a/www/index.html b/www/index.html
@@ -7,17 +7,22 @@
     <meta http-equiv="Content-Security-Policy" content="default-src *; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://*.facebook.net   http://*.facebook.net https://*.facebook.com   http://*.facebook.com http://localhost:35729/">
 
     <title></title>
-    <link href="lib/ion-autocomplete/dist/ion-autocomplete.css" rel="stylesheet">  
-    <link href="lib/ionic/css/ionic.css" rel="stylesheet">
+
     <link href='https://fonts.googleapis.com/css?family=RobotoDraft:400,500,700,400italic' rel='stylesheet' type='text/css'>
-    <link href="lib/ion-md-input/css/ion-md-input.min.css" rel="stylesheet">
+
+    <link href="lib/ionic/css/ionic.css" rel="stylesheet">
+    <link href="lib/ion-autocomplete/dist/ion-autocomplete.css" rel="stylesheet">  
     <link href="lib/ionic-material/dist/ionic.material.min.css" rel="stylesheet">
+
+    <link href="lib/ion-md-input/css/ion-md-input.min.css" rel="stylesheet">
     <link href="css/style.css" rel="stylesheet">
+
+
     <script src="lib/ionic/js/ionic.bundle.js"></script>
     <script src="lib/ionic-material/dist/ionic.material.min.js"></script>
     <script src="lib/ion-md-input/js/ion-md-input.min.js"></script>
     <script src="lib/ion-autocomplete/dist/ion-autocomplete.js"></script>
-
+    <script src="lib/checklist-model/checklist-model.js"></script>
 
     <!-- cordova script (this will be a 404 during development) -->
     <script src="cordova.js"></script>

diff --git a/www/js/app.js b/www/js/app.js
@@ -4,7 +4,7 @@
 // 'starter' is the name of this angular module example (also set in a <body> attribute in index.html)
 // the 2nd parameter is an array of 'requires'
 // 'starter.controllers' is found in controllers.js
-angular.module('starter', ['ionic', 'starter.controllers', 'ionic-material', 'ionMdInput', 'checklist-model'])
+angular.module('starter', ['ionic', 'starter.controllers', 'ionic-material', 'ionMdInput', 'ion-autocomplete', 'checklist-model'])
 
 .run(function($ionicPlatform) {
     $ionicPlatform.ready(function() {

diff --git a/www/lib/angular-animate/.bower.json b/www/lib/angular-animate/.bower.json
@@ -1,19 +1,19 @@
 {
   "name": "angular-animate",
-  "version": "1.3.13",
+  "version": "1.4.3",
   "main": "./angular-animate.js",
   "ignore": [],
   "dependencies": {
-    "angular": "1.3.13"
+    "angular": "1.4.3"
   },
   "homepage": "https://github.com/angular/bower-angular-animate",
-  "_release": "1.3.13",
+  "_release": "1.4.3",
   "_resolution": {
     "type": "version",
-    "tag": "v1.3.13",
-    "commit": "f18cb98590471ad9c1e5ae0e57178e9ecb8d384c"
+    "tag": "v1.4.3",
+    "commit": "4ce2a76359401102d2e0146ccf69e6c060799ff8"
   },
   "_source": "git://github.com/angular/bower-angular-animate.git",
-  "_target": "1.3.13",
+  "_target": "1.4.3",
   "_originalSource": "angular-animate"
 }
diff --git a/www/lib/angular-animate/README.md b/www/lib/angular-animate/README.md
@@ -14,21 +14,12 @@ You can install this package either with `npm` or with `bower`.
 npm install angular-animate
 ```
 
-Add a `<script>` to your `index.html`:
-
-```html
-<script src="/node_modules/angular-animate/angular-animate.js"></script>
-```
-
 Then add `ngAnimate` as a dependency for your app:
 
 ```javascript
-angular.module('myApp', ['ngAnimate']);
+angular.module('myApp', [require('angular-animate')]);
 ```
 
-Note that this package is not in CommonJS format, so doing `require('angular-animate')` will
-return `undefined`.
-
 ### bower
 
 ```shell
@@ -56,7 +47,7 @@ Documentation is available on the
 
 The MIT License
 
-Copyright (c) 2010-2012 Google, Inc. http://angularjs.org
+Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal