Permalink
Browse files

Fixed Komodo extensions loading

  • Loading branch information...
1 parent df28418 commit da5e452771d92481a9dd71b493119d038fc0ad5c @sergeche sergeche committed Mar 31, 2013
@@ -101,7 +101,7 @@ emmet.define('resources', function(require, _) {
/**
* Returns resource (abbreviation, snippet, etc.) matched for passed
* abbreviation
- * @param {TreeNode} node
+ * @param {AbbreviationNode} node
* @param {String} syntax
* @returns {Object}
*/
@@ -50,21 +50,20 @@ emmet.exec(function(require, _) {
require('bootstrap').loadSystemSnippets(snippets);
// Load extensions
- var extPath = require('file').createPath(DirIO.get('Home').path, 'emmet', function(extPath) {
- var rootDir = FileIO.open(extPath);
+ var extPath = require('file').createPath(DirIO.get('Home').path, 'emmet');
+ var rootDir = FileIO.open(extPath);
+
+ if (rootDir.exists() && rootDir.isDirectory()) {
+ var extFiles = _.reject(DirIO.read(rootDir, true), function(f) {
+ return f.isDirectory();
+ });
- if (rootDir.exists() && rootDir.isDirectory()) {
- var extFiles = _.reject(DirIO.read(rootDir, true), function(f) {
- return f.isDirectory();
- });
-
- extFiles = _.map(extFiles, function(f) {
- return FileIO.path(f);
- });
-
- require('bootstrap').loadExtensions(extFiles);
- }
- });
+ extFiles = _.map(extFiles, function(f) {
+ return FileIO.path(f);
+ });
+
+ require('bootstrap').loadExtensions(extFiles);
+ }
} catch (e) {
ko.dialogs.alert('Error', e);
@@ -173,8 +173,8 @@ emmet.define('file', function(require, _) {
* @param {String} file
* @return {String}
*/
- createPath: function(dirname, file, callback) {
- callback(createPath(dirname, file));
+ createPath: function(dirname, file) {
+ return createPath(dirname, file);
},
/**
@@ -4,7 +4,7 @@
<Description about="urn:mozilla:install-manifest">
<em:id>emmet@chikuyonok.ru</em:id>
<em:name>Emmet</em:name>
- <em:version>1.0.3</em:version>
+ <em:version>1.0.4</em:version>
<em:description>Emmet toolkit for Komodo</em:description>
<em:creator>Sergey Chikuyonok</em:creator>
<em:homepageURL>http://emmet.io</em:homepageURL>

0 comments on commit da5e452

Please sign in to comment.