Skip to content

Commit

Permalink
upgrade to v2.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
farthinker committed Oct 14, 2014
1 parent 0c289c0 commit 9b4a32b
Show file tree
Hide file tree
Showing 64 changed files with 10,514 additions and 19,229 deletions.
3 changes: 1 addition & 2 deletions Gemfile
@@ -1,6 +1,5 @@
source 'http://ruby.taobao.org'

gem 'github-pages'
gem 'sass'
gem 'coffee-script'
gem 'sass', '>= 3.4.0'

152 changes: 75 additions & 77 deletions Gruntfile.coffee
Expand Up @@ -4,43 +4,45 @@ module.exports = (grunt) ->

pkg: grunt.file.readJSON 'package.json'

concat:
coffee:
simditor:
src: [
'src/selection.coffee',
'src/formatter.coffee',
'src/inputManager.coffee',
'src/keystroke.coffee',
'src/undoManager.coffee',
'src/util.coffee',
'src/toolbar.coffee',
'src/core.coffee',
'src/buttons/button.coffee',
'src/buttons/popover.coffee',
'src/buttons/title.coffee',
'src/buttons/bold.coffee',
'src/buttons/italic.coffee',
'src/buttons/underline.coffee',
'src/buttons/color.coffee',
'src/buttons/list.coffee',
'src/buttons/blockquote.coffee',
'src/buttons/code.coffee',
'src/buttons/link.coffee',
'src/buttons/image.coffee',
'src/buttons/indent.coffee',
'src/buttons/outdent.coffee',
'src/buttons/hr.coffee',
'src/buttons/table.coffee',
'src/buttons/strikethrough.coffee'
]
dest: 'src/simditor.coffee'
all:
src: [
'vendor/bower/simple-module/lib/module.js',
'vendor/bower/simple-uploader/lib/uploader.js',
'lib/simditor.js'
]
dest: 'lib/simditor-all.js'
options:
bare: true
files:
'lib/simditor.js': [
'src/selection.coffee',
'src/formatter.coffee',
'src/inputManager.coffee',
'src/keystroke.coffee',
'src/undoManager.coffee',
'src/util.coffee',
'src/toolbar.coffee',
'src/core.coffee',
'src/i18n.coffee',
'src/buttons/button.coffee',
'src/buttons/popover.coffee',
'src/buttons/title.coffee',
'src/buttons/bold.coffee',
'src/buttons/italic.coffee',
'src/buttons/underline.coffee',
'src/buttons/color.coffee',
'src/buttons/list.coffee',
'src/buttons/blockquote.coffee',
'src/buttons/code.coffee',
'src/buttons/link.coffee',
'src/buttons/image.coffee',
'src/buttons/indent.coffee',
'src/buttons/outdent.coffee',
'src/buttons/hr.coffee',
'src/buttons/table.coffee',
'src/buttons/strikethrough.coffee'
]
site:
expand: true
flatten: true
src: 'site/assets/_coffee/*.coffee'
dest: 'site/assets/scripts/'
ext: '.js'

sass:
simditor:
Expand All @@ -59,19 +61,23 @@ module.exports = (grunt) ->
'site/assets/styles/app.css': 'site/assets/_sass/app.scss'
'site/assets/styles/mobile.css': 'site/assets/_sass/mobile.scss'

coffee:
simditor:
files:
'lib/simditor.js': 'src/simditor.coffee'
site:
expand: true
flatten: true
src: 'site/assets/_coffee/*.coffee'
dest: 'site/assets/scripts/'
ext: '.js'
umd:
all:
src: 'lib/simditor.js'
template: 'umd'
amdModuleId: 'simditor'
objectToExport: 'Simditor'
globalAlias: 'Simditor'
deps:
'default': ['$', 'SimpleModule']
amd: ['jquery', 'simple-module']
cjs: ['jquery', 'simple-module']
global:
items: ['jQuery', 'SimpleModule']
prefix: ''

copy:
site:
vendor:
files: [{
src: 'vendor/bower/jquery/dist/jquery.min.js',
dest: 'site/assets/scripts/jquery.min.js'
Expand All @@ -83,25 +89,23 @@ module.exports = (grunt) ->
flatten: true,
src: 'vendor/bower/fontawesome/fonts/*',
dest: 'site/assets/fonts/'
}, {
src: 'styles/simditor.css',
dest: 'site/assets/styles/simditor.css'
}, {
src: 'lib/simditor-all.js',
dest: 'site/assets/scripts/simditor-all.js'
}]

styles:
files: [{
src: 'styles/simditor.css',
dest: 'site/assets/styles/simditor.css'
}]
scripts:
files: [{
src: 'lib/simditor-all.js',
dest: 'site/assets/scripts/simditor-all.js'
src: 'vendor/bower/simple-module/lib/module.js',
dest: 'site/assets/scripts/module.js'
}, {
src: 'vendor/bower/simple-uploader/lib/uploader.js',
dest: 'site/assets/scripts/uploader.js'
}, {
src: 'lib/simditor.js',
dest: 'site/assets/scripts/simditor.js'
}]

package:
files: [{
expand: true,
Expand All @@ -117,15 +121,6 @@ module.exports = (grunt) ->
}, {
src: 'vendor/bower/simple-uploader/lib/uploader.js',
dest: 'package/scripts/js/uploader.js'
}, {
src: 'src/simditor.coffee',
dest: 'package/scripts/coffee/simditor.coffee'
}, {
src: 'vendor/bower/simple-module/src/module.coffee',
dest: 'package/scripts/coffee/module.coffee'
}, {
src: 'vendor/bower/simple-uploader/src/uploader.coffee',
dest: 'package/scripts/coffee/uploader.coffee'
}, {
expand: true,
flatten: true
Expand All @@ -150,23 +145,25 @@ module.exports = (grunt) ->
watch:
styles:
files: ['styles/*.scss']
tasks: ['sass:simditor', 'copy:styles', 'shell']
tasks: ['sass:simditor', 'copy:styles', 'jekyll']
scripts:
files: ['src/*.coffee', 'src/buttons/*.coffee']
tasks: ['concat:simditor', 'coffee:simditor', 'concat:all', 'copy:site', 'shell']
tasks: ['coffee:simditor', 'umd', 'copy:scripts', 'jekyll']
siteStyles:
files: ['site/assets/_sass/*.scss']
tasks: ['sass:site', 'shell']
siteScripts:
files: ['site/assets/_coffee/*.coffee']
tasks: ['coffee:site', 'shell']
tasks: ['coffee:site', 'jekyll']
jekyll:
files: ['site/**/*.html', 'site/**/*.md', 'site/**/*.yml']
tasks: ['shell']
tasks: ['jekyll']

shell:
jekyll:
command: 'bundle exec jekyll build'
jekyll:
site:
options:
bundleExec: true
config: 'jekyll.yml'

express:
server:
Expand All @@ -177,7 +174,8 @@ module.exports = (grunt) ->
uglify:
simditor:
files:
'package/scripts/js/simditor-all.min.js': 'package/scripts/js/simditor-all.js'
'package/scripts/js/module.min.js': 'package/scripts/js/module.js'
'package/scripts/js/uploader.min.js': 'package/scripts/js/uploader.js'
'package/scripts/js/simditor.min.js': 'package/scripts/js/simditor.js'

compress:
Expand All @@ -198,16 +196,16 @@ module.exports = (grunt) ->

grunt.loadNpmTasks 'grunt-contrib-sass'
grunt.loadNpmTasks 'grunt-contrib-coffee'
grunt.loadNpmTasks 'grunt-contrib-concat'
grunt.loadNpmTasks 'grunt-contrib-watch'
grunt.loadNpmTasks 'grunt-contrib-copy'
grunt.loadNpmTasks 'grunt-contrib-uglify'
grunt.loadNpmTasks 'grunt-contrib-compress'
grunt.loadNpmTasks 'grunt-contrib-clean'
grunt.loadNpmTasks 'grunt-umd'
grunt.loadNpmTasks 'grunt-express'
grunt.loadNpmTasks 'grunt-shell'
grunt.loadNpmTasks 'grunt-jekyll'

grunt.registerTask 'default', ['site', 'express', 'watch']
grunt.registerTask 'site', ['sass', 'concat:simditor', 'coffee', 'concat:all', 'copy:site', 'shell']
grunt.registerTask 'site', ['sass', 'coffee', 'umd', 'copy:vendor', 'copy:scripts', 'copy:styles', 'jekyll']
grunt.registerTask 'package', ['clean:package', 'copy:package', 'uglify:simditor', 'compress']

35 changes: 19 additions & 16 deletions bower.json
@@ -1,32 +1,35 @@
{
"name": "simditor",
"version": "1.0.5",
"version": "2.0.0",
"homepage": "http://simditor.tower.im/",
"authors": [
"farthinker <farthinker@gmail.com>"
],
"description": "simple rich editor",
"main": "lib/simditor-all.min.js",
"description": "A simple online editor",
"main": "lib/simditor.min.js",
"keywords": [
"editor"
],
"license": "MIT",
"ignore": [
"**/.*",
"spec",
"node_modules",
"vendor",
"site",
"_config.yml",
"Gemfile",
"Gruntfile.coffee",
"package.json",
"server.js",
"README"
"site",
"_config.yml",
"Gemfile",
"Gemfile.lock",
"Gruntfile.coffee",
"package.json",
"server.js",
"README.md",
"umd.hbs"
],
"dependencies": {
"jquery": "~2.1.0",
"fontawesome": "~4.1.0",
"simple-module": "master",
"simple-uploader": "master"
}
"dependencies": {
"jquery": "2.x",
"fontawesome": "4.x",
"simple-module": "2.x",
"simple-uploader": "2.x"
}
}
File renamed without changes.

0 comments on commit 9b4a32b

Please sign in to comment.