s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made sure busy indicator shows up for GData importing when needed.

Browse Source 
Fixed radio button issue with GData worksheet selection.
Fixed resizing issue with open project action area.
Fixed NullPointerException in RecordModel.

git-svn-id: http://google-refine.googlecode.com/svn/trunk@2198 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
David Huynh 2011-08-12 19:15:58 +00:00
parent 31eaea385d
commit e955ed05ae
6 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/gdata/module/scripts/index/importing-controller.js
View File

@ -45,7 +45,7 @@ Refine.GDataImportingController = function(createProjectUI) {
Refine.CreateProjectUI.controllers.push(Refine.GDataImportingController); Refine.CreateProjectUI.controllers.push(Refine.GDataImportingController);
Refine.GDataImportingController.prototype.startImportingDocument = function(doc) { Refine.GDataImportingController.prototype.startImportingDocument = function(doc) {
var dismiss = DialogSystem.showBusy("Preparing importing job ..."); var dismiss = DialogSystem.showBusy("Preparing ...");
var self = this; var self = this;
$.post( $.post(
@ -188,6 +188,7 @@ Refine.GDataImportingController.prototype._showParsingPanel = function() {
var td0 = $(tr.insertCell(0)).attr('width', '1%'); var td0 = $(tr.insertCell(0)).attr('width', '1%');
var checkbox = $('<input>') var checkbox = $('<input>')
.attr('type', 'radio') .attr('type', 'radio')
.attr('name', 'gdata-importing-parsing-worksheet')
.attr('sheetUrl', this.link) .attr('sheetUrl', this.link)
.appendTo(td0); .appendTo(td0);
if (i === 0) { if (i === 0) {

5
main/src/com/google/refine/model/RecordModel.java
View File

@ -95,7 +95,10 @@ public class RecordModel implements Jsonizable {
throws JSONException { throws JSONException {
writer.object(); writer.object();
writer.key("hasRecords"); writer.value(_records.size() < _rowDependencies.size()); writer.key("hasRecords");
writer.value(
_records != null && _rowDependencies != null &&
_records.size() < _rowDependencies.size());
writer.endObject(); writer.endObject();
} }

2
main/webapp/modules/core/MOD-INF/controller.js
View File

@ -322,6 +322,8 @@ function init() {
"styles/jquery-ui-overrides.less", "styles/jquery-ui-overrides.less",
"styles/common.less", "styles/common.less",
"styles/pure.css", "styles/pure.css",
"styles/util/dialog.less",
"styles/index.less", "styles/index.less",
"styles/index/create-project-ui.less", "styles/index/create-project-ui.less",
"styles/index/open-project-ui.less", "styles/index/open-project-ui.less",

4
main/webapp/modules/core/scripts/index.js
View File

@ -39,13 +39,13 @@ var Refine = {
Refine.selectActionArea = function(id) { Refine.selectActionArea = function(id) {
$('.action-area-tab').removeClass('selected'); $('.action-area-tab').removeClass('selected');
$('.action-area-tab-body').css('visibility', 'hidden').css('z-index', '100'); $('.action-area-tab-body').css('visibility', 'hidden').css('z-index', '50');
for (var i = 0; i < Refine.actionAreas.length; i++) { for (var i = 0; i < Refine.actionAreas.length; i++) {
var actionArea = Refine.actionAreas[i]; var actionArea = Refine.actionAreas[i];
if (id == actionArea.id) { if (id == actionArea.id) {
actionArea.tabElmt.addClass('selected'); actionArea.tabElmt.addClass('selected');
actionArea.bodyElmt.css('visibility', 'visible').css('z-index', '110');; actionArea.bodyElmt.css('visibility', 'visible').css('z-index', '55');;
} }
} }
}; };

1
main/webapp/modules/core/scripts/index/open-project-ui.js
View File

@ -93,6 +93,7 @@ Refine.OpenProjectUI.prototype._fetchProjects = function() {
null, null,
function(data) { function(data) {
self._renderProjects(data); self._renderProjects(data);
self.resize();
}, },
"json" "json"
); );

2
main/webapp/modules/core/styles/util/dialog.less
View File

@ -88,5 +88,5 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.dialog-busy { .dialog-busy {
width: 400px; width: 400px;
border: none; border: none;
.rounded_corners(); .rounded_corners(20px);
} }