merge from dev

2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions
@@ -10,9 +10,9 @@

        var promise2 = ApiClient.getInstalledPlugins();

-        $.when(promise1, promise2).done(function (response1, response2) {
-            renderInstalled(page, response1[0], response2[0]);
-            renderCatalog(page, response1[0], response2[0]);
+        Promise.all([promise1, promise2]).then(function (responses) {
+            renderInstalled(page, responses[0], responses[1]);
+            renderCatalog(page, responses[0], responses[1]);
        });
    }