Changeset 99:ca0f0b38a1d9 for source/class/pf

Timestamp:

Jan 8, 2009, 6:19:06 PM (16 years ago)

Author:

fnevgeny

Branch:

default

Phase:

public

Message:

updateEntityValue() was called twice. Other fixes.

File:

• source/class/pf/Application.js (modified) (5 diffs)

source/class/pf/Application.js

@@ -324 +324 @@
 }
 
-function clickEntityCB(ev)
+function clickTreeCB(ev)
 {
     var e = ev.getTarget();
-    var entity = e.getUserData("entity");
-    
-    this.gui_entity_units.update(entity.dimension,
-        this.prefs.units[entity.dimension]);
-    
-    this.updateEntityValue();
+    if (e.isSelected()) {
+        var entity = e.getUserData("entity");
+
+        if (entity) {
+            this.gui_entity_units.update(entity.dimension,
+                this.prefs.units[entity.dimension]);
+        } else {
+            this.gui_entity_units.update(null, null);
+        }
+        
+        this.updateEntityValue();
+    }
 }
 
@@ -716 +722 @@
             var species = leaf.getUserData("species");
             
-            var name = this.getEntityFullName(entity, species);
+            var name, section, value;
+            if (entity) {
+                var v     = this.evaluateEntityValue(entity, species);
+                var scale = this.gui_entity_units.getSelected().getValue();
+                
+                name    = this.getEntityFullName(entity, species);
+                section = entity.section;
+                value   = v*scale
+            } else {
+                name    = null;
+                section = null;
+                value   = 0;
+            }
+            
             this.gui_entity_name.setValue(name);
 
-            this.gui_entity_section.setValue(entity.section);
-            
-            var v = this.evaluateEntityValue(entity, species);
-
-            var scale = this.gui_entity_units.getSelected().getValue();
-
-            this.gui_entity_value.setNumValue(v*scale);
+            this.gui_entity_section.setValue(section);
+
+            this.gui_entity_value.setNumValue(value);
             
             if (this.prefs.autoLoadWiki) {
@@ -809 +824 @@
                     break;
                 }
+                folder.addListener("changeSelected", clickTreeCB, this);
                 
                 var leaf;
@@ -819 +835 @@
 
                         leaf = new qx.legacy.ui.tree.TreeFile(entity.name, icon);
-                        leaf.addListener("changeSelected", clickEntityCB, this);
+                        leaf.addListener("changeSelected", clickTreeCB, this);
                         leaf.addListener("contextmenu", treeMenuCB, this);
                         leaf.setUserData("entity", entity);
@@ -834 +850 @@
                     leaf = new qx.legacy.ui.tree.TreeFile(entity.name,
                         "pf/image/all_small.png");
-                    leaf.addListener("changeSelected", clickEntityCB, this);
+                    leaf.addListener("changeSelected", clickTreeCB, this);
                     leaf.addListener("contextmenu", treeMenuCB, this);
                     leaf.setUserData("entity", entity);