presist the Resource object between resource and method list view so that we don't have to requery it needlessly

pospi · pospi · commit bda345646a75 · 2013-03-03T15:28:18.000+10:00
diff --git a/js/views/methods/list.js b/js/views/methods/list.js
@@ -10,9 +10,9 @@ define([
   'views/forms/method',
   'views/methods/page',
   'collections/methods',
-  'models/method',
+  'models/resource',
   'models/notificationtotal'
-  ], function($, _, Backbone, Vm, Mustache, Session, resourceListTemplate, ResourceForm, MethodForm, MethodView, Methods, MethodModel, NTotals){
+  ], function($, _, Backbone, Vm, Mustache, Session, resourceListTemplate, ResourceForm, MethodForm, MethodView, Methods, ResourceModel, NTotals){
   var ApisPage = Backbone.View.extend({
     el: '.method-list-container',
     initialize: function () {
@@ -59,17 +59,23 @@ define([
     render: function () {
       var that = this;
       this.methods = new Methods();
-      this.resource = new MethodModel();
+
+      // re-request resource only if necessary
+      if (that.options.resource) {
+      	  this.resource = that.options.resource;
+      } else {
+	      this.resource = new ResourceModel();
+	      this.resource.options = {
+	        username: that.options.username,
+	        apiname: that.options.apiname,
+	        version: that.options.version,
+	        resourceId: that.options.resourceId
+	      };
+	      this.resource.fetch();
+	  }
       that.$el.attr('data-resource-id', that.options.resourceId);
       that.$el.fadeIn(200);
 
-      this.resource.set({
-        username: that.options.username,
-        apiname: that.options.apiname,
-        version: that.options.version,
-        resourceId: that.options.resourceId
-      });
-      this.resource.fetch();
       this.methods.username = that.options.username;
       this.methods.apiname = that.options.apiname;
       this.methods.version = that.options.version;
diff --git a/js/views/resource/list.js b/js/views/resource/list.js
@@ -48,9 +48,19 @@ define([
         this.expandMethods(ele);
     },
     expandMethods: function (ele) {
-      var resourceId = $(ele).attr('data-resource-id');
-      var el =  $(ele).next('li');
-      var methodListView = Vm.create(this, 'methodlist'+this.options.resourceId, MethodsListView, {username: this.options.username, apiname: this.options.apiname, version: this.options.version, resourceId: resourceId, method: this.options.method, el: el});
+      var resourceId = $(ele).attr('data-resource-id'),
+      	resource = this.resources.get(resourceId),
+      	el =  $(ele).next('li');
+
+      var methodListView = Vm.create(this, 'methodlist'+this.options.resourceId, MethodsListView, {
+    	username: this.options.username,
+    	apiname: this.options.apiname,
+    	version: this.options.version,
+    	resourceId: resourceId,
+    	resource: resource,
+    	method: this.options.method,
+    	el: el
+      });
       methodListView.setElement(el);
       methodListView.render();
     },
@@ -59,8 +69,11 @@ define([
       $('.resource-submenu').fadeOut(200);
     },
     render: function () {
-      var that = this;
-      var resources = new ResourcesCollection();
+      var that = this,
+    	resources = new ResourcesCollection();
+
+      that.resources = resources;	// assign to the view so we don't have to requery in method lists
+
       resources.username = that.options.username;
       resources.apiname = that.options.apiname;
       resources.version = that.options.version;
@@ -110,6 +123,11 @@ define([
       });
 
 
+    },
+
+    clean : function()
+    {
+    	this.resources = null;
     }
   });
   return ApisPage;
