Skip to content

更新依赖包 #548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nieg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

更新依赖包 #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
module.exports = function ( grunt ) {

var fs = require("fs"),
closureCompiler = require('google-closure-compiler'),
Util = {

jsBasePath: '_src/',
Expand Down Expand Up @@ -83,10 +84,18 @@ module.exports = function ( grunt ) {
ext: '.min.css'
}
},
closurecompiler: {
dist: {
src: disDir + '<%= pkg.name %>.js',
dest: disDir + '<%= pkg.name %>.min.js'
'closure-compiler': {
'dist': {
options: {
args: [
'--js', disDir + '<%= pkg.name %>.js',
'--js_output_file', disDir + '<%= pkg.name %>.min.js',
'--create_source_map', disDir + '<%= pkg.name %>.map',
'--language_in=ECMASCRIPT5',
'--language_out=ES5'

]
}
}
},
copy: {
Expand Down Expand Up @@ -211,14 +220,14 @@ module.exports = function ( grunt ) {
grunt.loadNpmTasks('grunt-text-replace');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-closurecompiler');
closureCompiler.grunt(grunt);
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-transcoding');
grunt.loadNpmTasks('grunt-contrib-compress');

grunt.registerTask('default', 'UEditor Mini build', function () {

var tasks = [ 'concat', 'cssmin', 'closurecompiler', 'copy:base', 'copy:'+server, 'copy:demo', 'replace:demo' ];
var tasks = [ 'concat', 'cssmin', 'closure-compiler', 'copy:base', 'copy:'+server, 'copy:demo', 'replace:demo' ];

if ( encode === 'gbk' ) {
tasks.push( 'replace:fileEncode' );
Expand Down
2 changes: 1 addition & 1 deletion _src/plugins/undo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ UM.plugins['undo'] = function () {
me.undoManger.save(true);
}
clearTimeout(saveSceneTimer);
function save(cont){
var save = function (cont){

if (cont.selection.getRange().collapsed)
cont.fireEvent('contentchange');
Expand Down
36 changes: 23 additions & 13 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{

"name": "umeditor",
"title": "umeditor",
"description": "umeditor",
Expand All @@ -9,6 +8,19 @@
"name": "f-cube @ FEX",
"url": "http://fex.baidu.com"
},
"scripts": {
"build": "npm run build-net && npm run build-asp && npm run build-jsp && npm run build-php",
"build-net": "grunt --server=net",
"build-asp": "grunt --server=asp",
"build-jsp": "grunt --server=jsp",
"build-php": "grunt --server=php",
"build-gbk": "npm run build-net-gbk && npm run build-asp-gbk && npm run build-jsp-gbk && npm run build-php-gbk",
"build-net-gbk": "grunt --encode=gbk --server=net",
"build-asp-gbk": "grunt --encode=gbk --server=asp",
"build-jsp-gbk": "grunt --encode=gbk --server=jsp",
"build-php-gbk": "grunt --encode=gbk --server=php",
"build-all": "npm run build && npm run build-gbk"
},
"repository": {
"type": "git",
"url": "https://github.com/fex-team/umeditor.git"
Expand All @@ -22,17 +34,15 @@
"bugs": {
"url": "https://github.com/fex-team/umeditor/issues"
},
"dependencies": {
"grunt": "~0.4.1",
"grunt-contrib-concat": "~0.3.0",
"grunt-contrib-cssmin": "~0.6.0",
"grunt-closurecompiler": "~0.9.9",
"grunt-contrib-copy": "~0.4.0",
"grunt-transcoding": "~0.1.1",
"grunt-text-replace": "~0.3.9",
"grunt-contrib-compress": "~0.7.0"
},
"dependencies": {},
"devDependencies": {
"grunt": "~0.4.1"
"google-closure-compiler": "^20180204.0.0",
"grunt": "^1.0.2",
"grunt-contrib-compress": "^1.4.3",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-cssmin": "^2.2.1",
"grunt-text-replace": "^0.4.0",
"grunt-transcoding": "^0.1.3"
}
}
}