Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Autocomplete / Model Check #1

Merged
merged 2 commits into from
Nov 19, 2015
Merged

Autocomplete / Model Check #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
417b273
Corrected Bower Ionic, Index.html scripts calls
catrielmuller Nov 19, 2015
1dd3801
Add CheckList Model
catrielmuller Nov 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
13 changes: 9 additions & 4 deletions www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion www/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
12 changes: 6 additions & 6 deletions www/lib/angular-animate/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
13 changes: 2 additions & 11 deletions www/lib/angular-animate/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading