mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2026-03-13 10:22:08 +08:00
Merge branch 'master' of https://github.com/driftyco/ionic
Conflicts: dist/css/ionic.css
This commit is contained in:
Adam Bradley
1
dist/css/themes/ionic-ios7.css
vendored
1
dist/css/themes/ionic-ios7.css
vendored
@@ -1,3 +1,4 @@
|
||||
@charset "UTF-8";
|
||||
/**
|
||||
* Nav controllers and header bar animations
|
||||
*/
|
||||
|
||||
6
dist/js/ionic-angular.js
vendored
6
dist/js/ionic-angular.js
vendored
@@ -24592,8 +24592,10 @@ angular.module('ionic.ui.content', [])
|
||||
return function($scope, $element, $attr) {
|
||||
var c = $element.eq(0);
|
||||
|
||||
if(attr.padding) {
|
||||
c.addClass('padding');
|
||||
var scroll = $element[0].querySelector('.scroll');
|
||||
|
||||
if(scroll && attr.padding) {
|
||||
scroll.classList.add('padding');
|
||||
}
|
||||
|
||||
if(attr.hasHeader == "true") {
|
||||
|
||||
6
js/ext/angular/src/directive/ionicContent.js
vendored
6
js/ext/angular/src/directive/ionicContent.js
vendored
@@ -34,8 +34,10 @@ angular.module('ionic.ui.content', [])
|
||||
return function($scope, $element, $attr) {
|
||||
var c = $element.eq(0);
|
||||
|
||||
if(attr.padding) {
|
||||
c.addClass('padding');
|
||||
var scroll = $element[0].querySelector('.scroll');
|
||||
|
||||
if(scroll && attr.padding) {
|
||||
scroll.classList.add('padding');
|
||||
}
|
||||
|
||||
if(attr.hasHeader == "true") {
|
||||
|
||||
@@ -1,90 +0,0 @@
|
||||
/*
|
||||
__ __
|
||||
| / \ |\ | | / `
|
||||
| \__/ | \| | \__,
|
||||
|
||||
http://ionicframework.com/
|
||||
|
||||
A utility for starting and administering Ionic based mobile app projects.
|
||||
Licensed under the MITlicense. See LICENSE For more.
|
||||
|
||||
Copyright 2013 Drifty (http://drifty.com/)
|
||||
*/
|
||||
|
||||
var IonicStartTask = require('./lib/ionic/start.js').IonicStartTask;
|
||||
|
||||
var argv = require('optimist').argv;
|
||||
|
||||
var TASKS = [
|
||||
{
|
||||
title: 'start',
|
||||
name: 'start',
|
||||
usage: 'appname',
|
||||
task: IonicStartTask
|
||||
}
|
||||
];
|
||||
|
||||
Ionic = function() {};
|
||||
|
||||
Ionic.prototype = {
|
||||
_tryBuildingTask: function() {
|
||||
if(argv._.length == 0) {
|
||||
return false;
|
||||
}
|
||||
var taskName = argv._[0];
|
||||
|
||||
return this._getTaskWithName(taskName);
|
||||
},
|
||||
|
||||
_getTaskWithName: function(name) {
|
||||
for(var i = 0; i < TASKS.length; i++) {
|
||||
var t = TASKS[i];
|
||||
if(t.name === name) {
|
||||
return t;
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
_printGenericUsage: function() {
|
||||
this._printIonic();
|
||||
process.stderr.write('Usage: ionic task args\n\n===============\n\nAvailable tasks:\n\n');
|
||||
|
||||
for(var i = 0; i < TASKS.length; i++) {
|
||||
var task = TASKS[i];
|
||||
process.stderr.write(' ' + task.name + '\t\t' + task.task.HELP_LINE + '\n');
|
||||
}
|
||||
|
||||
process.exit(1);
|
||||
},
|
||||
|
||||
_printIonic: function() {
|
||||
process.stdout.write('\n __ __ \n');
|
||||
process.stdout.write('| / \\ |\\ | | / `\n' + '| \\__/ | \\| | \\__,\n\n');
|
||||
},
|
||||
|
||||
_loadTaskRunner: function(which) {
|
||||
|
||||
},
|
||||
|
||||
run: function() {
|
||||
var task = this._tryBuildingTask();
|
||||
if(!task) {
|
||||
return this._printGenericUsage();
|
||||
}
|
||||
|
||||
console.log('Running', task.title, 'task...')
|
||||
|
||||
var taskObj = new task.task();
|
||||
taskObj.run(this);
|
||||
},
|
||||
|
||||
fail: function(msg) {
|
||||
process.stderr.write(msg + '\n');
|
||||
process.exit(1);
|
||||
},
|
||||
|
||||
};
|
||||
|
||||
|
||||
var ionic = new Ionic();
|
||||
ionic.run();
|
||||
@@ -1,58 +0,0 @@
|
||||
var fs = require('fs'),
|
||||
ncp = require('ncp').ncp,
|
||||
path = require('path'),
|
||||
IonicTask = require('./task').IonicTask;
|
||||
|
||||
var argv = require('optimist').argv;
|
||||
|
||||
var IonicStartTask = function() {
|
||||
}
|
||||
|
||||
IonicStartTask.HELP_LINE = 'Start a new Ionic project with the given name.';
|
||||
|
||||
IonicStartTask.prototype = new IonicTask();
|
||||
|
||||
IonicStartTask.prototype._printUsage = function() {
|
||||
process.stderr.write('ionic start appname\n');
|
||||
}
|
||||
|
||||
IonicStartTask.prototype.run = function(ionic) {
|
||||
if(argv._.length < 2) {
|
||||
ionic.fail('No app name specified');
|
||||
}
|
||||
|
||||
this.appName = argv._[1];
|
||||
this.targetPath = path.resolve(this.appName);
|
||||
|
||||
// Make sure to create this, or ask them if they want to override it
|
||||
if(this._checkTargetPath() === false) {
|
||||
process.stderr.write('Not continuing.');
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
console.log('Creating Ionic app in folder', this.targetPath);
|
||||
|
||||
this._writeTemplateFolder();
|
||||
};
|
||||
|
||||
IonicStartTask.prototype._writeTemplateFolder = function() {
|
||||
console.log('Copying template to', this.targetPath);
|
||||
ncp('template', this.appName, function(err) {
|
||||
if(err) {
|
||||
this._fail('Unable to build starter folder', err);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
IonicStartTask.prototype._checkTargetPath = function() {
|
||||
if(fs.existsSync(this.targetPath)) {
|
||||
var resp = this.ask('The ' + this.targetPath + ' directory already exists. Overwrite files? (y/n)')
|
||||
if(resp === 'y') {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
};
|
||||
|
||||
exports.IonicStartTask = IonicStartTask;
|
||||
@@ -1,21 +0,0 @@
|
||||
var fs = require('fs');
|
||||
|
||||
var IonicTask = function() {
|
||||
};
|
||||
|
||||
IonicTask.prototype = {
|
||||
// Prompt the user for a response
|
||||
ask: function(question) {
|
||||
var response;
|
||||
|
||||
process.stdout.write(question + ' ');
|
||||
process.stdin.resume();
|
||||
response = fs.readSync(process.stdin.fd, 100, 0, "utf8");
|
||||
process.stdin.pause();
|
||||
return response[0].trim();
|
||||
},
|
||||
run: function(ionic) {
|
||||
}
|
||||
};
|
||||
|
||||
exports.IonicTask = IonicTask;
|
||||
@@ -1,118 +0,0 @@
|
||||
0 info it worked if it ends with ok
|
||||
1 verbose cli [ 'node', '/usr/local/bin/npm', 'install' ]
|
||||
2 info using npm@1.2.32
|
||||
3 info using node@v0.10.12
|
||||
4 verbose read json /Users/driftyadmin/git/ionic/tools/ionic/package.json
|
||||
5 warn package.json ionic@0.0.1 No repository field.
|
||||
6 warn package.json ionic@0.0.1 No readme data.
|
||||
7 verbose readDependencies using package.json deps
|
||||
8 verbose install where, deps [ '/Users/driftyadmin/git/ionic/tools/ionic',
|
||||
8 verbose install [ 'optimist', 'wrench' ] ]
|
||||
9 verbose from cache /Users/driftyadmin/git/ionic/tools/ionic/package.json
|
||||
10 info preinstall ionic@0.0.1
|
||||
11 verbose from cache /Users/driftyadmin/git/ionic/tools/ionic/package.json
|
||||
12 verbose readDependencies using package.json deps
|
||||
13 verbose cache add [ 'optimist@0.0.2', null ]
|
||||
14 verbose cache add name=undefined spec="optimist@0.0.2" args=["optimist@0.0.2",null]
|
||||
15 verbose parsed url { protocol: null,
|
||||
15 verbose parsed url slashes: null,
|
||||
15 verbose parsed url auth: null,
|
||||
15 verbose parsed url host: null,
|
||||
15 verbose parsed url port: null,
|
||||
15 verbose parsed url hostname: null,
|
||||
15 verbose parsed url hash: null,
|
||||
15 verbose parsed url search: null,
|
||||
15 verbose parsed url query: null,
|
||||
15 verbose parsed url pathname: 'optimist@0.0.2',
|
||||
15 verbose parsed url path: 'optimist@0.0.2',
|
||||
15 verbose parsed url href: 'optimist@0.0.2' }
|
||||
16 verbose cache add name="optimist" spec="0.0.2" args=["optimist","0.0.2"]
|
||||
17 verbose parsed url { protocol: null,
|
||||
17 verbose parsed url slashes: null,
|
||||
17 verbose parsed url auth: null,
|
||||
17 verbose parsed url host: null,
|
||||
17 verbose parsed url port: null,
|
||||
17 verbose parsed url hostname: null,
|
||||
17 verbose parsed url hash: null,
|
||||
17 verbose parsed url search: null,
|
||||
17 verbose parsed url query: null,
|
||||
17 verbose parsed url pathname: '0.0.2',
|
||||
17 verbose parsed url path: '0.0.2',
|
||||
17 verbose parsed url href: '0.0.2' }
|
||||
18 verbose addNamed [ 'optimist', '0.0.2' ]
|
||||
19 verbose addNamed [ '0.0.2', '0.0.2' ]
|
||||
20 verbose cache add [ 'wrench@1.5.1', null ]
|
||||
21 verbose cache add name=undefined spec="wrench@1.5.1" args=["wrench@1.5.1",null]
|
||||
22 verbose parsed url { protocol: null,
|
||||
22 verbose parsed url slashes: null,
|
||||
22 verbose parsed url auth: null,
|
||||
22 verbose parsed url host: null,
|
||||
22 verbose parsed url port: null,
|
||||
22 verbose parsed url hostname: null,
|
||||
22 verbose parsed url hash: null,
|
||||
22 verbose parsed url search: null,
|
||||
22 verbose parsed url query: null,
|
||||
22 verbose parsed url pathname: 'wrench@1.5.1',
|
||||
22 verbose parsed url path: 'wrench@1.5.1',
|
||||
22 verbose parsed url href: 'wrench@1.5.1' }
|
||||
23 verbose cache add name="wrench" spec="1.5.1" args=["wrench","1.5.1"]
|
||||
24 verbose parsed url { protocol: null,
|
||||
24 verbose parsed url slashes: null,
|
||||
24 verbose parsed url auth: null,
|
||||
24 verbose parsed url host: null,
|
||||
24 verbose parsed url port: null,
|
||||
24 verbose parsed url hostname: null,
|
||||
24 verbose parsed url hash: null,
|
||||
24 verbose parsed url search: null,
|
||||
24 verbose parsed url query: null,
|
||||
24 verbose parsed url pathname: '1.5.1',
|
||||
24 verbose parsed url path: '1.5.1',
|
||||
24 verbose parsed url href: '1.5.1' }
|
||||
25 verbose addNamed [ 'wrench', '1.5.1' ]
|
||||
26 verbose addNamed [ '1.5.1', '1.5.1' ]
|
||||
27 silly lockFile 1a4cea40-optimist-0-0-2 optimist@0.0.2
|
||||
28 verbose lock optimist@0.0.2 /Users/driftyadmin/.npm/1a4cea40-optimist-0-0-2.lock
|
||||
29 silly lockFile 6c85ea82-wrench-1-5-1 wrench@1.5.1
|
||||
30 verbose lock wrench@1.5.1 /Users/driftyadmin/.npm/6c85ea82-wrench-1-5-1.lock
|
||||
31 verbose url raw wrench/1.5.1
|
||||
32 verbose url resolving [ 'https://registry.npmjs.org/', './wrench/1.5.1' ]
|
||||
33 verbose url resolved https://registry.npmjs.org/wrench/1.5.1
|
||||
34 info trying registry request attempt 1 at 10:32:52
|
||||
35 http GET https://registry.npmjs.org/wrench/1.5.1
|
||||
36 verbose url raw optimist/0.0.2
|
||||
37 verbose url resolving [ 'https://registry.npmjs.org/', './optimist/0.0.2' ]
|
||||
38 verbose url resolved https://registry.npmjs.org/optimist/0.0.2
|
||||
39 info trying registry request attempt 1 at 10:32:52
|
||||
40 http GET https://registry.npmjs.org/optimist/0.0.2
|
||||
41 info retry will retry, error on last attempt: Error: getaddrinfo ENOTFOUND
|
||||
42 info retry will retry, error on last attempt: Error: getaddrinfo ENOTFOUND
|
||||
43 info trying registry request attempt 2 at 10:33:02
|
||||
44 http GET https://registry.npmjs.org/wrench/1.5.1
|
||||
45 info retry will retry, error on last attempt: Error: getaddrinfo ENOTFOUND
|
||||
46 info trying registry request attempt 2 at 10:33:02
|
||||
47 http GET https://registry.npmjs.org/optimist/0.0.2
|
||||
48 info retry will retry, error on last attempt: Error: getaddrinfo ENOTFOUND
|
||||
49 info trying registry request attempt 3 at 10:34:02
|
||||
50 http GET https://registry.npmjs.org/wrench/1.5.1
|
||||
51 silly lockFile 6c85ea82-wrench-1-5-1 wrench@1.5.1
|
||||
52 silly lockFile 6c85ea82-wrench-1-5-1 wrench@1.5.1
|
||||
53 info trying registry request attempt 3 at 10:34:02
|
||||
54 http GET https://registry.npmjs.org/optimist/0.0.2
|
||||
55 silly lockFile 1a4cea40-optimist-0-0-2 optimist@0.0.2
|
||||
56 silly lockFile 1a4cea40-optimist-0-0-2 optimist@0.0.2
|
||||
57 error network getaddrinfo ENOTFOUND
|
||||
57 error network This is most likely not a problem with npm itself
|
||||
57 error network and is related to network connectivity.
|
||||
57 error network In most cases you are behind a proxy or have bad network settings.
|
||||
57 error network
|
||||
57 error network If you are behind a proxy, please make sure that the
|
||||
57 error network 'proxy' config is set properly. See: 'npm help config'
|
||||
58 error System Darwin 12.5.0
|
||||
59 error command "node" "/usr/local/bin/npm" "install"
|
||||
60 error cwd /Users/driftyadmin/git/ionic/tools/ionic
|
||||
61 error node -v v0.10.12
|
||||
62 error npm -v 1.2.32
|
||||
63 error syscall getaddrinfo
|
||||
64 error code ENOTFOUND
|
||||
65 error errno ENOTFOUND
|
||||
66 verbose exit [ 1, true ]
|
||||
@@ -1,16 +0,0 @@
|
||||
{
|
||||
"name": "ionic",
|
||||
"version": "0.0.1",
|
||||
"description": "A utility for starting Ionic projects.",
|
||||
"homepage": "http://ionicframework.com/",
|
||||
"main": "ionic.js",
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"author": "Max Lynch <max@drifty.com>",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"optimist": "0.0.2",
|
||||
"wrench": "1.5.1"
|
||||
}
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# rhino discards the path to the current script file, so we must add it back
|
||||
SOURCE="$0"
|
||||
while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
|
||||
# Get a Windows path under MinGW or Cygwin
|
||||
BASEPATH="$( cd -P "$( dirname "$SOURCE" )" && (pwd -W 2>/dev/null || cygpath -w $(pwd) 2>/dev/null || pwd))"
|
||||
if [ "${BASEPATH%${BASEPATH#?}}" != "/" ] ; then
|
||||
BASEPATH="$( echo "$BASEPATH" | sed -e 's@\\@/@g' )"
|
||||
# We need a extra slash for URLs
|
||||
UBASEPATH="/$BASEPATH"
|
||||
else
|
||||
UBASEPATH="$BASEPATH"
|
||||
fi
|
||||
|
||||
# for whatever reason, Rhino requires module paths to be valid URIs
|
||||
URLPATH="file://$UBASEPATH"
|
||||
URLPATH=`echo "$URLPATH" | sed -e 's/ /%20/g'`
|
||||
ENCODEDBASEPATH=`echo "$BASEPATH" | sed -e 's/ /%20/g'`
|
||||
|
||||
if test "$1" = "--debug"
|
||||
then
|
||||
echo "Running Debug"
|
||||
CMD="org.mozilla.javascript.tools.debugger.Main -debug -opt -1"
|
||||
# strip --debug argument
|
||||
shift
|
||||
else
|
||||
CMD="org.mozilla.javascript.tools.shell.Main"
|
||||
fi
|
||||
|
||||
#Conditionally execute different command lines depending on whether we're running tests or not
|
||||
if test "$1" = "-T"
|
||||
then
|
||||
echo "Running Tests"
|
||||
cd -P "$(dirname "$SOURCE")"
|
||||
java -classpath "${BASEPATH}/rhino/js.jar" ${CMD} -opt -1 -modules "${URLPATH}/node_modules" -modules "${URLPATH}/rhino" -modules "${URLPATH}/lib" -modules "${URLPATH}" "${BASEPATH}/jsdoc.js" "$@" --dirname="${BASEPATH}/"
|
||||
|
||||
else
|
||||
# normal mode should be quiet
|
||||
java -classpath "${BASEPATH}/rhino/js.jar" ${CMD} -modules "${URLPATH}/node_modules" -modules "${URLPATH}/rhino" -modules "${URLPATH}/lib" -modules "${URLPATH}" "${BASEPATH}/jsdoc.js" "$@" --dirname="${BASEPATH}/"
|
||||
fi
|
||||
Reference in New Issue
Block a user