Adding change to process theme in the extension package as an object rather than just a string

MiguelCastillo · MiguelCastillo · commit 219c2ca55443 · 2014-07-18T00:43:17.000-04:00
diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
@@ -254,7 +254,7 @@ define(function (require, exports, module) {
                 return theme;
             });
 
-        return $.when.apply(undefined, pending);
+        return $.when(pending);
     }
 
 
@@ -326,7 +326,7 @@ define(function (require, exports, module) {
      * @return {$.Promise} promise object resolved with the theme to be loaded from the pacakge
      */
     function loadPackage(themePackage) {
-        var fileName = themePackage.path + "/" + themePackage.metadata.theme;
+        var fileName = themePackage.path + "/" + themePackage.metadata.theme.file;
         return loadFile(fileName, themePackage.metadata);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ define(function (require, exports, module) {`
`254`	`254`	`return theme;`
`255`	`255`	`});`
`256`	`256`
`257`		`- return $.when.apply(undefined, pending);`
	`257`	`+ return $.when(pending);`
`258`	`258`	`}`
`259`	`259`
`260`	`260`
`@@ -326,7 +326,7 @@ define(function (require, exports, module) {`
`326`	`326`	`* @return {$.Promise} promise object resolved with the theme to be loaded from the pacakge`
`327`	`327`	`*/`
`328`	`328`	`function loadPackage(themePackage) {`
`329`		`- var fileName = themePackage.path + "/" + themePackage.metadata.theme;`
	`329`	`+ var fileName = themePackage.path + "/" + themePackage.metadata.theme.file;`
`330`	`330`	`return loadFile(fileName, themePackage.metadata);`
`331`	`331`	`}`
`332`	`332`