From 080bbcb0f71b3010c03e2fbb17d35f50f09cd6db Mon Sep 17 00:00:00 2001 From: bnu Date: Tue, 24 Feb 2015 19:16:34 +0900 Subject: [PATCH] =?UTF-8?q?grunt=20jshint=20=EC=84=A4=EC=A0=95=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gruntfile.js | 15 ++++++++------- common/js/plugins/ckeditor/xeEditor.plugin.js | 1 + modules/admin/tpl/js/admin.js | 1 + modules/editor/skins/ckeditor/editor.html | 1 + modules/editor/tpl/js/editor.app.js | 15 ++++++--------- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 2adb308a0..d30e48441 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -160,11 +160,6 @@ module.exports = function(grunt) { files: [ 'Gruntfile.js', 'common/js/*.js', - '!common/js/html5.js', - '!common/js/jquery.js', - '!common/js/x.js', - '!common/js/xe.js', - '!common/js/modernizr.js', 'modules/admin/tpl/js/*.js', 'modules/board/tpl/js/*.js', 'modules/editor/tpl/js/*.js', @@ -175,9 +170,15 @@ module.exports = function(grunt) { ignores : [ '**/jquery*.js', '**/swfupload.js', - '**/*.min.js', + '**/**.min.js', '**/*-packed.js', - '**/*.compressed.js' + '**/*.compressed.js', + '**/jquery-*.js', + '**/jquery.*.js', + 'common/js/html5.js', + 'common/js/x.js', + 'common/js/xe.js', + 'common/js/modernizr.js', ] } }, diff --git a/common/js/plugins/ckeditor/xeEditor.plugin.js b/common/js/plugins/ckeditor/xeEditor.plugin.js index 959eb32f6..b5805d038 100644 --- a/common/js/plugins/ckeditor/xeEditor.plugin.js +++ b/common/js/plugins/ckeditor/xeEditor.plugin.js @@ -1,4 +1,5 @@ (function($){ + "use strict"; var App = window.xe.getApp('xeEditorApp')[0]; var CK = window.CKEDITOR; diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js index 0c82e8620..0eee8ae5b 100644 --- a/modules/admin/tpl/js/admin.js +++ b/modules/admin/tpl/js/admin.js @@ -797,6 +797,7 @@ jQuery(function($){ }); if(typeof console == 'undefined'){ + /* jshint -W020 */ console={log:function(){}}; } diff --git a/modules/editor/skins/ckeditor/editor.html b/modules/editor/skins/ckeditor/editor.html index 0f9f052e1..1391ef828 100755 --- a/modules/editor/skins/ckeditor/editor.html +++ b/modules/editor/skins/ckeditor/editor.html @@ -26,6 +26,7 @@