From 96b41450da9036f0b0a593ba61672c5a6ae68919 Mon Sep 17 00:00:00 2001 From: David Huynh Date: Mon, 25 Oct 2010 20:05:48 +0000 Subject: [PATCH] Re-worked buttons in schema alignment dialog and added change indicator git-svn-id: http://google-refine.googlecode.com/svn/trunk@1687 7d457c2a-affb-35e4-300a-418c747d4874 --- .../dialogs/schema-alignment/dialog.js | 33 ++++++++++++++----- .../schema-alignment-dialog.html | 9 +++-- .../dialogs/schema-alignment/ui-link.js | 1 + .../dialogs/schema-alignment-dialog.less | 5 ++- 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/extensions/freebase/module/scripts/dialogs/schema-alignment/dialog.js b/extensions/freebase/module/scripts/dialogs/schema-alignment/dialog.js index e23fe80a2..39b3bfb6d 100644 --- a/extensions/freebase/module/scripts/dialogs/schema-alignment/dialog.js +++ b/extensions/freebase/module/scripts/dialogs/schema-alignment/dialog.js @@ -166,11 +166,13 @@ SchemaAlignment.createNewRootNode = function() { function SchemaAlignmentDialog(protograph, onDone) { this._onDone = onDone; + this._hasUnsavedChanges = false; + this._createDialog(); - this._reset(protograph); + this._reset(protograph, true); } -SchemaAlignmentDialog.prototype._reset = function(protograph) { +SchemaAlignmentDialog.prototype._reset = function(protograph, initial) { this._originalProtograph = protograph || { rootNodes: [] }; this._protograph = cloneDeep(this._originalProtograph); // this is what can be munched on @@ -193,10 +195,11 @@ SchemaAlignmentDialog.prototype._reset = function(protograph) { )); } - this.preview(); + this.preview(initial); }; SchemaAlignmentDialog.prototype._save = function(onDone) { + var self = this; var protograph = this.getJSON(); Refine.postProcess( @@ -208,7 +211,11 @@ SchemaAlignmentDialog.prototype._save = function(onDone) { { onDone: function() { theProject.overlayModels.freebaseProtograph = protograph; - onDone(); + + self._elmts.statusIndicator.hide(); + self._hasUnsavedChanges = false; + + if (onDone) onDone(); } } ); @@ -217,7 +224,7 @@ SchemaAlignmentDialog.prototype._save = function(onDone) { SchemaAlignmentDialog.prototype._createDialog = function() { var self = this; var frame = $(DOM.loadHTML("freebase", "scripts/dialogs/schema-alignment/schema-alignment-dialog.html")); - var elmts = DOM.bind(frame); + var elmts = this._elmts = DOM.bind(frame); this._level = DialogSystem.showDialog(frame); @@ -225,8 +232,8 @@ SchemaAlignmentDialog.prototype._createDialog = function() { DialogSystem.dismissUntil(self._level - 1); }; - elmts.saveAndCloseButton.click(function() { - self._save(dismiss); + elmts.saveButton.click(function() { + self._save(); }); elmts.saveAndLoadButton.click(function() { self._save(function() { @@ -237,7 +244,11 @@ SchemaAlignmentDialog.prototype._createDialog = function() { elmts.resetButton.click(function() { self._reset(null); }); - elmts.cancelButton.click(dismiss); + elmts.closeButton.click(function() { + if (!self._hasUnsavedChanges || window.confirm("There are unsaved changes. Close anyway?")) { + dismiss(); + } + }); $("#schema-alignment-tabs").tabs(); $("#schema-alignment-tabs-preview-mqllike").css("display", ""); @@ -263,10 +274,14 @@ SchemaAlignmentDialog.prototype.getJSON = function() { }; }; -SchemaAlignmentDialog.prototype.preview = function() { +SchemaAlignmentDialog.prototype.preview = function(initial) { var self = this; this._previewPanes.empty(); + if (!(initial)) { + this._elmts.statusIndicator.show().text("There are unsaved changes."); + this._hasUnsavedChanges = true; + } var protograph = this.getJSON(); $.post( diff --git a/extensions/freebase/module/scripts/dialogs/schema-alignment/schema-alignment-dialog.html b/extensions/freebase/module/scripts/dialogs/schema-alignment/schema-alignment-dialog.html index 89a3992b4..e2d92eaab 100644 --- a/extensions/freebase/module/scripts/dialogs/schema-alignment/schema-alignment-dialog.html +++ b/extensions/freebase/module/scripts/dialogs/schema-alignment/schema-alignment-dialog.html @@ -25,12 +25,17 @@
+ +
- - + + + + +
\ No newline at end of file diff --git a/extensions/freebase/module/scripts/dialogs/schema-alignment/ui-link.js b/extensions/freebase/module/scripts/dialogs/schema-alignment/ui-link.js index 987479542..1825afc40 100644 --- a/extensions/freebase/module/scripts/dialogs/schema-alignment/ui-link.js +++ b/extensions/freebase/module/scripts/dialogs/schema-alignment/ui-link.js @@ -265,6 +265,7 @@ SchemaAlignmentDialog.UILink.prototype._showPropertySuggestPopup = function(elmt if (suggestions.length > 0) { divSearch = $('
') .addClass("schema-alignment-link-menu-section") + .css("margin-bottom", "2em") .html('
Search for a property or pick one below
').appendTo(menu); var createSuggestion = function(suggestion) { diff --git a/extensions/freebase/module/styles/dialogs/schema-alignment-dialog.less b/extensions/freebase/module/styles/dialogs/schema-alignment-dialog.less index beca761e3..11acb2738 100644 --- a/extensions/freebase/module/styles/dialogs/schema-alignment-dialog.less +++ b/extensions/freebase/module/styles/dialogs/schema-alignment-dialog.less @@ -111,6 +111,10 @@ div.schema-alignment-dialog-preview { font-size: 9pt; } +.schema-alignment-status-indicator { + color: #red; +} + /*-------------------------------------------------- * Node dialog *-------------------------------------------------- @@ -138,7 +142,6 @@ div.schema-alignment-dialog-preview { .schema-alignment-link-menu-section { padding: 8px; border-bottom: 1px solid #ddd; - margin-bottom: 3px; } .schema-alignment-link-menu-section-last {