Permalink
Browse files

use bower for dependencies

  • Loading branch information...
luto committed Oct 31, 2014
1 parent b11c4d6 commit c2c27e51e0ad0f2e30e7afc93a2fffac70eee580
Showing with 59 additions and 99 deletions.
  1. +4 −0 .bowerrc
  2. +4 −1 .gitignore
  3. +0 −59 Gruntfile.js
  4. +11 −0 bower.json
  5. +0 −1 package.json
  6. +40 −38 src/index.html
View
@@ -0,0 +1,4 @@
+{
+ "directory" : "src/vendor"
+}
+
View
@@ -20,5 +20,8 @@ src/app/help/complex_help.html
# Generated HTML doc
doc/jsdoc
-# Libs
+# old lib path
src/lib
+
+# new lib path
+src/vendor
View
@@ -2,63 +2,6 @@ module.exports = function(grunt) {
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
- 'curl-dir': {
- 'src/lib/js': [
- 'http://code.jquery.com/jquery-1.10.2.min.js',
- 'http://code.jquery.com/qunit/qunit-1.12.0.js',
- 'https://raw.github.com/AStepaniuk/qunit-parameterize/master/qunit-parameterize.js',
- 'https://raw.github.com/alex-seville/blanket/master/dist/qunit/blanket.min.js',
- 'http://netdna.bootstrapcdn.com/bootstrap/3.0.2/js/bootstrap.min.js',
- 'https://raw.github.com/marijnh/CodeMirror/master/lib/codemirror.js'
-
- ],
- 'src/lib/css': [
- 'http://code.jquery.com/qunit/qunit-1.12.0.css',
- 'http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css',
- 'http://netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/lib/codemirror.css'
- ],
- 'src/lib/fonts': [
- 'http://netdna.bootstrapcdn.com/font-awesome/4.0.3/fonts/fontawesome-webfont.eot',
- 'http://netdna.bootstrapcdn.com/font-awesome/4.0.3/fonts/fontawesome-webfont.svg',
- 'http://netdna.bootstrapcdn.com/font-awesome/4.0.3/fonts/fontawesome-webfont.woff'
- ],
- 'src/lib/themes': [
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/3024-day.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/3024-night.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/ambiance.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/base16-dark.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/base16-light.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/blackboard.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/cobalt.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/eclipse.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/elegant.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/midnight.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/monokai.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/neat.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/night.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/paraiso-dark.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/paraiso-light.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/rubyblue.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/solarized.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/the-matrix.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/tomorrow-night-eighties.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/twilight.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/vibrant-ink.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/xq-dark.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/theme/xq-light.css'
- ],
- 'src/lib/addon': [
- 'https://raw.github.com/marijnh/CodeMirror/master/addon/hint/show-hint.js',
- 'https://raw.github.com/marijnh/CodeMirror/master/addon/hint/show-hint.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/addon/lint/lint.js',
- 'https://raw.github.com/marijnh/CodeMirror/master/addon/lint/lint.css',
- 'https://raw.github.com/marijnh/CodeMirror/master/addon/search/search.js',
- 'https://raw.github.com/marijnh/CodeMirror/master/addon/search/searchcursor.js',
- 'https://raw.github.com/marijnh/CodeMirror/master/addon/dialog/dialog.js',
- 'https://raw.github.com/marijnh/CodeMirror/master/addon/dialog/dialog.css'
- ]
- },
doctool: {
commandsjs: {
converter: "commandsjs",
@@ -107,14 +50,12 @@ module.exports = function(grunt) {
}
});
- grunt.loadNpmTasks('grunt-curl');
grunt.loadNpmTasks('grunt-doctool');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-jsdoc');
grunt.registerTask('default', [ ]);
- grunt.registerTask('deps', [ 'curl-dir' ]);
grunt.registerTask('commands', [ 'doctool' ]);
grunt.registerTask('watchcommands', [ 'watch:commands' ]);
grunt.registerTask('http', [ 'connect' ]);
View
@@ -0,0 +1,11 @@
+{
+ "name": "yasp",
+ "private": true,
+ "dependencies": {
+ "bootstrap": "3.0.2",
+ "codemirror": "4.7.0",
+ "fontawesome": "4.0.3",
+ "qunit": "1.12.0",
+ "jquery": "1.10.2"
+ }
+}
View
@@ -7,7 +7,6 @@
"grunt-contrib-watch": "~0.5.3",
"grunt-http-server": "0.0.2",
"grunt-jsdoc": "~0.5.1",
- "grunt-curl": "~1.1.1",
"grunt-contrib-connect": "~0.6.0"
}
}
View
@@ -11,54 +11,56 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Styles -->
- <link rel="stylesheet" href="lib/css/bootstrap.min.css">
- <link rel="stylesheet" href="lib/css/codemirror.css">
- <link rel="stylesheet" href="lib/css/font-awesome.css">
+ <link rel="stylesheet" href="vendor/bootstrap/dist/css/bootstrap.min.css">
+ <link rel="stylesheet" href="vendor/codemirror/lib/codemirror.css">
+ <link rel="stylesheet" href="vendor/fontawesome/css/font-awesome.min.css">
<link rel="stylesheet" href="app/css/main.css">
<link rel="stylesheet" href="app/css/editor.css">
<link rel="stylesheet" href="app/css/doctool.css">
<link rel="stylesheet" href="app/css/debugger.css">
<!-- Themes -->
- <link rel="stylesheet" href="lib/themes/3024-day.css">
- <link rel="stylesheet" href="lib/themes/3024-night.css">
- <link rel="stylesheet" href="lib/themes/ambiance.css">
- <link rel="stylesheet" href="lib/themes/base16-dark.css">
- <link rel="stylesheet" href="lib/themes/base16-light.css">
- <link rel="stylesheet" href="lib/themes/blackboard.css">
- <link rel="stylesheet" href="lib/themes/cobalt.css">
- <link rel="stylesheet" href="lib/themes/eclipse.css">
- <link rel="stylesheet" href="lib/themes/elegant.css">
- <link rel="stylesheet" href="lib/themes/midnight.css">
- <link rel="stylesheet" href="lib/themes/monokai.css">
- <link rel="stylesheet" href="lib/themes/neat.css">
- <link rel="stylesheet" href="lib/themes/night.css">
- <link rel="stylesheet" href="lib/themes/paraiso-dark.css">
- <link rel="stylesheet" href="lib/themes/paraiso-light.css">
- <link rel="stylesheet" href="lib/themes/rubyblue.css">
- <link rel="stylesheet" href="lib/themes/solarized.css">
- <link rel="stylesheet" href="lib/themes/the-matrix.css">
- <link rel="stylesheet" href="lib/themes/tomorrow-night-eighties.css">
- <link rel="stylesheet" href="lib/themes/twilight.css">
- <link rel="stylesheet" href="lib/themes/vibrant-ink.css">
- <link rel="stylesheet" href="lib/themes/xq-dark.css">
- <link rel="stylesheet" href="lib/themes/xq-light.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/3024-day.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/3024-night.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/ambiance.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/base16-dark.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/base16-light.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/blackboard.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/cobalt.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/eclipse.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/elegant.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/midnight.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/monokai.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/neat.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/night.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/paraiso-dark.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/paraiso-light.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/rubyblue.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/solarized.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/the-matrix.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/tomorrow-night-eighties.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/twilight.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/vibrant-ink.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/xq-dark.css">
+ <link rel="stylesheet" href="vendor/codemirror/theme/xq-light.css">
+
+ <!-- CodeMirror AddOns -->
+ <link rel="stylesheet" href="vendor/codemirror/addon/hint/show-hint.css">
+ <link rel="stylesheet" href="vendor/codemirror/addon/lint/lint.css">
+ <link rel="stylesheet" href="vendor/codemirror/addon/dialog/dialog.css">
<!-- Libraries -->
- <script src="lib/js/jquery-1.10.2.min.js"></script>
- <script src="lib/js/bootstrap.min.js"></script>
- <script src="lib/js/codemirror.js"></script>
-
+ <script src="vendor/jquery/jquery.min.js"></script>
+ <script src="vendor/bootstrap/dist/js/bootstrap.min.js"></script>
+ <script src="vendor/codemirror/lib/codemirror.js"></script>
+
<!-- CodeMirror AddOns -->
- <script src="lib/addon/show-hint.js"></script>
- <link rel="stylesheet" href="lib/addon/show-hint.css">
- <script src="lib/addon/lint.js"></script>
- <link rel="stylesheet" href="lib/addon/lint.css">
- <script src="lib/addon/searchcursor.js"></script>
- <script src="lib/addon/search.js"></script>
- <script src="lib/addon/dialog.js"></script>
- <link rel="stylesheet" href="lib/addon/dialog.css">
+ <script src="vendor/codemirror/addon/hint/show-hint.js"></script>
+ <script src="vendor/codemirror/addon/lint/lint.js"></script>
+ <script src="vendor/codemirror/addon/search/searchcursor.js"></script>
+ <script src="vendor/codemirror/addon/search/search.js"></script>
+ <script src="vendor/codemirror/addon/dialog/dialog.js"></script>
</head>
<body>
<!-- toolbar -->

0 comments on commit c2c27e5

Please sign in to comment.