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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Tom Morris 2014-07-03 15:38:21 -04:00
commit 31a3fdb67b
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/freebase/module/scripts/dialogs/freebase-loading-dialog.html
View File

@ -3,7 +3,7 @@
<div class="dialog-body" bind="dialogBody"> <div class="dialog-body" bind="dialogBody">
<div bind="unalignedCase" style="display: none;" class="freebase-loading-tripleloader-message"> <div bind="unalignedCase" style="display: none;" class="freebase-loading-tripleloader-message">
<h2 bind="no_triples_dataset"></h2> <h2 bind="no_triples_dataset"></h2>
<p bind="warning_aligned"><button class="button" bind="alignButton"></button></p> <p bind="warning_aligned"></p><button class="button" bind="alignButton"></button>
</div> </div>
<div bind="functionalCase" style="display: none;"> <div bind="functionalCase" style="display: none;">
<div class="refine-tabs" bind="functionalTabs"> <div class="refine-tabs" bind="functionalTabs">
@ -64,4 +64,4 @@
<button class="button button-primary button-disabled" bind="loadButton" id="freebase-loading-load" disabled></button> <button class="button button-primary button-disabled" bind="loadButton" id="freebase-loading-load" disabled></button>
</td> </td>
</tr></table></div></div> </tr></table></div></div>
</div> </div>

2
main/src/com/google/refine/importing/ImportingJob.java
View File

@ -76,6 +76,8 @@ public class ImportingJob implements Jsonizable {
JSONUtilities.safePut(cfg, "hasData", false); JSONUtilities.safePut(cfg, "hasData", false);
this.config = cfg; this.config = cfg;
lastTouched = System.currentTimeMillis();
dir.mkdirs(); dir.mkdirs();
} }

4
main/webapp/modules/core/scripts/index/parser-interfaces/json-parser-ui.js
View File

@ -66,6 +66,9 @@ Refine.JsonParserUI.prototype.confirmReadyToCreateProject = function() {
}; };
Refine.JsonParserUI.prototype.getOptions = function() { Refine.JsonParserUI.prototype.getOptions = function() {
if(!this._config.recordPath){
this._setRecordPath(this._config.defaultRecordPath);
}
var options = { var options = {
recordPath: this._config.recordPath recordPath: this._config.recordPath
}; };
@ -236,6 +239,7 @@ Refine.JsonParserUI.prototype._showPickRecordNodesUI = function() {
} }
}; };
rootNode = $('<div>').addClass('node').addClass('indented').appendTo(elmts.domContainer); rootNode = $('<div>').addClass('node').addClass('indented').appendTo(elmts.domContainer);
this._config.defaultRecordPath=[ANONYMOUS_NODE_NAME];
renderNode(this._config.dom, rootNode, [ANONYMOUS_NODE_NAME]); renderNode(this._config.dom, rootNode, [ANONYMOUS_NODE_NAME]);
}; };

4
main/webapp/modules/core/scripts/index/parser-interfaces/xml-parser-ui.js
View File

@ -66,6 +66,9 @@ Refine.XmlParserUI.prototype.confirmReadyToCreateProject = function() {
}; };
Refine.XmlParserUI.prototype.getOptions = function() { Refine.XmlParserUI.prototype.getOptions = function() {
if(!this._config.recordPath){
this._setRecordPath(this._config.defaultRecordPath);
}
var options = { var options = {
recordPath: this._config.recordPath recordPath: this._config.recordPath
}; };
@ -229,6 +232,7 @@ Refine.XmlParserUI.prototype._showPickRecordElementsUI = function() {
} }
}; };
if (this._config.dom) { if (this._config.dom) {
this._config.defaultRecordPath=[];
renderNode(this._config.dom, elmts.domContainer, []); renderNode(this._config.dom, elmts.domContainer, []);
} }
}; };