Merge lp:~jcsackett/juju-gui/rip-out-old-charmworld into lp:juju-gui/experimental

[j.c.sackett]

Removes charmStore from charm-panel

Removes references to charmStore--and the implicit uses of the old charmworld
API--from the charmpanel.

https://codereview.appspot.com/11370043/

[j.c.sackett (jcsackett)]

Reviewers: mp+175086_code.launchpad.net,

Message:
Please take a look.

Description:
Removes charmStore from charm-panel

Removes references to charmStore--and the implicit uses of the old
charmworld
API--from the charmpanel.

https://code.launchpad.net/~jcsackett/juju-gui/rip-out-old-charmworld/+merge/175086

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/11370043/

Affected files:
   A [revision details]
   M app/app.js
   M app/store/charm.js
   M app/views/charm-panel.js

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: app/app.js
=== modified file 'app/app.js'
--- app/app.js 2013-07-15 18:14:19 +0000
+++ app/app.js 2013-07-16 15:33:53 +0000
@@ -558,7 +558,6 @@

        // Create the CharmPanel instance once the app is initialized.
        this.charmPanel = views.CharmPanel.getInstance({
- charm_store: this.charm_store,
          env: this.env,
          app: this
        });

Index: app/store/charm.js
=== modified file 'app/store/charm.js'
--- app/store/charm.js 2013-06-18 18:16:46 +0000
+++ app/store/charm.js 2013-07-16 14:41:16 +0000
@@ -155,7 +155,7 @@

    /**
- * Api helper for the updated charmworld api v1.
+ * Api helper for the updated charmworld api v2.
     *
     * @class Charmworld2
     * @extends {Base}

Index: app/views/charm-panel.js
=== modified file 'app/views/charm-panel.js'
--- app/views/charm-panel.js 2013-07-12 20:19:56 +0000
+++ app/views/charm-panel.js 2013-07-16 15:33:53 +0000
@@ -720,8 +720,7 @@
     */
    function createInstance(config) {

- var charmStore = config.charm_store,
- charms = new models.CharmList(),
+ var charms = new models.CharmList(),
          app = config.app,
          container = Y.Node.create('<div />').setAttribute(
              'id', 'juju-search-charm-panel'),
@@ -778,18 +777,9 @@
          newPanel.set('ghostAttributes', config.ghostAttributes);
          newPanel.set('model', null); // Clear out the old.
          var charm = charms.getById(config.charmId);
- if (charm.loaded) {
- newPanel.set('model', charm);
- } else {
- charm.load(charmStore, function(err, response) {
- if (err) {
- console.log('error loading charm', response);
- } else {
- newPanel.set('model', charm);
- }
- });
- }
- } else { // This is the search panel.
+ newPanel.set('model', charm);
+ } else {
+ // This is the search panel.
          newPanel.render();
        }
      }

[Brad Crittenden (bac)]

LGTM, ty

https://codereview.appspot.com/11370043/

[Madison Scott-Clary (makyo)]

LGTM

https://codereview.appspot.com/11370043/

[lp:~jcsackett/juju-gui/rip-out-old-charmworld]

838. By j.c.sackett on 2013-07-16

Merged trunk.

[j.c.sackett (jcsackett)]

*** Submitted:

Removes charmStore from charm-panel

Removes references to charmStore--and the implicit uses of the old
charmworld
API--from the charmpanel.

R=bac, matthew.scott
CC=
https://codereview.appspot.com/11370043

https://codereview.appspot.com/11370043/

=== modified file 'app/app.js'
--- app/app.js	2013-07-15 18:14:19 +0000
+++ app/app.js	2013-07-16 18:35:28 +0000
@@ -558,7 +558,6 @@
 
       // Create the CharmPanel instance once the app is initialized.
       this.charmPanel = views.CharmPanel.getInstance({
-        charm_store: this.charm_store,
         env: this.env,
         app: this
       });

=== modified file 'app/store/charm.js'
--- app/store/charm.js	2013-06-18 18:16:46 +0000
+++ app/store/charm.js	2013-07-16 18:35:28 +0000
@@ -155,7 +155,7 @@
 
 
   /**
-   * Api helper for the updated charmworld api v1.
+   * Api helper for the updated charmworld api v2.
    *
    * @class Charmworld2
    * @extends {Base}

=== modified file 'app/views/charm-panel.js'
--- app/views/charm-panel.js	2013-07-12 20:19:56 +0000
+++ app/views/charm-panel.js	2013-07-16 18:35:28 +0000
@@ -720,8 +720,7 @@
    */
   function createInstance(config) {
 
-    var charmStore = config.charm_store,
-        charms = new models.CharmList(),
+    var charms = new models.CharmList(),
         app = config.app,
         container = Y.Node.create('<div />').setAttribute(
             'id', 'juju-search-charm-panel'),
@@ -778,18 +777,9 @@
         newPanel.set('ghostAttributes', config.ghostAttributes);
         newPanel.set('model', null); // Clear out the old.
         var charm = charms.getById(config.charmId);
-        if (charm.loaded) {
-          newPanel.set('model', charm);
-        } else {
-          charm.load(charmStore, function(err, response) {
-            if (err) {
-              console.log('error loading charm', response);
-            } else {
-              newPanel.set('model', charm);
-            }
-          });
-        }
-      } else { // This is the search panel.
+        newPanel.set('model', charm);
+      } else {
+        // This is the search panel.
         newPanel.render();
       }
     }