From c15b1841aef58870c210e07c03204c082ba962e4 Mon Sep 17 00:00:00 2001 From: bnu Date: Tue, 7 Jul 2015 18:03:49 +0900 Subject: [PATCH 1/5] MINIFY --- Gruntfile.js | 2 -- addons/captcha/captcha.min.js | 2 +- addons/captcha_member/captcha.min.js | 2 +- addons/oembed/jquery.oembed.min.js | 2 +- addons/oembed/oembed.min.js | 2 +- addons/resize_image/js/resize_image.min.js | 2 +- common/js/plugins/handlebars/handlebars.min.js | 4 ++-- common/js/plugins/jquery.fileupload/js/main.min.js | 2 +- common/js/x.min.js | 2 +- common/js/xe.min.js | 4 ++-- layouts/xedition/css/layout.min.css | 1 + layouts/xedition/css/welcome.min.css | 1 + layouts/xedition/css/widget.login.min.css | 2 +- layouts/xedition/css/xeicon.min.css | 1 + layouts/xedition/js/layout.min.js | 1 + layouts/xedition/js/welcome.min.js | 1 + modules/admin/tpl/js/admin.min.js | 4 ++-- modules/admin/tpl/js/config.min.js | 2 +- modules/admin/tpl/js/menu_setup.min.js | 2 +- modules/board/tpl/js/board_admin.min.js | 2 +- .../editor/components/image_gallery/tpl/gallery.min.js | 2 +- modules/editor/components/image_gallery/tpl/popup.min.js | 2 +- modules/editor/skins/xpresseditor/js/xpresseditor.min.js | 8 ++++---- modules/editor/tpl/js/editor.app.min.js | 2 +- modules/editor/tpl/js/editor.min.js | 2 +- modules/editor/tpl/js/swfupload.min.js | 2 +- modules/editor/tpl/js/uploader.min.js | 2 +- modules/importer/tpl/js/importer_admin.min.js | 2 +- modules/poll/tpl/js/poll_admin.min.js | 2 +- modules/widget/tpl/js/generate_code.min.js | 2 +- modules/widget/tpl/js/widget.min.js | 2 +- modules/widget/tpl/js/widget_admin.min.js | 2 +- 32 files changed, 37 insertions(+), 34 deletions(-) create mode 100644 layouts/xedition/css/layout.min.css create mode 100644 layouts/xedition/css/welcome.min.css create mode 100644 layouts/xedition/css/xeicon.min.css create mode 100644 layouts/xedition/js/layout.min.js create mode 100644 layouts/xedition/js/welcome.min.js diff --git a/Gruntfile.js b/Gruntfile.js index c2195afea..8c46bc8ee 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -112,7 +112,6 @@ module.exports = function(grunt) { }, 'layout': { files: { - 'layouts/xedition/js/jquery.easing.min.js': ['layouts/xedition/js/jquery.easing.js'], 'layouts/xedition/js/layout.min.js': ['layouts/xedition/js/layout.js'], 'layouts/xedition/js/welcome.min.js': ['layouts/xedition/js/welcome.js'], } @@ -148,7 +147,6 @@ module.exports = function(grunt) { }, 'layout': { files: { - 'layouts/xedition/css/camera.min.css': ['layouts/xedition/css/camera.css'], 'layouts/xedition/css/layout.min.css': ['layouts/xedition/css/layout.css'], 'layouts/xedition/css/webfont.min.css': ['layouts/xedition/css/webfont.css'], 'layouts/xedition/css/welcome.min.css': ['layouts/xedition/css/welcome.css'], diff --git a/addons/captcha/captcha.min.js b/addons/captcha/captcha.min.js index b22dc0a66..fd05f65fe 100644 --- a/addons/captcha/captcha.min.js +++ b/addons/captcha/captcha.min.js @@ -1 +1 @@ -var calledArgs=null;!function(a){a(function(){function b(){a("form").each(function(b){var d=!1;if(!a(this).attr("onsubmit")||a(this).attr("onsubmit").indexOf("procFilter")<0)for(var e=a(this).find("input[name=act]").val(),b=0;b'),a(this).find("input[name=error_return_url]")||a(this).append(''),a(this).submit(function(b){if(a(this).find("input[name=secret_text]").val())return!0;b.preventDefault();var d=this;a("#captcha_layer form").submit(function(b){return b.preventDefault(),a("#secret_text").val()?(a(d).append(''),void a(d).submit()):(a(this).find("input[type=text]").val("").focus(),!1)});var e=new Array;e.captcha_action="setCaptchaSession",e.mid=current_mid,window.oldExecXml("","",e,c.show,new Array("error","message","about_captcha","captcha_reload","captcha_play","cmd_input","cmd_cancel"))}))});a(document.body);if(!c){var b=-1!=navigator.appVersion.indexOf("MSIE")?!0:!1,d=-1!=navigator.appVersion.toLowerCase().indexOf("win")?!0:!1,e=-1!=navigator.userAgent.indexOf("Opera")?!0:!1,f=request_uri+"addons/captcha/swf/play.swf";b&&d&&!e?(_object_='',_object_+='',_object_+='',_object_+='',_object_+='',_object_+='',_object_+='',_object_+=""):_object_='',c=a('