diff --git a/.gitignore b/.gitignore index 096504c57f..400c39629a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,5 @@ UserInterfaceState.xcuserstate bower_components/ components/ tmp +temp dist diff --git a/README.md b/README.md index 2181ca6ba7..dcd56dc078 100644 --- a/README.md +++ b/README.md @@ -102,10 +102,10 @@ For most cases, you'll need AngularJS as well. This is bundled in `js/angular/` ### Documentation * To test documentation, follow these steps: - 1. Clone ionic-site to `./tmp/ionic-site` - this is where the `gulp docs` task builds to. `./tmp` is the folder that travis uses to do all of its tasks. - - `mkdir tmp && git clone git@github.com:driftyco/ionic-site tmp/ionic-site` + 1. Clone ionic-site to `./temp/ionic-site` - this is where the `gulp docs` task builds to. `./temp` is the folder that travis uses to do all of its tasks. + - `mkdir temp && git clone git@github.com:driftyco/ionic-site temp/ionic-site` 2. Make jekyll rebuild whenever you change the site. - - `cd tmp/ionic-site && jekyll serve -w` + - `cd temp/ionic-site && jekyll serve -w` 3. Go back to project root and build the docs - `gulp docs` 4. Open localhost:4000 and see your changes! Re-run `gulp docs` again whenever you change something, and jekyll will update the site. diff --git a/docs/docs.config.js b/docs/docs.config.js index b157d6d847..437c87c9d3 100644 --- a/docs/docs.config.js +++ b/docs/docs.config.js @@ -19,13 +19,13 @@ module.exports = function(config) { config.set('basePath', __dirname); config.set('source.projectPath', '.'); - config.set('rendering.outputFolder', '../tmp/ionic-site'); + config.set('rendering.outputFolder', '../temp/ionic-site'); var versionData = require('./generate-versions')(config); config.set('versionData', versionData); config.set('rendering.contentsFolder', path.join('docs', versionData.current.folder)); - config.set('demos.outputFolder', path.join(__dirname, '../tmp/ionic-demo')); + config.set('demos.outputFolder', path.join(__dirname, '../temp/ionic-demo')); config.set('processing.api-docs', { outputPath: 'api/${docType}/${name}/index.md', diff --git a/docs/processors/demos.js b/docs/processors/demos.js index 2139160d6e..0c627b35dd 100644 --- a/docs/processors/demos.js +++ b/docs/processors/demos.js @@ -14,6 +14,7 @@ module.exports = { contentsFolder = config.get('rendering.contentsFolder'); }, process: function(docs, config, extraData) { + //Disable demos for now if(1) return; var demoTags = [ 'javascript', diff --git a/docs/templates/demo_script.template.js b/docs/templates/demo_script.template.js index 420a5b139f..2442673488 100644 --- a/docs/templates/demo_script.template.js +++ b/docs/templates/demo_script.template.js @@ -27,7 +27,7 @@ angular.module(<@ if doc.demoData @>'<$ doc.demoData.module $>' }, document.querySelector('.demo-footer')); $scope.demoScratch = function(demo) { - var form = angular.element('