Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix-checkbox-copy-link-background #154

Merged
merged 1 commit into from
Sep 12, 2016
Merged

fix-checkbox-copy-link-background #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/views/ExportDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ ExportDialog.prototype.invalidateUIByExporter = function () {
var exporter = this.exporterCombo.getSelectedItem();
if (exporter.supportTemplating()) {
var templates = exporter.getTemplates();
console.log(templates);
this.templateCombo.setItems(templates);
this.templateCombo.setDisabled(false);

Expand Down Expand Up @@ -173,6 +174,7 @@ ExportDialog.prototype.setOptionValues = function (valueMap) {


ExportDialog.prototype.getDialogActions = function () {
var thiz = this;
return [
{ type: "cancel", title: "Cancel",
isCloseHandler: true,
Expand All @@ -192,6 +194,8 @@ ExportDialog.prototype.getDialogActions = function () {
options: {}
};

result.options.copyBGLinks = thiz.copyBgLinks.checked;

if (this.propertyEditors) {
for (var name in this.propertyEditors) {
var value = this.propertyEditors[name].getValue();
Expand Down
15 changes: 13 additions & 2 deletions app/views/ExportDialog.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,14 @@
@optionPane.ForcedExporter > @exporterCombo {
display: none;
}
@copyBgLinksBox {
max-height: 2em;
margin-top: 1em;
}
@copyBgLinksBox > label {
min-width: 18em;
}

</style>
<vbox>
<label>Select pages:</label>
Expand All @@ -71,12 +79,15 @@
<ui:ComboManager anon-id="exporterCombo" />
<label>Template:</label>
<ui:ComboManager anon-id="templateCombo" />
<hbox class="InputRow" anon-id="copyBgLinksBox" flex="1">
<input type="checkBox" anon-id="copyBgLinks" checked="true"/>
<label for="copyBgLinks">Copy links from background pages</label>
</hbox>
<hbox anon-id="warningBox">
<i>warning</i>
<div flex="1" anon-id="warningContent"></div>
</hbox>
<label anon-id="optionEditorTitle">Options:</label>
<vbox anon-id="optionEditorPane">
</vbox>
<vbox anon-id="optionEditorPane"></vbox>
</vbox>
</hbox>