Skip to content

Commit

Permalink
Read extensions as UTF
Browse files Browse the repository at this point in the history
  • Loading branch information
sergeche committed Feb 22, 2013
1 parent c422293 commit 81b047d
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 13 deletions.
Binary file modified Contents/MacOS/Emmet
Binary file not shown.
4 changes: 3 additions & 1 deletion Contents/Resources/emmet-app.js
Original file line number Diff line number Diff line change
Expand Up @@ -12870,10 +12870,12 @@ emmet.define('bootstrap', function(require, _) {
var userSnippets = null;
var that = this;

var reader = _.bind(file.readText || file.read, file);

var next = function() {
if (fileList.length) {
var f = fileList.shift();
file.read(f, function(err, content) {
reader(f, function(err, content) {
if (err) {
emmet.log('Unable to read "' + f + '" file: '+ err);
return next();
Expand Down
35 changes: 24 additions & 11 deletions Contents/Resources/file-interface.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,32 @@ emmet.define('file', function(require, _) {
context = ctx;
},

read: function(path, size, callback) {
var args = _.rest(arguments);
callback = _.last(args);
_parseParams: function(args) {
var params = {
path: args[0],
size: -1
};

args = _.rest(args);
params.callback = _.last(args);
args = _.initial(args);
if (!args.length) {
size = 0;
}
var content = context.read_ofSize(path, 0);
if (content) {
callback(null, String(content));
} else {
callback('ObjC error');
if (args.length) {
params.size = args[0];
}

return params;
},

read: function(path, size, callback) {
var params = this._parseParams(arguments);
var content = context.read_ofSize(params.path, 0);
params.callback(content ? null : 'ObjC error', content);
},

readText: function(path, size, callback) {
var params = this._parseParams(arguments);
var content = context.readText(params.path);
params.callback(content ? null : 'ObjC error', String(content || ''));
},

locateFile: function(baseFile, fileName) {
Expand Down
6 changes: 5 additions & 1 deletion Contents/Resources/objc-zeneditor-wrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -255,4 +255,8 @@ function objcExtractTabstopsOnInsert(text) {

function objcSetPreference(name, value) {
require('preferences').set(objcToString(name), value + '');
}
}

emmet.log = function(message) {
NSLog(message);
};

0 comments on commit 81b047d

Please sign in to comment.