More small fixes to autosave and revisions

Sergi Mansilla · Sergi Mansilla · commit a6e334dfee5b · 2012-07-30T16:47:02.000+02:00
diff --git a/plugins-client/cloud9.core/www/core/util.js b/plugins-client/cloud9.core/www/core/util.js
@@ -11,15 +11,19 @@ var markup = require("text!core/util.xml");
 
 exports.escapeXpathString = function(name){
     if (name.indexOf('"') > -1) {
-        var out = [], parts = name.split('"');
+        var out = [];
+        var parts = name.split('"');
         parts.each(function(part) {
             out.push(part == '' ? "'\"'" : '"' + part + '"');
-        })
+        });
         return "concat(" + out.join(", ") + ")";
     }
     return '"' + name + '"';
-}
+};
 
+exports.isNewPage = function(page) {
+    return parseInt(page.$model.data.getAttribute("newfile"), 10) === 1;
+};
 
 exports.alert = function(title, header, msg, onhide) {
     if (!self.winAlert)
@@ -114,8 +118,9 @@ exports.removeInteractive = function (amlNode) {
         }
         confirm(files.shift());
         return false;
-    } else
+    } else {
         return true;
+    }
 };
 
 var SupportedIcons = {
@@ -149,7 +154,7 @@ var SupportedIcons = {
 
 var contentTypes = {
     "c9search": "text/x-c9search",
-    
+
     "js": "application/javascript",
     "json": "application/json",
     "css": "text/css",
@@ -213,7 +218,7 @@ var contentTypes = {
 
     "sh": "application/x-sh",
     "bash": "application/x-sh",
-    
+
     "xq": "text/x-xquery"
 };
 
diff --git a/plugins-client/ext.autosave/autosave.js b/plugins-client/ext.autosave/autosave.js
@@ -9,6 +9,7 @@ define(function(require, exports, module) {
 
 var ide = require("core/ide");
 var ext = require("core/ext");
+var CoreUtil = require("core/util");
 
 var Save = require("ext/save/save");
 var Util = require("ext/revisions/revisions_util");
@@ -133,7 +134,7 @@ module.exports = ext.register("ext/autosave/autosave", {
             };
         }
 
-        if (!this.isNewPage(page)) {
+        if (!CoreUtil.isNewPage(page)) {
             this.setSaveButtonCaption();
         }
 
@@ -151,7 +152,7 @@ module.exports = ext.register("ext/autosave/autosave", {
 
     onDocChange: function(e, doc) {
         var page = doc.$page;
-        if (page && this.isAutoSaveEnabled && !this.isNewPage(page)) {
+        if (page && this.isAutoSaveEnabled && !CoreUtil.isNewPage(page)) {
             clearTimeout(this.docChangeTimeout);
             this.docChangeTimeout = setTimeout(function(self) {
                 self.setSaveButtonCaption();
@@ -161,10 +162,6 @@ module.exports = ext.register("ext/autosave/autosave", {
         }
     },
 
-    isNewPage: function(page) {
-        return parseInt(page.$model.data.getAttribute("newfile"), 10) === 1;
-    },
-
     setSaveButtonCaption: function(page) {
         if (!self.btnSave)
             return;
diff --git a/plugins-client/ext.revisions/revisions.js b/plugins-client/ext.revisions/revisions.js
@@ -10,6 +10,7 @@ define(function(require, exports, module) {
 //Core dependencies
 var ide = require("core/ide");
 var ext = require("core/ext");
+var CoreUtil = require("core/util");
 
 // APF dependencies
 var editors = require("ext/editors/editors");
@@ -261,7 +262,7 @@ module.exports = ext.register("ext/revisions/revisions", {
     },
 
     $switchToPageModel: function(page) {
-        if (!page || !Util.pageIsCode(page)) {
+        if (!Util.pageIsCode(page)) {
             return;
         }
 
@@ -278,7 +279,7 @@ module.exports = ext.register("ext/revisions/revisions", {
     },
 
     $restoreSelection: function(page, model) {
-        if (page.$showRevisions === true && window.lstRevisions && !this.isNewPage(page)) {
+        if (page.$showRevisions === true && window.lstRevisions && !CoreUtil.isNewPage(page)) {
             var selection = lstRevisions.selection;
             var node = model.data.firstChild;
             if (selection && selection.length === 0 && page.$selectedRevision) {
@@ -348,10 +349,10 @@ module.exports = ext.register("ext/revisions/revisions", {
             return;
 
         var doc = data.doc;
-        var page = doc.$page;
+        var page = doc.$page || tabEditors.getPage();
 
         this.$switchToPageModel(page);
-        if (!this.isNewPage(page)) {
+        if (!CoreUtil.isNewPage(page)) {
             ide.send({
                 command: "revisions",
                 subCommand: "getRevisionHistory",
@@ -707,7 +708,7 @@ module.exports = ext.register("ext/revisions/revisions", {
      **/
     populateModel: function(revObj, model) {
         var page = tabEditors.getPage();
-        if (this.isNewPage(page) || !Util.pageIsCode(page)) {
+        if (CoreUtil.isNewPage(page) || !Util.pageIsCode(page)) {
             return;
         }
 
@@ -1185,10 +1186,6 @@ module.exports = ext.register("ext/revisions/revisions", {
         this.populateModel(revObj, this.model);
     },
 
-    isNewPage: function(page) {
-        return parseInt(page.$model.data.getAttribute("newfile"), 10) === 1;
-    },
-
     show: function() {
         var page = tabEditors.getPage();
         if (!Util.pageIsCode(page)) {
