Merge pull request #1579 from ajaxorg/revisions_reload_dialog

Revisions: Simplify external change dialog options
gero3 · May 25, 2012 · 67b20d3 · 67b20d3
2 parents 87d99bc + e749377
commit 67b20d3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 33 deletions.
diff --git a/plugins-client/ext.revisions/revisions.js b/plugins-client/ext.revisions/revisions.js
@@ -745,7 +745,6 @@ module.exports = ext.register("ext/revisions/revisions", {
         }
     },
 
-
     /**
      * Revisions#showQuestionWindow(data) -> Void
      * - data (Object): Data about the revision to be potentially submitted, and
@@ -763,7 +762,9 @@ module.exports = ext.register("ext/revisions/revisions", {
         delete data.revision.finalContent;
         delete data.revision.realContent;
 
+        var self = this;
         var finalize = function() {
+            self.changedPaths = [];
             winQuestionRev.hide();
             settings.model.setQueryValue("general/@autosaveenabled", this.prevAutoSaveValue || true);
         };
@@ -804,39 +805,17 @@ module.exports = ext.register("ext/revisions/revisions", {
             return index;
         };
 
-        var self = this;
         var pages = tabEditors.getPages();
-        var page = pages.filter(function(_page) {
-            var pagePath = Util.stripWSFromPath(_page.$model.data.getAttribute("path"));
-            return data.path === pagePath;
-        })[0];
-
         Util.question(
             "File changed, reload tab?",
             "'" + data.path + "' has been modified while you were editing it.",
             "Do you want to reload it?",
-            function YesReload() {
-                var index = reloadAndSave(page);
-                if (index > -1) {
-                    self.changedPaths.splice(index, 1);
-                }
-                setTimeout(finalize);
-            },
             function YesReloadAll() {
                 pages.forEach(reloadAndSave);
-                self.changedPaths = [];
-                setTimeout(finalize);
-            },
-            function NoDontReload() {
-                var index = dontReloadAndStore(page);
-                if (index > -1) {
-                    self.changedPaths.splice(index, 1);
-                }
                 setTimeout(finalize);
             },
             function NoDontReloadAll() {
                 pages.forEach(dontReloadAndStore);
-                self.changedPaths = [];
                 setTimeout(finalize);
             }
         );

diff --git a/plugins-client/ext.revisions/revisions.xml b/plugins-client/ext.revisions/revisions.xml
@@ -28,13 +28,8 @@
         </a:vbox>
 
         <a:hbox edge="6 10 10" pack="end" padding="8">
-            <a:button id="btnQuestionRevYes" default="3" skin="btn-default-css3" class="btn-green">Yes</a:button>
-            <a:filler/>
-            <a:button id="btnQuestionRevNo" skin="btn-default-css3" class="btn-red">No (but keep changes in a revision)</a:button>
-            <a:filler/>
-            <a:button id="btnQuestionRevYesAll" default="3" skin="btn-default-css3" class="btn-green">Yes to all</a:button>
-            <a:filler/>
-            <a:button id="btnQuestionRevNoAll" skin="btn-default-css3" class="btn-red">No to all</a:button>
+            <a:button id="btnQuestionRevYesAll" default="3" skin="btn-default-css3" class="btn-green">Yes</a:button>
+            <a:button id="btnQuestionRevNoAll" skin="btn-default-css3" class="btn-red">No</a:button>
         </a:hbox>
     </a:window>
 

diff --git a/plugins-client/ext.revisions/revisions_util.js b/plugins-client/ext.revisions/revisions_util.js
@@ -156,13 +156,11 @@ exports.getDocPath = function(page) {
     return exports.stripWSFromPath(page.name);
 };
 
-exports.question = function(title, header, msg, onyes, onyesall, onno, onnoall) {
+exports.question = function(title, header, msg, onyesall, onnoall) {
     winQuestionRev.show();
     winQuestionRev.setAttribute("title", title);
     winQuestionRevHeader.$ext.innerHTML = header;
     winQuestionRevMsg.$ext.innerHTML = msg;
-    btnQuestionRevYes.onclick = onyes;
-    btnQuestionRevNo.onclick = onno;
     btnQuestionRevYesAll.onclick = onyesall;
     btnQuestionRevNoAll.onclick = onnoall;
 };