From cd378317639c7b0ab135032657a497af497cecb2 Mon Sep 17 00:00:00 2001 From: liaoxuezhi Date: Thu, 20 Feb 2014 18:16:50 +0800 Subject: [PATCH 1/2] change later to setTimeout --- src/widget/dialog/dialog.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widget/dialog/dialog.js b/src/widget/dialog/dialog.js index c898956a..3c3fc15b 100644 --- a/src/widget/dialog/dialog.js +++ b/src/widget/dialog/dialog.js @@ -239,7 +239,7 @@ /input|textarea|select/i.test(document.activeElement.tagName)){ document.body.scrollLeft = 0; - $.later(action, 200);//do it later in 200ms. + setTimeout(action, 200);//do it later in 200ms. } else { action();//do it now @@ -353,7 +353,7 @@ * @param {Event} e gmu.Event对象 * @description 在弹出框关闭之后触发 */ - + /** * @event destroy * @param {Event} e gmu.Event对象 From 577476d1e5d3c26df36b8ac31b5450690e028bbe Mon Sep 17 00:00:00 2001 From: liaoxuezhi Date: Wed, 5 Mar 2014 16:10:13 +0800 Subject: [PATCH 2/2] fix copy images issue --- tasks/concat.js | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tasks/concat.js b/tasks/concat.js index 00f2bf96..a1c48a39 100644 --- a/tasks/concat.js +++ b/tasks/concat.js @@ -1,7 +1,7 @@ module.exports = function( grunt ) { var path = require( 'path' ), file = grunt.file; - + function concatComponents( opts, f, theme, models ) { if (typeof theme !== 'string') { @@ -74,7 +74,7 @@ module.exports = function( grunt ) { obj.structor && arr.push(readText(cssPrefix + obj.structor)) && cssFiles.push(obj.structor); - theme && obj[theme] && + theme && obj[theme] && arr.push(readText(cssPrefix + obj[theme])) && cssFiles.push(obj[theme]); @@ -89,8 +89,8 @@ module.exports = function( grunt ) { url = matches[i].match( /url\(((['"]?)(?!data)([^'"\n\r]+?)\2)\)/i)[3]; - images[url] = path.resolve(cssPrefix + - path.dirname(obj.structor || obj[theme]) + + images[url] = path.resolve(cssPrefix + + path.dirname(obj.structor || obj[theme]) + path.sep + url); } } @@ -141,7 +141,7 @@ module.exports = function( grunt ) { banner = opts.banner; dest = f.dest; - file.write(dest, + file.write(dest, banner.replace(/@files/ig, jsFiles.join(', ')) + '\n' + js.join(opts.separator)); grunt.log.writeln('✓ 生成 %s - %s ', dest, String(caculateSize(dest)).green ); @@ -156,7 +156,7 @@ module.exports = function( grunt ) { renderedImages = {}; for (image in images) { - + if( images.hasOwnProperty( image ) ) { newName = path.basename(image); @@ -171,17 +171,19 @@ module.exports = function( grunt ) { } renderedImages[newName] = images[image]; - file.write(destDir + 'images/' + newName, - file.read(images[image])); + file.write(destDir + 'images/' + newName, + file.read(images[image], { + encoding: null + })); - css = strReplace('\\((\'|")?' + - image.replace(/\./g, '\\.') + '\\1\\)', + css = strReplace('\\((\'|")?' + + image.replace(/\./g, '\\.') + '\\1\\)', '(./images/' + newName + ')', css); } } dest = dest.replace(/\.js$/, '.css'); - file.write(dest, + file.write(dest, banner.replace(/@files/g, cssFiles.join(', ')) + '\n' + css ); grunt.log.writeln('✓ 生成 %s - %s ', dest, String(caculateSize(dest)).green); }