From edd8a11c8bd6612576405d1988b15c6f44b303ff Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian.jakobs@web.de>
Date: Wed, 29 Sep 2010 19:33:38 +0200
Subject: [PATCH 1/4] revert ace to old non timeout version

---
 common/ace | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/ace b/common/ace
index b189832377a..b646c0d1b79 160000
--- a/common/ace
+++ b/common/ace
@@ -1 +1 @@
-Subproject commit b189832377af3b8b8eb70f84e1e9be045837d2b2
+Subproject commit b646c0d1b79cfdf2f4de439703f6904c95382ea6

From 6b5f638519755c7e7d2b0ca0128073f2edea9718 Mon Sep 17 00:00:00 2001
From: Ruben <ruben@ajax.org>
Date: Thu, 30 Sep 2010 09:15:19 -0700
Subject: [PATCH 2/4] Changed apf back to release

---
 client/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/index.html b/client/index.html
index b8b4c736f11..479a5115881 100644
--- a/client/index.html
+++ b/client/index.html
@@ -27,7 +27,7 @@
 
             var HOST    = "http://dev1.ajax.org";
             var TESTING = false; //Load data from test models
-            var VERSION = FILES; //Change the version you want to use here
+            var VERSION = RELEASE; //Change the version you want to use here
 
             var apfLoc = VERSION == FILES
                 ? "common/apf/apf.js"

From 20cd11eb1d2b96d9bf2c5fb75bb8fd6926f87a3c Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian.jakobs@web.de>
Date: Fri, 1 Oct 2010 10:47:27 +0200
Subject: [PATCH 3/4] update ace

---
 common/ace | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/ace b/common/ace
index 45f2fe998fb..2f80f6ffaed 160000
--- a/common/ace
+++ b/common/ace
@@ -1 +1 @@
-Subproject commit 45f2fe998fb815baa17299cec1d17a9e058f14f4
+Subproject commit 2f80f6ffaeda960a6b86e4e02d7156c9a739a623

From 159779cc8725d0965d20a0d1bed5b7aeadb2453c Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@ajax.org>
Date: Fri, 1 Oct 2010 10:47:54 +0200
Subject: [PATCH 4/4] * Fixed changed notification

---
 client/ext/editors/editors.js       | 11 ++++++-----
 client/ext/filesystem/filesystem.js |  4 ++--
 client/ext/tree/tree.xml            |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/client/ext/editors/editors.js b/client/ext/editors/editors.js
index f0fcd00ec5c..82d2fc0e7e6 100644
--- a/client/ext/editors/editors.js
+++ b/client/ext/editors/editors.js
@@ -192,7 +192,7 @@ return ext.register("ext/editors/editors", {
             editorPage = tabEditors.getPage(editor.path);
 
         //Create Fake Page
-        var model, fake = tabEditors.add(filename, filepath, editor.path, null, function(page){
+        var model, fake = tabEditors.add("{[@name] + ([@changed] == 1 ? '*' : '')}", filepath, editor.path, null, function(page){
             page.contentType    = contentType;
             page.$at            = new apf.actiontracker();
             model = page.$model = new apf.model();
@@ -203,9 +203,7 @@ return ext.register("ext/editors/editors", {
             var val = (this.undolength ? 1 : undefined);
             if (fake.changed != val) {
                 fake.changed = val;
-                var filename = apf.getFilename(model.data.getAttribute("path"));
-                fake.setAttribute("caption", filename + (val ? "*" : ""));
-                model.setQueryValue("@name", filename + (val ? "*" : ""));
+                model.setQueryValue("@changed", (val ? "1" : "0"));
             }
         });
 
@@ -356,7 +354,10 @@ return ext.register("ext/editors/editors", {
                     var file = pages[i].$model.data;
                     if (file.getAttribute("debug"))
                         continue;
-                    pNode.appendChild(apf.xmldb.cleanNode(file.cloneNode(false)));
+                    
+                    var copy = apf.xmldb.cleanNode(file.cloneNode(false));
+                    copy.removeAttribute("changed");
+                    pNode.appendChild(copy);
                 }
             }
 
diff --git a/client/ext/filesystem/filesystem.js b/client/ext/filesystem/filesystem.js
index 2388e7fea80..5fb6da0468b 100644
--- a/client/ext/filesystem/filesystem.js
+++ b/client/ext/filesystem/filesystem.js
@@ -97,7 +97,7 @@ return ext.register("ext/filesystem/filesystem", {
             page = tabEditors.getPage(extra.originalArgs[1]);
         apf.xmldb.setAttribute(node, "path", base + extra.originalArgs[0]);
         if (page) {
-            page.setAttribute("caption", node.getAttribute("name"));
+            //page.setAttribute("caption", node.getAttribute("name"));
             page.setAttribute("id", base + extra.originalArgs[0]);
         }
     },
@@ -108,7 +108,7 @@ return ext.register("ext/filesystem/filesystem", {
             var node = trFiles.xmlRoot.selectSingleNode("//folder[@path='" + extra.originalArgs[1] + "']"),
                 page = tabEditors.getPage(extra.originalArgs[0]);
             if (page) {
-                page.setAttribute("caption", node.getAttribute("name"));
+                //page.setAttribute("caption", node.getAttribute("name"));
                 page.setAttribute("id", extra.originalArgs[1]);
             }
         }
diff --git a/client/ext/tree/tree.xml b/client/ext/tree/tree.xml
index 4c2bdb0971b..db9622f110d 100644
--- a/client/ext/tree/tree.xml
+++ b/client/ext/tree/tree.xml
@@ -31,7 +31,7 @@
           contextmenu="mnuCtxTree" multiselect="true" reselectable="true">
             <a:each match="[project|file|folder]" sort="[@name]" sort-method="filesort">
                 <a:insert match="[folder]" get="{location.host and davProject.readdir([@path])}" />
-                <a:caption match="[@name]" />
+                <a:caption match="[@name]" value="{[.] + ([../@changed] == 1 ? '*' : '')}" />
                 <a:icon match="[folder|project]" value="folder.png" />
                 <a:icon match="[file]" value="{getIcon(%[.])}" />
                 <a:expanded match="[project]" />