javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 04:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0' into windows-mode

Browse Source
This commit is contained in:
Brandy Carney
2016-03-03 13:12:52 -05:00
parent 1d95e6c339 a2a9e3846f
commit 62c7199fd1
45 changed files with 558 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/README.md
View File

@ -37,10 +37,10 @@ From `ionic` directory:
From your app directory:
1. `npm link ionic-framework`
1. `npm link ionic-angular`
2. `ionic serve` or `ionic run` or `ionic emulate`
To remove the linked version of `ionic-framework` do `npm rm ionic-framework`, and then reinstall using `npm install ionic-framework`.
To remove the linked version of `ionic-angular` do `npm rm ionic-angular`, and then reinstall using `npm install ionic-angular`.
### Running Snapshot

5
scripts/karma/karma.conf.js
View File

@ -1,5 +1,7 @@
var buildConfig = require('../build/config');
module.exports = function(config) {
config.set({
singleRun: true,
@ -8,7 +10,8 @@ module.exports = function(config) {
frameworks: ['jasmine'],
files: [
'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.js',
'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.js', //npm2
'node_modules/es6-module-loader/dist/es6-module-loader.src.js', //npm3
'node_modules/systemjs/dist/system.js',
'scripts/karma/system.config.js',
'node_modules/angular2/bundles/angular2-polyfills.min.js',

3
scripts/karma/system.config.js
View File

@ -1,6 +1,7 @@
System.config({
map: {
'angular2': '/base/angular2'
'angular2': '/base/angular2',
'ionic-angular': '/base/ionic'
},
packages: {
'ionic-angular': {

4
scripts/npm/README.md
View File

@ -11,7 +11,7 @@ In the root of the package are ES5 sources in the CommonJS module format, their
Usually, the only Javascript file required by the user is `ionic.js`, as everything from Ionic can be imported from this file:
```
import {App, Page} from 'ionic-framework/ionic';
import {App, Page} from 'ionic-angular';
```
### Bundles
@ -20,7 +20,7 @@ Minified and unminified CommonJS and System.register module format bundles, as w
### Installation and More
To use Ionic 2, we recommend installing and utilizing the Ionic CLI which will help you create pre-configured Ionic apps.
To use Ionic 2, we recommend installing and utilizing the Ionic CLI which will help you create pre-configured Ionic apps.
For full instructions on using Ionic 2, please visit the [Ionic 2 Documentation](http://ionicframework.com/docs/v2/)