Merge branch 'master' of github.com:ajaxorg/apf

mikedeboer · mikedeboer · commit ad6fa54beb6d · 2010-10-31T13:45:07.000+01:00
diff --git a/core/baseclasses/basetree.js b/core/baseclasses/basetree.js
@@ -726,6 +726,9 @@ apf.BaseTree = function(){
     
     //check databinding for how this is normally implemented
     this.$extend = function(xmlNode, container, immediate, callback){
+        if (!this.$hasLoadStatus(xmlNode, "potential")) 
+            return;
+
         var rule       = this.$getBindRule("insert", xmlNode),
             xmlContext = rule && rule.match
                 ? (rule.cmatch || rule.compile("match"))(xmlNode)
@@ -786,11 +789,11 @@ apf.BaseTree = function(){
 
         //this.$hasLoadStatus(e.xmlNode, "loading")
         if (e.action == "insert" && e.result.length > 0) {
-            if (this.$hasLoadStatus(e.xmlNode, "loaded")) {
+            if (this.$hasLoadStatus(e.xmlNode, "loaded", true)) {
                 var container = this.$getLayoutNode("item", "container", htmlNode);
                 this.slideOpen(container, e.xmlNode);//, e.$anim ? false : true
             }
-            else if (this.$hasLoadStatus(e.xmlNode, "potential")) {
+            else if (this.$hasLoadStatus(e.xmlNode, "potential", true)) {
                 this.$setLoadStatus(e.xmlNode, "loaded");
             }
         }
diff --git a/core/baseclasses/databinding.js b/core/baseclasses/databinding.js
@@ -648,7 +648,8 @@ apf.DataBinding = function(){
      *                     that is used to load data into the xmlRoot of this component.
      */
     this.$loadSubData = function(xmlRootNode){
-        if (this.$hasLoadStatus(xmlRootNode)) return;
+        if (this.$hasLoadStatus(xmlRootNode) && !this.$hasLoadStatus(xmlRootNode, "potential")) 
+            return;
 
         //var loadNode = this.$applyBindRule("load", xmlRootNode);
         var rule = this.$getBindRule("load", xmlRootNode);
@@ -769,15 +770,20 @@ apf.DataBinding = function(){
     /**
      * @private
      */
+    //@todo optimize this
     this.$setLoadStatus = function(xmlNode, state, remove){
-        //remove old status if any
-        var ostatus = xmlNode.getAttribute("a_loaded");
-        ostatus = ostatus
-            ? ostatus.replace(new RegExp("\\|\\w+\\:" + this.$uniqueId + "\\|", "g"), "")
-            : "";
+        var group  = this.loadgroup || "default";
+        var re     = new RegExp("\\|(\\w+)\\:" + group + ":(\\d+)\\|");
+        var loaded = xmlNode.getAttribute("a_loaded") || "";
 
+        var m;        
+        if (!remove && (m = loaded.match(re)) && m[1] != "potential" && m[2] != this.$uniqueId)
+            return;
+        
+        //remove old status if any
+        var ostatus = loaded.replace(re, "")
         if (!remove)
-            ostatus += "|" + state + ":" + this.$uniqueId + "|";
+            ostatus += "|" + state + ":" + group + ":" + this.$uniqueId + "|";
 
         xmlNode.setAttribute("a_loaded", ostatus);
     };
@@ -792,11 +798,13 @@ apf.DataBinding = function(){
     /**
      * @private
      */
-    this.$hasLoadStatus = function(xmlNode, state){
+    this.$hasLoadStatus = function(xmlNode, state, unique){
         var ostatus = xmlNode.getAttribute("a_loaded");
         if (!ostatus) return false;
-
-        return (ostatus.indexOf((state || "") + ":" + this.$uniqueId + "|") != -1)
+    
+        var group  = this.loadgroup || "default";
+        var re     = new RegExp("\\|" + (state || "\\w+") + ":" + group + ":" + (unique ? this.$uniqueId : "\\d+") + "\\|");
+        return ostatus.match(re) ? true : false;
     };
 
     /**
diff --git a/core/baseclasses/focussable.js b/core/baseclasses/focussable.js
@@ -60,7 +60,7 @@ apf.Focussable = function(){
             return this;
         }
 
-        if (this.$focus && !this.editable)
+        if (this.$focus && !this.editable && (!e || !e.mouse || this.$focussable == apf.KEYBOARD_MOUSE))
             this.$focus(e);
 
         this.dispatchEvent("focus", apf.extend({
diff --git a/core/baseclasses/guielement.js b/core/baseclasses/guielement.js
@@ -723,7 +723,7 @@ apf.GuiElement.propHandlers = {
      * the mouse over the element.
      */
     "tooltip" : function(value){
-        this.$ext.setAttribute("title", value);
+        this.$ext.setAttribute("title", value + (this.hotkey ? " (" + this.hotkey + ")" : ""));
     },
     
     //#ifdef __AMLCONTEXTMENU
diff --git a/core/debug/debugwin.js b/core/debug/debugwin.js
@@ -1134,7 +1134,7 @@ apf.$debugwin = {
     
     activate : function(){
         //Show me
-        this.show();
+        //this.show();
     }
 }
 
diff --git a/core/lib/queue.js b/core/lib/queue.js
@@ -92,7 +92,8 @@ apf.queue = {
             apf.xmldb.notifyQueued();
         //#endif
         
-        var q = this.q;
+        var q  = this.q;
+        this.q = {};
         for (var prop in q){
             var f = q[prop];
             if (f) {
diff --git a/core/lib/xmldb.js b/core/lib/xmldb.js
@@ -770,7 +770,7 @@ apf.xmldb = new (function(){
         if (!this.delayUpdate && "|remove|move-away|".indexOf("|" + action + "|") > -1)
             this.notifyQueued(); //empty queue
 
-        var listen, uId, uIds, i, j, hash, info, amlNode, runTimer, found;
+        var listen, uId, uIds, i, j, hash, info, amlNode, runTimer, found, done = {};
         while (loopNode && loopNode.nodeType == 1) {
             //Get List of Node this.$listeners ID's
             listen = loopNode.getAttribute(this.xmlListenTag);
@@ -780,6 +780,8 @@ apf.xmldb = new (function(){
 
                 for (i = 0; i < uIds.length; i++) {
                     uId = uIds[i];
+                    if (!uId || done[uId]) continue;
+                    done[uId] = true;
 
                     //Property support
                     /*if (uId.charAt(0) == "p") {
diff --git a/core/window.js b/core/window.js
@@ -536,7 +536,7 @@ apf.window = function(){
             return;
         }
         
-        if (e.srcElement != this && this.$focus)
+        if (e.srcElement != this && this.$focus && (!e || !e.mouse || this.$focussable == apf.KEYBOARD_MOUSE))
             this.$focus();
         
         if (e.srcElement == this || e.trackedChild) {
@@ -968,7 +968,8 @@ apf.window = function(){
         else if (amlNode) { //@todo check this for documentElement apf3.0
             if ((p = apf.document.activeElement
               && apf.document.activeElement.$focusParent || lastFocusParent)
-              && p.visible && p.modal && amlNode.$focusParent != p) {
+              && p.visible && p.modal && amlNode.$focusParent != p
+              && amlNode.$isWindowContainer != -1) {
                 apf.window.$focusLast(p, {mouse: true, ctrlKey: e.ctrlKey});
             }
             else if (!amlNode && apf.document.activeElement) {
diff --git a/elements/bindingcolumnrule.js b/elements/bindingcolumnrule.js
@@ -300,15 +300,15 @@ apf.BindingColumnRule = function(struct, tagName){
         if (this.sorted)
             this.sort(pNode, true);
         
-        this.$int.onmouseover = function(e){
+        /*this.$int.onmouseover = function(e){
             if (!e) e = event;
             
             if (pNode.disabled) return;
             
             clearTimeout(this.$timer);
 
             apf.setStyleClass(this, "hover", ["down"]);
-        };
+        };*/
         
         this.$int.onmouseup = function(e){
             if (!e) e = event;
@@ -493,9 +493,12 @@ apf.BindingColumnRule = function(struct, tagName){
                 pNode.$ext.style.cursor = t && _self.$resizable
                     ? "w-resize"
                     : "default";
+                
+                apf.setStyleClass(this, "", ["hover", "down"]);
             }
             else {
                 pNode.$ext.style.cursor = "default";
+                apf.setStyleClass(this, "hover", ["down"]);
             }
         };
 
diff --git a/elements/button.js b/elements/button.js
@@ -60,7 +60,7 @@ apf.button  = function(struct, tagName){
 
     /**** Properties and Attributes ****/
 
-    this.$focussable = true; // This object can get the focus
+    this.$focussable = apf.KEYBOARD; // This object can get the focus
     this.value       = null;
     
     this.$init(function(){
@@ -292,6 +292,9 @@ apf.button  = function(struct, tagName){
                     _self.dispatchEvent("click");
             });
         }
+
+        if (this.tooltip)
+            apf.GuiElement.propHandlers.tooltip.call(this, this.tooltip);
     }
     //#endif
 
@@ -531,6 +534,11 @@ apf.button  = function(struct, tagName){
 
     /**** Init ****/
 
+    this.addEventListener("$skinchange", function(e){
+        if (this.tooltip)
+            apf.GuiElement.propHandlers.tooltip.call(this, this.tooltip);
+    });
+
     this.$draw  = function(){
         var pNode, isToolbarButton = (pNode = this.parentNode) 
             && pNode.parentNode.localName == "toolbar";
diff --git a/elements/checkbox.js b/elements/checkbox.js
@@ -77,7 +77,7 @@ apf.checkbox = function(struct, tagName){
     );
 
     //Options
-    this.$focussable = true; // This object can get the focus
+    this.$focussable = apf.KEYBOARD; // This object can get the focus
     this.checked     = false;
     this.$values     = [1, 0];
 
diff --git a/elements/codeeditor.js b/elements/codeeditor.js
@@ -188,9 +188,10 @@ apf.codeeditor = function(struct, tagName) {
         };
     };
 
+    //@todo fix that this is not called three times
     this.$updateMarker = function(removeOnly) {
         if (this.$marker) {
-            this.$editor.renderer.removeGutterDecoration(this.$lastRow, "arrow");
+            this.$editor.renderer.removeGutterDecoration(this.$lastRow[0], this.$lastRow[1]);
             this.$editor.renderer.removeMarker(this.$marker);
             this.$marker = null;
             
@@ -209,12 +210,17 @@ apf.codeeditor = function(struct, tagName) {
         if (script.getAttribute("scriptid") !== frame.getAttribute("scriptid"))
             return;
 
+        var head  = this.$debugger.$mdlStack.queryNode("frame[1]");
+        var isTop = frame == head;
+        
         var lineOffset = parseInt(script.getAttribute("lineoffset") || "0");
         var row = parseInt(frame.getAttribute("line")) - lineOffset;
         var range = new Range(row, 0, row+1, 0);
-        this.$marker = this.$editor.renderer.addMarker(range, "ace_step", "line");
-        this.$lastRow = row;
-        this.$editor.renderer.addGutterDecoration(row, "arrow");
+
+        this.$marker = this.$editor.renderer.addMarker(range, isTop ? "ace_step" : "ace_stack", "line");
+        var type = isTop ? "arrow" : "stack";
+        this.$lastRow = [row, type];
+        this.$editor.renderer.addGutterDecoration(row, type);
         
         this.$editor.gotoLine(row + 1, parseInt(frame.getAttribute("column")));
         //this.$editor.moveCursorTo(row, parseInt(frame.getAttribute("column")));
@@ -472,10 +478,11 @@ apf.codeeditor = function(struct, tagName) {
 
     this.syncValue = function() {
         var doc = this.$editor.getDocument();
-        if (doc.cacheId == this.$getCacheKey(this.value)) {
+        if (!doc.cacheId || doc.cacheId == this.$getCacheKey(this.value)) {
             var value = this.getValue();
             if (this.value != value)
-                this.change(value);
+                this.setProperty("value", value);
+                //this.change(value);
         }
     };
 
@@ -491,7 +498,7 @@ apf.codeeditor = function(struct, tagName) {
 
     //@todo
     this.addEventListener("keydown", function(e){
-        //this.$editor.
+        
     }, true);
 
     /**** Init ****/
diff --git a/elements/dropdown.js b/elements/dropdown.js
@@ -107,7 +107,7 @@ apf.dropdown = function(struct, tagName){
     
     this.dragdrop      = false;
     this.reselectable  = true;
-    this.$focussable   = true;
+    this.$focussable   = apf.KEYBOARD;
     this.autoselect    = false;
     this.multiselect   = false;
     this.disableremove = true;
diff --git a/elements/hbox.js b/elements/hbox.js
@@ -175,13 +175,22 @@ apf.vbox = function(struct, tagName){
             var nodes = this.childNodes;
             var size  = this.$vbox ? "width" : "height";
             
+            var isInFixed = false, loopNode = this;
+            while(!isInFixed && loopNode) {
+                isInFixed = loopNode[size] || loopNode.anchors || (loopNode.$vbox ? loopNode.top && loopNode.bottom : loopNode.left && loopNode.right);
+                if (!loopNode.flex)
+                    break;
+                loopNode = loopNode.parentNode || loopNode.$parentNode;
+            }
+            
             for (var i = 0, l = nodes.length; i < l; i++) {
                 if (!(node = nodes[i]).$ext || node.$ext.nodeType != 1)
                     continue;
 
+                //(this[size] || this.anchors || (this.$vbox ? this.top && this.bottom : this.left && this.right)
                 if (stretch && !node[size]) //(node.$altExt || 
                     node.$ext.style[size] = apf.isGecko && (this.flex || node.flex) 
-                        ? (this[size] || this.anchors || (this.$vbox ? this.top && this.bottom : this.left && this.right) ? "1px" : "auto")
+                        ? (isInFixed ? "1px" : "auto")
                         : (apf.isWebkit && input[node.$ext.tagName] 
                             ? "100%" 
                             : (apf.isWebkit && node[this.$vbox ? "minwidth" : "minheight"] && this.flex //nasty bug fix
diff --git a/elements/radiobutton.js b/elements/radiobutton.js
@@ -94,7 +94,7 @@ apf.radiobutton = function(struct, tagName){
     this.implement(apf.ChildValue);
     this.$childProperty = "label";
     
-    this.$focussable = true; // This object can get the focus
+    this.$focussable = apf.KEYBOARD; // This object can get the focus
     
     //1 = force no bind rule, 2 = force bind rule
     /*this.$attrExcludePropBind = apf.extend({
diff --git a/elements/splitter.js b/elements/splitter.js
@@ -152,7 +152,7 @@ apf.splitter = function(struct, tagName){
         //this.parentNode.addEventListener("DOMNodeRemoved", this.$siblingChange);
         
         this.$setSiblings();
-
+        
         this.$thickness = null;
         if (this.parentNode.$box) {
             this.setProperty("type", this.parentNode.localName == "vbox" 

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ apf.Focussable = function(){`
`60`	`60`	`return this;`
`61`	`61`	`}`
`62`	`62`
`63`		`- if (this.$focus && !this.editable)`
	`63`	`+ if (this.$focus && !this.editable && (!e \|\| !e.mouse \|\| this.$focussable == apf.KEYBOARD_MOUSE))`
`64`	`64`	`this.$focus(e);`
`65`	`65`
`66`	`66`	`this.dispatchEvent("focus", apf.extend({`
Original file line number	Diff line number	Diff line change
`@@ -1134,7 +1134,7 @@ apf.$debugwin = {`
`1134`	`1134`
`1135`	`1135`	`activate : function(){`
`1136`	`1136`	`//Show me`
`1137`		`- this.show();`
	`1137`	`+ //this.show();`
`1138`	`1138`	`}`
`1139`	`1139`	`}`
`1140`	`1140`