Changeset 171

Timestamp:

08/20/08 20:28:35 (11 months ago)

Author:

rgrp

Message:

[js/thread-update][l]: factlet search widget now functional (though no adding to thread yet).

Location:

trunk/microfacts/public/behaviour

Files:

• app/controllers/factletsearch_controller.js (added)
• app/controllers/threadfactlets_controller.js (modified) (4 diffs)
• app/controllers/threadpage_controller.js (modified) (3 diffs)
• app/models/model.js (modified) (2 diffs)
• load.js (modified) (2 diffs)

trunk/microfacts/public/behaviour/app/controllers/threadfactlets_controller.js

@@ -13 +13 @@
     onFactletSelect: function (factlet) {
         console.log("ThreadFactletsController saw factletSelect event");
-        console.log(factlet);
         console.log(this.factletDivsKeyedById);
         // TODO: unselect any selected element ...
@@ -20 +19 @@
         });
         var div = this.factletDivsKeyedById[factlet.id];
-        console.log(div);
         div.addClass('active');
-        console.log(div);
     },
 
     onThreadStart: function () {
         console.log("ThreadFactletsController saw threadStart event");
-        console.log(arguments);
         this.thread = arguments[0];
         this.factlets = arguments[1];
-        console.log(this.thread);
-        console.log(this.factlets);
         this.factletsKeyedById = new Hash({});
         this.factletDivsKeyedById = new Hash({});
@@ -46 +40 @@
     controls: {
         '.factlet click': function (e) {
+            // does not work
+            // this.manageFactletClick(e);
             var evt = new Event(e);
             console.log('Factlet in ThreadFactlets clicked.');
@@ -52 +48 @@
             var factletId = divId.split('-').getLast().toInt();
             this.fireEvent('factletSelect', this.factletsKeyedById[factletId]);
-//        },
-//        '.addToThread': function () {
-//            $$('.thread')[0].controller().addFactlet(this.model);
         }
     }

trunk/microfacts/public/behaviour/app/controllers/threadpage_controller.js

@@ -2 +2 @@
     Extends: Controller,
 
-    onFactletSelect: function(factlet) {
-        console.log('ThreadPageController: saw factletSelect event');
-        console.log(factlet);
-        this.fireEvent('factletSelect', factlet);
-    },
-    
     initialize: function (element) {
         this.initModel();
@@ -14 +8 @@
         element.getElements('.thread-factlets').each(function (el) {
             this.addController(new ThreadFactletsController(el));
+        }, this);
+        // should be only one
+        element.getElements('#factlet-search').each(function (el) {
+            this.addController(new FactletSearchController(el));
         }, this);
 
@@ -26 +24 @@
     onThreadStart: function() {
         console.log('ThreadPageController: onThreadStart');
-        console.log(arguments);
         this.fireEvent('threadStart', arguments);
+    },
+
+    onFactletSelect: function(factlet) {
+        console.log('ThreadPageController: saw factletSelect event');
+        this.fireEvent('factletSelect', factlet);
     },
 

trunk/microfacts/public/behaviour/app/models/model.js

@@ -4 +4 @@
     startWithThread: function (payloadThread, payloadThreadFactlets) {
         console.log('Model: startWithThread'); 
-        console.log(payloadThread.id);
         var thread = new Thread(payloadThread['id']);
         thread.data = payloadThread;
@@ -18 +17 @@
         DomainObject.Register['Thread'][thread.id] = thread;
         var evtData = [thread, threadFactlets];
-        console.log(evtData);
         this.fireEvent('threadStart', evtData);
     }

trunk/microfacts/public/behaviour/load.js

@@ -135 +135 @@
 
 loader.addModule({
+    name: "factletsearchcontroller",
+    type: "js",
+    path: "app/controllers/factletsearch_controller.js?" + Math.random(),
+    requires: ['controller', 'factlet'],
+    varName: "FactletSearchController"
+});
+
+
+loader.addModule({
     name: "factletcontroller",
     type: "js",
@@ -181 +190 @@
     type: "js",
     path: "app/controllers/threadpage_controller.js?" + Math.random(),
-    requires: ['model', 'domainobject', 'view', 'controller', 'thread', 'factlet', 'threadfactletscontroller'],
+    requires: ['model', 'domainobject', 'view', 'controller', 'thread', 'factlet', 'threadfactletscontroller', 'factletsearchcontroller'],
     varName: "ThreadPageController"
 });