clean up. making pc build happen through events. direct refence to ui…

… in pc building method removed. #73.
photofroggy · Apr 21, 2013 · 543fd94 · 543fd94
1 parent 7f24485
commit 543fd94
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 42 deletions.
diff --git a/dist/chatterbox.js b/dist/chatterbox.js
@@ -344,6 +344,13 @@ Chatterbox.UI.prototype.build = function( control, navigation, chatbook ) {
         }
     );
 
+    this.client.bind(
+        'ns.set.privclasses',
+        function( event, client ) {
+            ui.channel( event.ns ).build_user_list( event.names, event.orders );
+        }
+    );
+
 };
 
 /**

diff --git a/dist/chatterbox.min.js b/dist/chatterbox.min.js
diff --git a/dist/wsc.dAmn.js b/dist/wsc.dAmn.js
@@ -1026,8 +1026,12 @@ wsc.Channel = function( client, ns, hidden, monitor ) {
  * @method build
  */
 wsc.Channel.prototype.build = function( ) {
+
     this.info.members = {};
-    this.set_privclasses( { pkt: { body: '' } } );
+
+    if( this.namespace[0] == '@' )
+        this.set_privclasses( { pkt: { body: '' } } );
+
 };
 
 /**
@@ -1149,7 +1153,15 @@ wsc.Channel.prototype.set_privclasses = function( e ) {
     var names = this.info.pc;
     var orders = this.info.pc_order.slice(0);
 
-    this.ui.build_user_list( names, orders );
+    this.client.trigger(
+        'ns.set.privclasses',
+        {
+            name: 'ns.set.privclasses',
+            ns: this.namespace,
+            names: names,
+            orders: orders
+        }
+    );
 };
 
 /**
@@ -1212,7 +1224,7 @@ wsc.Channel.prototype.set_user_list = function( ) {
 
     this.client.trigger(this.namespace + '.user.list', {
         'name': 'set.userlist',
-        'ns': this.info['namespace'],
+        'ns': this.namespace,
         'users': users
     });
 };
@@ -4707,6 +4719,13 @@ Chatterbox.UI.prototype.build = function( control, navigation, chatbook ) {
         }
     );
 
+    this.client.bind(
+        'ns.set.privclasses',
+        function( event, client ) {
+            ui.channel( event.ns ).build_user_list( event.names, event.orders );
+        }
+    );
+
 };
 
 /**

diff --git a/dist/wsc.dAmn.min.js b/dist/wsc.dAmn.min.js
diff --git a/dist/wsc.js b/dist/wsc.js
@@ -1026,8 +1026,12 @@ wsc.Channel = function( client, ns, hidden, monitor ) {
  * @method build
  */
 wsc.Channel.prototype.build = function( ) {
+
     this.info.members = {};
-    this.set_privclasses( { pkt: { body: '' } } );
+
+    if( this.namespace[0] == '@' )
+        this.set_privclasses( { pkt: { body: '' } } );
+
 };
 
 /**
@@ -1149,7 +1153,15 @@ wsc.Channel.prototype.set_privclasses = function( e ) {
     var names = this.info.pc;
     var orders = this.info.pc_order.slice(0);
 
-    this.ui.build_user_list( names, orders );
+    this.client.trigger(
+        'ns.set.privclasses',
+        {
+            name: 'ns.set.privclasses',
+            ns: this.namespace,
+            names: names,
+            orders: orders
+        }
+    );
 };
 
 /**
@@ -1212,7 +1224,7 @@ wsc.Channel.prototype.set_user_list = function( ) {
 
     this.client.trigger(this.namespace + '.user.list', {
         'name': 'set.userlist',
-        'ns': this.info['namespace'],
+        'ns': this.namespace,
         'users': users
     });
 };
@@ -4707,6 +4719,13 @@ Chatterbox.UI.prototype.build = function( control, navigation, chatbook ) {
         }
     );
 
+    this.client.bind(
+        'ns.set.privclasses',
+        function( event, client ) {
+            ui.channel( event.ns ).build_user_list( event.names, event.orders );
+        }
+    );
+
 };
 
 /**

diff --git a/dist/wsc.min.js b/dist/wsc.min.js
diff --git a/src/channel.js b/src/channel.js
@@ -44,8 +44,12 @@ wsc.Channel = function( client, ns, hidden, monitor ) {
  * @method build
  */
 wsc.Channel.prototype.build = function( ) {
+
     this.info.members = {};
-    this.set_privclasses( { pkt: { body: '' } } );
+
+    if( this.namespace[0] == '@' )
+        this.set_privclasses( { pkt: { body: '' } } );
+
 };
 
 /**
@@ -167,7 +171,15 @@ wsc.Channel.prototype.set_privclasses = function( e ) {
     var names = this.info.pc;
     var orders = this.info.pc_order.slice(0);
 
-    this.ui.build_user_list( names, orders );
+    this.client.trigger(
+        'ns.set.privclasses',
+        {
+            name: 'ns.set.privclasses',
+            ns: this.namespace,
+            names: names,
+            orders: orders
+        }
+    );
 };
 
 /**
@@ -230,7 +242,7 @@ wsc.Channel.prototype.set_user_list = function( ) {
 
     this.client.trigger(this.namespace + '.user.list', {
         'name': 'set.userlist',
-        'ns': this.info['namespace'],
+        'ns': this.namespace,
         'users': users
     });
 };

diff --git a/src/ui/base.js b/src/ui/base.js
@@ -344,6 +344,13 @@ Chatterbox.UI.prototype.build = function( control, navigation, chatbook ) {
         }
     );
 
+    this.client.bind(
+        'ns.set.privclasses',
+        function( event, client ) {
+            ui.channel( event.ns ).build_user_list( event.names, event.orders );
+        }
+    );
+
 };
 
 /**