From 21cc0a204755c7e4dede78248f969ab632034e05 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 5 Jun 2015 03:17:07 +0400
Subject: [PATCH] fix handling of plugins config from package.json

---
 plugins/c9.cli.publish/publish.js | 7 ++++++-
 plugins/c9.ide.plugins/loader.js  | 8 ++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/plugins/c9.cli.publish/publish.js b/plugins/c9.cli.publish/publish.js
index ea80343d..2a4504f6 100644
--- a/plugins/c9.cli.publish/publish.js
+++ b/plugins/c9.cli.publish/publish.js
@@ -555,7 +555,12 @@ define(function(require, exports, module) {
                             additional.push({
                                 id: path,
                                 source: 'define("' + path + '", [],' + 
-                                    JSON.stringify(packedConfig, null, 4) + ');',
+                                    JSON.stringify(packedConfig.map(function(p) {
+                                        var name = p.slice(p.lastIndexOf("/") + 1)
+                                        var options = json.plugins[name] || {};
+                                        options.packagePath = p;
+                                        return options;
+                                    }), null, 4) + ');',
                                 literal : true,
                                 order: -1
                             });
diff --git a/plugins/c9.ide.plugins/loader.js b/plugins/c9.ide.plugins/loader.js
index 7b21a959..cb948f27 100644
--- a/plugins/c9.ide.plugins/loader.js
+++ b/plugins/c9.ide.plugins/loader.js
@@ -103,10 +103,10 @@ define(function(require, exports, module) {
                 requirejs.undef(root + "/__installed__.js");
                 require([root + "/__installed__"], function(plugins) {
                     var config = plugins.map(function(p) {
-                        return {
-                            staticPrefix: host + join(base, paths[root]),
-                            packagePath: p
-                        };
+                        if (typeof p == "string")
+                            p = { packagePath: p };
+                        p.staticPrefix = host + join(base, paths[root]);
+                        return p;
                     });
                     
                     architect.loadAdditionalPlugins(config, function(err){