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

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);
                 }
             }
 

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]);
             }
         }

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]" />

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"