Changeset 371

Timestamp:

07/23/12 15:24:04 (13 years ago)

Author:

jkraaijeveld

Message:

Session now also correctly removes the accounts (still question titles until we introduce accounts) when they are removed from the list. Ordering is not yet taken into account.

Location:

Dev/branches/rest-dojo-ui/client/rft

Files:

• pages/session.js (modified) (4 diffs)
• ui/ListView.js (modified) (2 diffs)

Dev/branches/rest-dojo-ui/client/rft/pages/session.js

@@ -15 +15 @@
                         _listView: null,
             _select: null,
-            _accounts: null,
                         onVisit: function() {
                                 if ( this.pageArgs.uid ) {
@@ -25 +24 @@
                                         }));
                     this._setupAutoComplete();
-                    this._accounts = [];
                                 } else {
                                         throw "No valid uid or session passed!";
@@ -43 +41 @@
             onSave: function(evt) {
                 lang.mixin(this.session,this.propertiesForm.get('value'));
-                this.session.accounts = this._accounts;
                 store.put(this.session)
                 .then(function(){
@@ -58 +55 @@
             },
             _addAccount: function(item) {
-                this._accounts.push(item);
+                this.session.accounts.push(item);
                 this._listView.insertItem(item);
+            },
+            _removeAccount: function(item) {
+                this.session.accounts.splice(this.session.accounts.indexOf(item), 1);
             },
             _setupListView: function() {
                 this._listView = new AccountListView( {
-                    controller: this
+                    controller: this,
+                    removeCallback: lang.hitch(this, this._removeAccount)
                 }).placeAt(this.listViewNode);
                 for (account in this.session.accounts) {
-                    this._accounts.push(this.session.accounts[account]);
-                    this._listView.insertItem({ "title" : this.session.accounts[account] });
+                    this._listView.insertItem(this.session.accounts[account]);
                 }
+
                 this._listView.startup();
             },

Dev/branches/rest-dojo-ui/client/rft/ui/ListView.js

@@ -19 +19 @@
             templateString: templateString,
             baseClass: 'rftList',
+
+            removeCallback: null,
+
+            constructor: function() {
+                lang.mixin(this, arguments);
+            },
 
             postCreate: function() {
@@ -97 +103 @@
             removeItem: function(item, widget) {
                 widget.destroy();
+                if(this.removeCallback)
+                    this.removeCallback(item);
             }
         });