From f56125d94efba462869f09064dfa39aa780b8016 Mon Sep 17 00:00:00 2001 From: Matias Niemelä Date: Tue, 4 Jun 2013 19:05:50 -0400 Subject: chore(ngdocs): setup bower as the package manager for the docs pages --- .gitignore | 1 + Gruntfile.js | 33 +- angularFiles.js | 6 +- bower.json | 10 + .../angular-bootstrap/bootstrap-prettify.js | 290 + docs/components/angular-bootstrap/bootstrap.js | 212 + docs/components/bootstrap/bootstrap-prettify.js | 290 - docs/components/bootstrap/bootstrap.js | 212 - docs/components/bootstrap/css/bootstrap.css | 3990 --------- .../bootstrap/google-prettify/prettify.css | 30 - .../bootstrap/google-prettify/prettify.js | 1538 ---- docs/content/misc/contribute.ngdoc | 11 +- docs/src/gen-docs.js | 19 +- docs/src/templates/css/bootstrap.min.css | 689 -- docs/src/templates/css/docs.css | 5 - docs/src/templates/css/font-awesome.css | 540 -- docs/src/templates/css/prettify.css | 51 + docs/src/templates/font/FontAwesome.otf | Bin 48748 -> 0 bytes docs/src/templates/font/fontawesome-webfont.eot | Bin 25395 -> 0 bytes docs/src/templates/font/fontawesome-webfont.svg | 284 - docs/src/templates/font/fontawesome-webfont.svgz | Bin 21845 -> 0 bytes docs/src/templates/font/fontawesome-webfont.ttf | Bin 55096 -> 0 bytes docs/src/templates/font/fontawesome-webfont.woff | Bin 29380 -> 0 bytes docs/src/templates/index.html | 12 +- docs/src/templates/js/jquery.js | 1 - docs/src/templates/js/jquery.min.js | 1 - docs/src/templates/js/lunr.js | 1560 ---- docs/src/writer.js | 8 +- lib/jquery/jquery.js | 9440 -------------------- lib/jquery/jquery.min.js | 2 - lib/jquery/version.txt | 1 - package.json | 2 + 32 files changed, 624 insertions(+), 18614 deletions(-) create mode 100644 bower.json create mode 100644 docs/components/angular-bootstrap/bootstrap-prettify.js create mode 100644 docs/components/angular-bootstrap/bootstrap.js delete mode 100644 docs/components/bootstrap/bootstrap-prettify.js delete mode 100644 docs/components/bootstrap/bootstrap.js delete mode 100644 docs/components/bootstrap/css/bootstrap.css delete mode 100644 docs/components/bootstrap/google-prettify/prettify.css delete mode 100644 docs/components/bootstrap/google-prettify/prettify.js delete mode 100644 docs/src/templates/css/bootstrap.min.css delete mode 100755 docs/src/templates/css/font-awesome.css create mode 100644 docs/src/templates/css/prettify.css delete mode 100755 docs/src/templates/font/FontAwesome.otf delete mode 100755 docs/src/templates/font/fontawesome-webfont.eot delete mode 100755 docs/src/templates/font/fontawesome-webfont.svg delete mode 100755 docs/src/templates/font/fontawesome-webfont.svgz delete mode 100755 docs/src/templates/font/fontawesome-webfont.ttf delete mode 100755 docs/src/templates/font/fontawesome-webfont.woff delete mode 120000 docs/src/templates/js/jquery.js delete mode 120000 docs/src/templates/js/jquery.min.js delete mode 100644 docs/src/templates/js/lunr.js delete mode 100644 lib/jquery/jquery.js delete mode 100644 lib/jquery/jquery.min.js delete mode 100644 lib/jquery/version.txt diff --git a/.gitignore b/.gitignore index 3142dc3b..b455fd8e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,6 @@ performance/temp*.html *~ angular.js.tmproj node_modules +components angular.xcodeproj .idea diff --git a/Gruntfile.js b/Gruntfile.js index c20b1ea0..f0cb8ebc 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,6 +7,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-connect'); grunt.loadNpmTasks('grunt-contrib-compress'); + grunt.loadNpmTasks('grunt-shell'); grunt.loadTasks('lib/grunt'); var NG_VERSION = util.getVersion(); @@ -63,11 +64,21 @@ module.exports = function(grunt) { clean: {build: ['build']}, + shell: { + bower: { + command: './node_modules/bower/bin/bower install', + options: { + stdout: false + } + } + }, + + build: { scenario: { dest: 'build/angular-scenario.js', src: [ - 'lib/jquery/jquery.js', + 'components/jquery/jquery.js', util.wrap([files['angularSrc'], files['angularScenario']], 'ngScenario/angular') ], styles: { @@ -124,18 +135,6 @@ module.exports = function(grunt) { cookies: { dest: 'build/angular-cookies.js', src: util.wrap(['src/ngCookies/cookies.js'], 'module') - }, - bootstrap: { - dest: 'build/docs/components/angular-bootstrap.js', - src: util.wrap(['docs/components/bootstrap/bootstrap.js'], 'module') - }, - bootstrapPrettify: { - dest: 'build/docs/components/angular-bootstrap-prettify.js', - src: util.wrap(['docs/components/bootstrap/bootstrap-prettify.js', 'docs/components/bootstrap/google-prettify/prettify.js'], 'module'), - styles: { - css: ['docs/components/bootstrap/google-prettify/prettify.css'], - minify: true - } } }, @@ -147,9 +146,7 @@ module.exports = function(grunt) { mobile: 'build/angular-mobile.js', resource: 'build/angular-resource.js', route: 'build/angular-route.js', - sanitize: 'build/angular-sanitize.js', - bootstrap: 'build/docs/components/angular-bootstrap.js', - bootstrapPrettify: 'build/docs/components/angular-bootstrap-prettify.js', + sanitize: 'build/angular-sanitize.js' }, @@ -184,9 +181,9 @@ module.exports = function(grunt) { //alias tasks grunt.registerTask('test:unit', ['test:jqlite', 'test:jquery', 'test:modules']); - grunt.registerTask('minify', ['clean', 'build', 'minall']); + grunt.registerTask('minify', ['shell:bower','clean', 'build', 'minall']); grunt.registerTask('test:e2e', ['connect:testserver', 'test:end2end']); grunt.registerTask('webserver', ['connect:devserver']); - grunt.registerTask('package', ['clean', 'buildall', 'minall', 'docs', 'copy', 'write', 'compress']); + grunt.registerTask('package', ['shell:bower','clean', 'buildall', 'minall', 'docs', 'copy', 'write', 'compress']); grunt.registerTask('default', ['package']); }; diff --git a/angularFiles.js b/angularFiles.js index db672383..d200ccde 100755 --- a/angularFiles.js +++ b/angularFiles.js @@ -79,7 +79,7 @@ angularFiles = { 'src/ngMobile/directive/ngClick.js', 'src/ngMobile/directive/ngSwipe.js', - 'docs/components/bootstrap/bootstrap.js' + 'docs/components/angular-bootstrap/bootstrap.js' ], 'angularScenario': [ @@ -120,7 +120,7 @@ angularFiles = { 'jstd': [ 'lib/jasmine/jasmine.js', 'lib/jasmine-jstd-adapter/JasmineAdapter.js', - 'lib/jquery/jquery.js', + 'components/jquery/jquery.js', 'test/jquery_remove.js', '@angularSrc', 'src/publishExternalApis.js', @@ -180,7 +180,7 @@ angularFiles = { 'jstdJquery': [ 'lib/jasmine/jasmine.js', 'lib/jasmine-jstd-adapter/JasmineAdapter.js', - 'lib/jquery/jquery.js', + 'components/jquery/jquery.js', 'test/jquery_alias.js', '@angularSrc', 'src/publishExternalApis.js', diff --git a/bower.json b/bower.json new file mode 100644 index 00000000..eff3df32 --- /dev/null +++ b/bower.json @@ -0,0 +1,10 @@ +{ + "name": "AngularJS", + "devDependencies": { + "jquery": "git://github.com/components/jquery.git#v1.8.3", + "lunr.js": "0.3.1", + "google-code-prettify": "1.0.0", + "components-font-awesome": "3.1.0", + "bootstrap": "https://raw.github.com/twitter/bootstrap/v2.0.2/docs/assets/bootstrap.zip" + } +} diff --git a/docs/components/angular-bootstrap/bootstrap-prettify.js b/docs/components/angular-bootstrap/bootstrap-prettify.js new file mode 100644 index 00000000..cbe7b53f --- /dev/null +++ b/docs/components/angular-bootstrap/bootstrap-prettify.js @@ -0,0 +1,290 @@ +'use strict'; + +var directive = {}; +var service = { value: {} }; + +var DEPENDENCIES = { + 'angular.js': 'http://code.angularjs.org/' + angular.version.full + '/angular.min.js', + 'angular-resource.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-resource.min.js', + 'angular-route.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-route.min.js', + 'angular-sanitize.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-sanitize.min.js', + 'angular-cookies.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-cookies.min.js' +}; + + +function escape(text) { + return text. + replace(/\&/g, '&'). + replace(/\/g, '>'). + replace(/"/g, '"'); +} + +/** + * http://stackoverflow.com/questions/451486/pre-tag-loses-line-breaks-when-setting-innerhtml-in-ie + * http://stackoverflow.com/questions/195363/inserting-a-newline-into-a-pre-tag-ie-javascript + */ +function setHtmlIe8SafeWay(element, html) { + var newElement = angular.element('
' + html + ''); + + element.html(''); + element.append(newElement.contents()); + return element; +} + + +directive.jsFiddle = function(getEmbeddedTemplate, escape, script) { + return { + terminal: true, + link: function(scope, element, attr) { + var name = '', + stylesheet = '\n', + fields = { + html: '', + css: '', + js: '' + }; + + angular.forEach(attr.jsFiddle.split(' '), function(file, index) { + var fileType = file.split('.')[1]; + + if (fileType == 'html') { + if (index == 0) { + fields[fileType] += + '