Skip to content

Commit

Permalink
Switched file reader to async manner
Browse files Browse the repository at this point in the history
  • Loading branch information
@sergeche
sergeche committed Feb 10, 2013
1 parent 1d6469b commit c7fa6b6
Show file tree
Hide file tree
Showing 4 changed files with 107 additions and 76 deletions.
24 changes: 16 additions & 8 deletions javascript/actions/base64.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,23 @@ emmet.exec(function(require, _) {
throw "Can't find " + imgPath + ' file';
}

var b64 = require('base64').encode(String(file.read(realImgPath)));
if (!b64) {
throw "Can't encode file content to base64";
}

b64 = 'data:' + (actionUtils.mimeTypes[String(file.getExt(realImgPath))] || defaultMimeType) +
';base64,' + b64;
file.read(realImgPath, function(err, content) {
if (err) {
throw 'Unable to read ' + realImgPath + ': ' + err;
}

editor.replaceContent('$0' + b64, pos, pos + imgPath.length);
var b64 = require('base64').encode(String(content));
if (!b64) {
throw "Can't encode file content to base64";
}

b64 = 'data:' + (actionUtils.mimeTypes[String(file.getExt(realImgPath))] || defaultMimeType) +
';base64,' + b64;

editor.replaceContent('$0' + b64, pos, pos + imgPath.length);
});


return true;
}

Expand Down
85 changes: 44 additions & 41 deletions javascript/actions/updateImageSize.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,19 @@ emmet.exec(function(require, _) {
var info = require('editorUtils').outputInfo(editor);
var xmlElem = require('xmlEditTree').parseFromPosition(info.content, offset, true);
if (xmlElem && (xmlElem.name() || '').toLowerCase() == 'img') {

var size = getImageSizeForSource(editor, xmlElem.value('src'));
if (size) {
var compoundData = xmlElem.range(true);
xmlElem.value('width', size.width);
xmlElem.value('height', size.height, xmlElem.indexOf('width') + 1);

return _.extend(compoundData, {
data: xmlElem.toString(),
caret: offset
});
}
getImageSizeForSource(editor, xmlElem.value('src'), function(size) {
if (size) {
var compoundData = xmlElem.range(true);
xmlElem.value('width', size.width);
xmlElem.value('height', size.height, xmlElem.indexOf('width') + 1);
require('actionUtils').compoundUpdate(editor, _.extend(compoundData, {
data: xmlElem.toString(),
caret: offset
}));
}
});
}

return null;
}

/**
Expand All @@ -49,58 +47,63 @@ emmet.exec(function(require, _) {
// check if there is property with image under caret
var prop = cssRule.itemFromPosition(offset, true), m;
if (prop && (m = /url\((["']?)(.+?)\1\)/i.exec(prop.value() || ''))) {
var size = getImageSizeForSource(editor, m[2]);
if (size) {
var compoundData = cssRule.range(true);
cssRule.value('width', size.width + 'px');
cssRule.value('height', size.height + 'px', cssRule.indexOf('width') + 1);

return _.extend(compoundData, {
data: cssRule.toString(),
caret: offset
});
}
getImageSizeForSource(editor, m[2], function(size) {
if (size) {
var compoundData = cssRule.range(true);
cssRule.value('width', size.width + 'px');
cssRule.value('height', size.height + 'px', cssRule.indexOf('width') + 1);

require('actionUtils').compoundUpdate(editor, _.extend(compoundData, {
data: cssRule.toString(),
caret: offset
}));
}
});
}
}

return null;
}

/**
* Returns image dimensions for source
* @param {IEmmetEditor} editor
* @param {String} src Image source (path or data:url)
*/
function getImageSizeForSource(editor, src) {
function getImageSizeForSource(editor, src, callback) {
var fileContent;
var au = require('actionUtils');
if (src) {
// check if it is data:url
if (/^data:/.test(src)) {
fileContent = require('base64').decode( src.replace(/^data\:.+?;.+?,/, '') );
} else {
var file = require('file');
var absPath = file.locateFile(editor.getFilePath(), src);
if (absPath === null) {
throw "Can't find " + src + ' file';
}

fileContent = String(file.read(absPath));
return callback(au.getImageSize(fileContent));
}

var file = require('file');
var absPath = file.locateFile(editor.getFilePath(), src);
if (absPath === null) {
throw "Can't find " + src + ' file';
}

return require('actionUtils').getImageSize(fileContent);
file.read(absPath, 500, function(err, content) {
if (err) {
throw 'Unable to read ' + absPath + ': ' + err;
}

content = String(content);
callback(au.getImageSize(content));
});
}
}

require('actions').add('update_image_size', function(editor) {
var result;
// this action will definitely won’t work in SASS dialect,
// but may work in SCSS or LESS
if (_.include(['css', 'less', 'scss'], String(editor.getSyntax()))) {
result = updateImageSizeCSS(editor);
updateImageSizeCSS(editor);
} else {
result = updateImageSizeHTML(editor);
updateImageSizeHTML(editor);
}

return require('actionUtils').compoundUpdate(editor, result);
return true;
});
});
6 changes: 5 additions & 1 deletion javascript/interfaces/IEmmetFile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,13 @@ IEmmetFile.prototype = {
/**
* Read file content and return it
* @param {String} path File's relative or absolute path
* @param {Number} size Number of bytes to read, optional. If not specified,
* reads full file
* @param {Function} callback Callback function invoked when reading is
* completed
* @return {String}
*/
read: function(path) {
read: function(path, size, callback) {
return '';
},

Expand Down
68 changes: 42 additions & 26 deletions javascript/loaders/bootstrap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,38 +65,54 @@ emmet.define('bootstrap', function(require, _) {
var payload = {};
var utils = require('utils');
var userSnippets = null;
var that = this;

_.each(fileList, function(f) {
switch (file.getExt(f)) {
case 'js':
try {
eval(file.read(f));
} catch (e) {
emmet.log('Unable to eval "' + f + '" file: '+ e);
var next = function() {
if (fileList.length) {
var f = fileList.shift();
file.read(f, function(err, content) {
if (err) {
emmet.log('Unable to read "' + f + '" file: '+ err);
return next();
}
break;
case 'json':
var fileName = getFileName(f).toLowerCase().replace(/\.json$/, '');
if (/^snippets/.test(fileName)) {
if (fileName === 'snippets') {
// data in snippets.json is more important to user
userSnippets = this.parseJSON(file.read(f));
} else {
payload.snippets = utils.deepMerge(payload.snippets || {}, this.parseJSON(file.read(f)));
}
} else {
payload[fileName] = file.read(f);

switch (file.getExt(f)) {
case 'js':
try {
eval(content);
} catch (e) {
emmet.log('Unable to eval "' + f + '" file: '+ e);
}
break;
case 'json':
var fileName = getFileName(f).toLowerCase().replace(/\.json$/, '');
if (/^snippets/.test(fileName)) {
if (fileName === 'snippets') {
// data in snippets.json is more important to user
userSnippets = that.parseJSON(content);
} else {
payload.snippets = utils.deepMerge(payload.snippets || {}, that.parseJSON(content));
}
} else {
payload[fileName] = content;
}

break;
}

break;
next();
});
} else {
// complete
if (userSnippets) {
payload.snippets = utils.deepMerge(payload.snippets || {}, userSnippets);
}

that.loadUserData(payload);
}
}, this);
};

if (userSnippets) {
payload.snippets = utils.deepMerge(payload.snippets || {}, userSnippets);
}

this.loadUserData(payload);
next();
},

/**
Expand Down

0 comments on commit c7fa6b6

Please sign in to comment.