From 7913b094b7b50fba562917a530bc04df81e51fe1 Mon Sep 17 00:00:00 2001 From: siikamiika Date: Sun, 15 Oct 2017 10:38:30 +0300 Subject: [PATCH] scrap tagLineBreak option --- ext/bg/js/options.js | 2 -- ext/bg/js/settings.js | 2 -- ext/bg/js/templates.js | 10 +++++----- ext/bg/settings.html | 4 ---- ext/mixed/js/display.js | 1 - tmpl/terms.html | 14 +++++++------- 6 files changed, 12 insertions(+), 21 deletions(-) diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js index 968fbf23..86c4e27c 100644 --- a/ext/bg/js/options.js +++ b/ext/bg/js/options.js @@ -141,7 +141,6 @@ function optionsSetDefaults(options) { popupOffset: 10, showGuide: true, compactTags: false, - tagLineBreak: true, compactGlossaries: false }, @@ -216,7 +215,6 @@ function optionsVersion(options) { options.general.resultOutputMode = 'split'; } options.general.compactTags = false; - options.general.tagLineBreak = true; options.general.compactGlossaries = false; } ]; diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js index 7a8e1fea..37e5126e 100644 --- a/ext/bg/js/settings.js +++ b/ext/bg/js/settings.js @@ -23,7 +23,6 @@ async function formRead() { optionsNew.general.showGuide = $('#show-usage-guide').prop('checked'); optionsNew.general.compactTags = $('#compact-tags').prop('checked'); - optionsNew.general.tagLineBreak = $('#tag-line-break').prop('checked'); optionsNew.general.compactGlossaries = $('#compact-glossaries').prop('checked'); optionsNew.general.resultOutputMode = $('#result-output-mode').val(); optionsNew.general.audioSource = $('#audio-playback-source').val(); @@ -130,7 +129,6 @@ async function onReady() { $('#show-usage-guide').prop('checked', options.general.showGuide); $('#compact-tags').prop('checked', options.general.compactTags); - $('#tag-line-break').prop('checked', options.general.tagLineBreak); $('#compact-glossaries').prop('checked', options.general.compactGlossaries); $('#result-output-mode').val(options.general.resultOutputMode); $('#audio-playback-source').val(options.general.audioSource); diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js index 95d77194..5b5e63f5 100644 --- a/ext/bg/js/templates.js +++ b/ext/bg/js/templates.js @@ -215,7 +215,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {}); return "
\n" + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.definitionTags : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "
\n"; @@ -438,12 +438,12 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia var stack1; return "
  • " - + ((stack1 = container.invokePartial(partials.definition,depth0,{"name":"definition","hash":{"compactGlossaries":(depths[1] != null ? depths[1].compactGlossaries : depths[1]),"tagLineBreak":(depths[1] != null ? depths[1].tagLineBreak : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "") + + ((stack1 = container.invokePartial(partials.definition,depth0,{"name":"definition","hash":{"compactGlossaries":(depths[1] != null ? depths[1].compactGlossaries : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "") + "
    • \n"; },"58":function(container,depth0,helpers,partials,data) { var stack1; - return ((stack1 = container.invokePartial(partials.definition,((stack1 = (depth0 != null ? depth0.definitions : depth0)) != null ? stack1["0"] : stack1),{"name":"definition","hash":{"compactGlossaries":(depth0 != null ? depth0.compactGlossaries : depth0),"tagLineBreak":(depth0 != null ? depth0.tagLineBreak : depth0)},"data":data,"indent":" ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : ""); + return ((stack1 = container.invokePartial(partials.definition,((stack1 = (depth0 != null ? depth0.definitions : depth0)) != null ? stack1["0"] : stack1),{"name":"definition","hash":{"compactGlossaries":(depth0 != null ? depth0.compactGlossaries : depth0)},"data":data,"indent":" ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : ""); },"60":function(container,depth0,helpers,partials,data,blockParams,depths) { var stack1; @@ -451,7 +451,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia },"61":function(container,depth0,helpers,partials,data) { var stack1; - return ((stack1 = container.invokePartial(partials.definition,depth0,{"name":"definition","hash":{"compactGlossaries":(depth0 != null ? depth0.compactGlossaries : depth0),"tagLineBreak":(depth0 != null ? depth0.tagLineBreak : depth0)},"data":data,"indent":" ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "") + return ((stack1 = container.invokePartial(partials.definition,depth0,{"name":"definition","hash":{"compactGlossaries":(depth0 != null ? depth0.compactGlossaries : depth0)},"data":data,"indent":" ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "") + " "; },"63":function(container,depth0,helpers,partials,data) { var stack1, helper, options, buffer = @@ -469,7 +469,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia return ((stack1 = helpers.unless.call(depth0 != null ? depth0 : (container.nullContext || {}),(data && data.first),{"name":"unless","hash":{},"fn":container.program(67, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "\n" - + ((stack1 = container.invokePartial(partials.term,depth0,{"name":"term","hash":{"compactGlossaries":(depths[1] != null ? depths[1].compactGlossaries : depths[1]),"tagLineBreak":(depths[1] != null ? depths[1].tagLineBreak : depths[1]),"playback":(depths[1] != null ? depths[1].playback : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1]),"merged":(depths[1] != null ? depths[1].merged : depths[1]),"grouped":(depths[1] != null ? depths[1].grouped : depths[1]),"debug":(depths[1] != null ? depths[1].debug : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : ""); + + ((stack1 = container.invokePartial(partials.term,depth0,{"name":"term","hash":{"compactGlossaries":(depths[1] != null ? depths[1].compactGlossaries : depths[1]),"playback":(depths[1] != null ? depths[1].playback : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1]),"merged":(depths[1] != null ? depths[1].merged : depths[1]),"grouped":(depths[1] != null ? depths[1].grouped : depths[1]),"debug":(depths[1] != null ? depths[1].debug : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : ""); },"67":function(container,depth0,helpers,partials,data) { return "
    "; },"69":function(container,depth0,helpers,partials,data) { diff --git a/ext/bg/settings.html b/ext/bg/settings.html index db8f4151..408d5aab 100644 --- a/ext/bg/settings.html +++ b/ext/bg/settings.html @@ -39,10 +39,6 @@ -
    - -
    -
    diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js index daa90b4e..41fe85eb 100644 --- a/ext/mixed/js/display.js +++ b/ext/mixed/js/display.js @@ -239,7 +239,6 @@ class Display { grouped: options.general.resultOutputMode === 'group', merged: options.general.resultOutputMode === 'merge', playback: options.general.audioSource !== 'disabled', - tagLineBreak: options.general.tagLineBreak, compactGlossaries: options.general.compactGlossaries, debug: options.general.debugInfo }; diff --git a/tmpl/terms.html b/tmpl/terms.html index eaae7384..7a464cba 100644 --- a/tmpl/terms.html +++ b/tmpl/terms.html @@ -1,6 +1,6 @@ {{#*inline "definition"}} {{#if definitionTags}} -
    +
    {{#each definitionTags}} {{name}} {{/each}} @@ -100,24 +100,24 @@ {{#if definitions.[1]}}
      {{#each definitions}} -
    1. {{> definition tagLineBreak=../tagLineBreak compactGlossaries=../compactGlossaries}}
      2. +
    2. {{> definition compactGlossaries=../compactGlossaries}}
      3. {{/each}}
    {{else}} - {{> definition definitions.[0] tagLineBreak=tagLineBreak compactGlossaries=compactGlossaries}} + {{> definition definitions.[0] compactGlossaries=compactGlossaries}} {{/if}} {{else if merged}} {{#if definitions.[1]}}
      {{#each definitions}} -
    1. {{> definition tagLineBreak=../tagLineBreak compactGlossaries=../compactGlossaries}}
      2. +
    2. {{> definition compactGlossaries=../compactGlossaries}}
      3. {{/each}}
    {{else}} - {{> definition definitions.[0] tagLineBreak=tagLineBreak compactGlossaries=compactGlossaries}} + {{> definition definitions.[0] compactGlossaries=compactGlossaries}} {{/if}} {{else}} - {{> definition tagLineBreak=tagLineBreak compactGlossaries=compactGlossaries}} + {{> definition compactGlossaries=compactGlossaries}} {{/if}}
    @@ -130,7 +130,7 @@ {{#if definitions}} {{#each definitions}} {{#unless @first}}
    {{/unless}} -{{> term debug=../debug grouped=../grouped merged=../merged addable=../addable playback=../playback tagLineBreak=../tagLineBreak compactGlossaries=../compactGlossaries}} +{{> term debug=../debug grouped=../grouped merged=../merged addable=../addable playback=../playback compactGlossaries=../compactGlossaries}} {{/each}} {{else}}

    No results found.