From 24f48011dc3950412c6062e886dec8f9085ecb75 Mon Sep 17 00:00:00 2001 From: Joe Wroten Date: Fri, 12 Aug 2016 15:53:27 -0500 Subject: [PATCH] Modified how spell details are added/displayed to be more friendly with other systems --- assets/app.css | 25 ++- assets/print.css | 8 + dist/app.js | 24 ++- dist/view.js | 319 ++++++++++++-------------------- dist/view.js.map | 2 +- src/app.js | 24 ++- src/views/spell-details.monk | 54 ++---- src/views/spell-list-print.monk | 17 +- src/views/spell-list.monk | 38 ++-- 9 files changed, 237 insertions(+), 274 deletions(-) diff --git a/assets/app.css b/assets/app.css index 6592e3d..1722c86 100644 --- a/assets/app.css +++ b/assets/app.css @@ -89,11 +89,34 @@ ol { padding: 0 2rem; } -[data-template=spell-details] .description { +#description { + margin: 0; max-height: 13em; overflow: auto; } +#description br:last-of-type { + display: none; +} + +#description p:last-of-type { + margin-bottom: 0; +} + +#copy { + width: 100%; +} + +#details { + columns: 2; + padding: 0; + list-style-type: none; +} + +#details strong { + text-transform: capitalize; +} + .mdl-layout__header [data-action-details=""] { display: none; position: absolute; diff --git a/assets/print.css b/assets/print.css index 501a3c8..50a5a72 100644 --- a/assets/print.css +++ b/assets/print.css @@ -34,4 +34,12 @@ .spell-description br { display: none; } + + #details { + font-size: 8pt; + margin: 0; + columns: 3; + padding: 0; + list-style-type: none; + } } diff --git a/dist/app.js b/dist/app.js index 5cae781..bdfba21 100644 --- a/dist/app.js +++ b/dist/app.js @@ -19,6 +19,7 @@ const debounce = (func, wait, immediate) => { }; const el = id => $(`[data-template=${ id }]`)[0] || console.error('Unable to render to', id); const clone = obj => JSON.parse(JSON.stringify(obj)); +const basicDetails = ['level', 'range', 'duration', 'casting_time', 'saving_throw', 'aoe', 'source']; /** * Global store and view holders @@ -163,7 +164,6 @@ const initSpells = s => s.map((spell, i) => { spell.selected = false; spell.ranking = 0; spell.level = parseInt(spell.level) ? spell.level : 0; - spell.prettyLevel = spell.level === 0 ? 'C' : spell.level; return spell; }); @@ -247,6 +247,17 @@ const spellDetails = name => { } else { let data = clone(store.spells.find(spell => name === spell.name)); data.description = descriptionPrettifier(data.description); + data.details = basicDetails.map(detail => { + if (data[detail]) { + return { + label: detail.replace('_', ' '), + value: data[detail] + }; + } + }); + if (data.components && data.components.raw) { + data.details.push({ label: 'components', value: data.components.raw }); + } view.spell_details.update({ data, @@ -282,6 +293,17 @@ const renderPrint = () => { .map(spell => { spell = clone(spell); spell.description = descriptionPrettifier(spell.description); + spell.details = basicDetails.map(detail => { + if (spell[detail]) { + return { + label: detail.replace('_', ' '), + value: spell[detail] + }; + } + }); + if (spell.components && spell.components.raw) { + spell.details.push({ label: 'components', value: spell.components.raw }); + } return spell; }); view.spell_list_print.update({ data: selectedSpells }); diff --git a/dist/view.js b/dist/view.js index 5a2c50e..0a55630 100644 --- a/dist/view.js +++ b/dist/view.js @@ -335,38 +335,14 @@ function spell_details_if0() { var i1 = document.createElement('i'); var h52 = document.createElement('h5'); var text3 = document.createTextNode(''); - var p4 = document.createElement('p'); + var ul4 = document.createElement('ul'); + var children0 = new Monkberry.Map(); + var p5 = document.createElement('p'); var unsafeNodes0 = []; - var div5 = document.createElement('div'); - var ul6 = document.createElement('ul'); - var li7 = document.createElement('li'); - var strong8 = document.createElement('strong'); - var text9 = document.createTextNode(''); - var li10 = document.createElement('li'); - var strong11 = document.createElement('strong'); - var text12 = document.createTextNode(''); - var li13 = document.createElement('li'); - var strong14 = document.createElement('strong'); - var text15 = document.createTextNode(''); - var for0 = document.createComment('if'); - var child0 = {}; - var ul16 = document.createElement('ul'); - var li17 = document.createElement('li'); - var strong18 = document.createElement('strong'); - var text19 = document.createTextNode(''); - var li20 = document.createElement('li'); - var strong21 = document.createElement('strong'); - var text22 = document.createTextNode('Cantrip'); - var li23 = document.createElement('li'); - var strong24 = document.createElement('strong'); - var span25 = document.createElement('span'); - var text26 = document.createTextNode(''); - var for1 = document.createComment('if'); - var child2 = {}; - var div27 = document.createElement('div'); - var label28 = document.createElement('label'); - var i29 = document.createElement('i'); - var input30 = document.createElement('input'); + var div6 = document.createElement('div'); + var label7 = document.createElement('label'); + var i8 = document.createElement('i'); + var input9 = document.createElement('input'); // Construct dom i1.appendChild(document.createTextNode("close")); @@ -376,86 +352,45 @@ function spell_details_if0() { button0.setAttribute("class", "mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab"); h52.appendChild(text3); h52.setAttribute("class", "mdl-typography--display-1 mdl-color-text--teal-600"); - p4.setAttribute("class", "description"); - strong8.appendChild(document.createTextNode("Range: ")); - li7.appendChild(strong8); - li7.appendChild(text9); - strong11.appendChild(document.createTextNode("Casting Time: ")); - li10.appendChild(strong11); - li10.appendChild(text12); - strong14.appendChild(document.createTextNode("Duration: ")); - li13.appendChild(strong14); - li13.appendChild(text15); - ul6.appendChild(li7); - ul6.appendChild(li10); - ul6.appendChild(li13); - ul6.appendChild(for0); - ul6.setAttribute("class", "right mdl-cell mdl-cell--6-col"); - strong18.appendChild(document.createTextNode("School: ")); - li17.appendChild(strong18); - li17.appendChild(text19); - strong21.appendChild(document.createTextNode("Spell Level: ")); - li20.appendChild(strong21); - li20.appendChild(text22); - strong24.appendChild(document.createTextNode("Class: ")); - span25.appendChild(text26); - span25.setAttribute("class", "classes"); - li23.appendChild(strong24); - li23.appendChild(span25); - ul16.appendChild(li17); - ul16.appendChild(li20); - ul16.appendChild(li23); - ul16.appendChild(for1); - ul16.setAttribute("class", "left mdl-cell mdl-cell--6-col"); - i29.appendChild(document.createTextNode("content_copy")); - i29.setAttribute("class", "material-icons"); - label28.appendChild(i29); - label28.setAttribute("class", "mdl-button mdl-js-button mdl-button--icon copy-to-clipboard"); - label28.setAttribute("for", "share-url"); - label28.setAttribute("data-clipboard-target", "#share-url"); - input30.setAttribute("readonly", ""); - input30.setAttribute("class", "mdl-textfield__input"); - input30.setAttribute("type", "text"); - input30.id = "share-url"; - div27.appendChild(label28); - div27.appendChild(input30); - div27.setAttribute("class", "mdl-textfield mdl-js-textfield"); - div5.appendChild(ul6); - div5.appendChild(ul16); - div5.appendChild(div27); - div5.setAttribute("class", "mdl-grid"); + ul4.id = "details"; + p5.id = "description"; + i8.appendChild(document.createTextNode("content_copy")); + i8.setAttribute("class", "material-icons"); + label7.appendChild(i8); + label7.setAttribute("class", "mdl-button mdl-js-button mdl-button--icon copy-to-clipboard"); + label7.setAttribute("for", "share-url"); + label7.setAttribute("data-clipboard-target", "#share-url"); + input9.setAttribute("readonly", ""); + input9.setAttribute("class", "mdl-textfield__input"); + input9.setAttribute("type", "text"); + input9.id = "share-url"; + div6.appendChild(label7); + div6.appendChild(input9); + div6.setAttribute("class", "mdl-textfield mdl-js-textfield"); + div6.id = "copy"; // Update functions this.__update__ = { data: function (data) { text3.textContent = data.name; - __unsafe(p4, unsafeNodes0, data.description); - text9.textContent = data.range; - text12.textContent = data.casting_time; - text15.textContent = data.duration; - Monkberry.cond(_this, for0, child0, spell_details_if0_if0, data.ritual); - text19.textContent = data.school; - text22.textContent = (data.level) || ('Cantrip'); - text26.textContent = data.classes.join(', '); - Monkberry.cond(_this, for1, child2, spell_details_if0_if2, (data.components) && (data.components.raw)); + Monkberry.loop(_this, ul4, children0, spell_details_if0_for0, data.details, {"value":"detail"}); + __unsafe(p5, unsafeNodes0, data.description); }, url: function (url) { - input30.value = url;; + input9.value = url;; } }; // On update actions this.onUpdate = function (__data__) { - if (child0.ref) { - child0.ref.update(__data__); - } - if (child2.ref) { - child2.ref.update(__data__); - } + children0.forEach(function (view) { + view.update(__data__); + view.update(view.__state__); + }); }; // Set root nodes - this.nodes = [button0, h52, p4, div5]; + this.nodes = [button0, h52, ul4, p5, div6]; } spell_details_if0.prototype = Object.create(Monkberry.prototype); spell_details_if0.prototype.constructor = spell_details_if0; @@ -473,56 +408,39 @@ spell_details_if0.prototype.update = function (__data__) { /** * @class */ -function spell_details_if0_if0() { - Monkberry.call(this); - - // Create elements - var li0 = document.createElement('li'); - - // Construct dom - li0.appendChild(document.createTextNode("Ritual")); - - // Set root nodes - this.nodes = [li0]; -} -spell_details_if0_if0.prototype = Object.create(Monkberry.prototype); -spell_details_if0_if0.prototype.constructor = spell_details_if0_if0; -spell_details_if0_if0.pool = []; -spell_details_if0_if0.prototype.update = function (__data__) { -}; - -/** - * @class - */ -function spell_details_if0_if2() { +function spell_details_if0_for0() { Monkberry.call(this); + this.__state__ = {}; // Create elements var li0 = document.createElement('li'); var strong1 = document.createElement('strong'); var text2 = document.createTextNode(''); + var text3 = document.createTextNode(''); // Construct dom - strong1.appendChild(document.createTextNode("Components: ")); + strong1.appendChild(text2); li0.appendChild(strong1); - li0.appendChild(text2); + li0.appendChild(document.createTextNode(" ")); + li0.appendChild(text3); // Update functions this.__update__ = { - data: function (data) { - text2.textContent = data.components.raw; + detail: function (detail) { + text2.textContent = detail.label; + text3.textContent = detail.value; } }; // Set root nodes this.nodes = [li0]; } -spell_details_if0_if2.prototype = Object.create(Monkberry.prototype); -spell_details_if0_if2.prototype.constructor = spell_details_if0_if2; -spell_details_if0_if2.pool = []; -spell_details_if0_if2.prototype.update = function (__data__) { - if (__data__.data !== undefined) { - this.__update__.data(__data__.data); +spell_details_if0_for0.prototype = Object.create(Monkberry.prototype); +spell_details_if0_for0.prototype.constructor = spell_details_if0_for0; +spell_details_if0_for0.pool = []; +spell_details_if0_for0.prototype.update = function (__data__) { + if (__data__.detail !== undefined && __data__.__index__ !== undefined) { + this.__update__.detail(__data__.detail); } }; @@ -610,16 +528,8 @@ function spell_list_print_for0() { var td4 = document.createElement('td'); var text5 = document.createTextNode(''); var td6 = document.createElement('td'); - var strong7 = document.createElement('strong'); - var text8 = document.createTextNode(''); - var strong9 = document.createElement('strong'); - var text10 = document.createTextNode(''); - var strong11 = document.createElement('strong'); - var text12 = document.createTextNode(''); - var for0 = document.createComment('if'); - var child0 = {}; - var for1 = document.createComment('if'); - var child2 = {}; + var ul7 = document.createElement('ul'); + var children0 = new Monkberry.Map(); var unsafe0 = document.createComment('unsafe'); var unsafeNodes0 = []; @@ -629,17 +539,8 @@ function spell_list_print_for0() { td1.setAttribute("class", "spell-name"); td4.appendChild(text5); td4.setAttribute("class", "spell-level"); - strong7.appendChild(document.createTextNode(" Range: ")); - strong9.appendChild(document.createTextNode(" Casting Time: ")); - strong11.appendChild(document.createTextNode(" Duration: ")); - td6.appendChild(strong7); - td6.appendChild(text8); - td6.appendChild(strong9); - td6.appendChild(text10); - td6.appendChild(strong11); - td6.appendChild(text12); - td6.appendChild(for0); - td6.appendChild(for1); + ul7.id = "details"; + td6.appendChild(ul7); td6.appendChild(unsafe0); td6.setAttribute("class", "spell-description"); tr0.appendChild(td1); @@ -651,23 +552,17 @@ function spell_list_print_for0() { spell: function (spell) { text3.textContent = spell.name; text5.textContent = spell.level; - text8.textContent = spell.range; - text10.textContent = spell.casting_time; - text12.textContent = spell.duration; - Monkberry.cond(_this, for0, child0, spell_list_print_for0_if0, (spell.components) && (spell.components.raw)); - Monkberry.cond(_this, for1, child2, spell_list_print_for0_if2, spell.ritual); + Monkberry.loop(_this, ul7, children0, spell_list_print_for0_for0, spell.details, {"value":"detail"}); __unsafe(unsafe0, unsafeNodes0, spell.description); } }; // On update actions this.onUpdate = function (__data__) { - if (child0.ref) { - child0.ref.update(__data__); - } - if (child2.ref) { - child2.ref.update(__data__); - } + children0.forEach(function (view) { + view.update(__data__); + view.update(view.__state__); + }); }; // Set root nodes @@ -686,56 +581,42 @@ spell_list_print_for0.prototype.update = function (__data__) { /** * @class */ -function spell_list_print_for0_if0() { +function spell_list_print_for0_for0() { Monkberry.call(this); + this.__state__ = {}; // Create elements - var strong0 = document.createElement('strong'); - var text1 = document.createTextNode(''); + var li0 = document.createElement('li'); + var strong1 = document.createElement('strong'); + var text2 = document.createTextNode(''); + var text3 = document.createTextNode(''); // Construct dom - strong0.appendChild(document.createTextNode(" Components: ")); + strong1.appendChild(text2); + li0.appendChild(strong1); + li0.appendChild(document.createTextNode(" ")); + li0.appendChild(text3); // Update functions this.__update__ = { - spell: function (spell) { - text1.textContent = spell.components.raw; + detail: function (detail) { + text2.textContent = detail.label; + text3.textContent = detail.value; } }; // Set root nodes - this.nodes = [strong0, text1]; + this.nodes = [li0]; } -spell_list_print_for0_if0.prototype = Object.create(Monkberry.prototype); -spell_list_print_for0_if0.prototype.constructor = spell_list_print_for0_if0; -spell_list_print_for0_if0.pool = []; -spell_list_print_for0_if0.prototype.update = function (__data__) { - if (__data__.spell !== undefined) { - this.__update__.spell(__data__.spell); +spell_list_print_for0_for0.prototype = Object.create(Monkberry.prototype); +spell_list_print_for0_for0.prototype.constructor = spell_list_print_for0_for0; +spell_list_print_for0_for0.pool = []; +spell_list_print_for0_for0.prototype.update = function (__data__) { + if (__data__.detail !== undefined && __data__.__index__ !== undefined) { + this.__update__.detail(__data__.detail); } }; -/** - * @class - */ -function spell_list_print_for0_if2() { - Monkberry.call(this); - - // Create elements - var strong0 = document.createElement('strong'); - - // Construct dom - strong0.appendChild(document.createTextNode(" Ritual")); - - // Set root nodes - this.nodes = [strong0]; -} -spell_list_print_for0_if2.prototype = Object.create(Monkberry.prototype); -spell_list_print_for0_if2.prototype.constructor = spell_list_print_for0_if2; -spell_list_print_for0_if2.pool = []; -spell_list_print_for0_if2.prototype.update = function (__data__) { -}; - window.spell_list_print = spell_list_print; /** @@ -827,6 +708,44 @@ spell_list_if0.prototype.update = function (__data__) { function spell_list_if0_for0() { Monkberry.call(this); this.__state__ = {}; + var _this = this; + + // Create elements + var for0 = document.createComment('if'); + var child0 = {}; + + // Update functions + this.__update__ = { + spell: function (spell) { + Monkberry.cond(_this, for0, child0, spell_list_if0_for0_if0, spell.name); + } + }; + + // On update actions + this.onUpdate = function (__data__) { + if (child0.ref) { + child0.ref.update(__data__); + } + }; + + // Set root nodes + this.nodes = [for0]; +} +spell_list_if0_for0.prototype = Object.create(Monkberry.prototype); +spell_list_if0_for0.prototype.constructor = spell_list_if0_for0; +spell_list_if0_for0.pool = []; +spell_list_if0_for0.prototype.update = function (__data__) { + if (__data__.spell !== undefined && __data__.__index__ !== undefined) { + this.__update__.spell(__data__.spell); + } + this.onUpdate(__data__); +}; + +/** + * @class + */ +function spell_list_if0_for0_if0() { + Monkberry.call(this); // Create elements var tr0 = document.createElement('tr'); @@ -867,7 +786,7 @@ function spell_list_if0_for0() { input3.value = spell.name;; text6.textContent = spell.name; text8.textContent = spell.school; - text10.textContent = spell.prettyLevel; + text10.textContent = spell.level; tr0.setAttribute("data-action-details", spell.name);; } }; @@ -875,11 +794,11 @@ function spell_list_if0_for0() { // Set root nodes this.nodes = [tr0]; } -spell_list_if0_for0.prototype = Object.create(Monkberry.prototype); -spell_list_if0_for0.prototype.constructor = spell_list_if0_for0; -spell_list_if0_for0.pool = []; -spell_list_if0_for0.prototype.update = function (__data__) { - if (__data__.spell !== undefined && __data__.__index__ !== undefined) { +spell_list_if0_for0_if0.prototype = Object.create(Monkberry.prototype); +spell_list_if0_for0_if0.prototype.constructor = spell_list_if0_for0_if0; +spell_list_if0_for0_if0.pool = []; +spell_list_if0_for0_if0.prototype.update = function (__data__) { + if (__data__.spell !== undefined) { this.__update__.spell(__data__.spell); } }; diff --git a/dist/view.js.map b/dist/view.js.map index e65fa8a..5ddb93f 100644 --- a/dist/view.js.map +++ b/dist/view.js.map @@ -1 +1 @@ -{"version":3,"sources":["class-list.monk","search-field.monk","spell-details.monk","spell-list-print.monk","spell-list.monk","system-list.monk","table-sort.monk"],"names":[],"mappings":"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","file":"view.js"} \ No newline at end of file +{"version":3,"sources":["class-list.monk","search-field.monk","spell-details.monk","spell-list-print.monk","spell-list.monk","system-list.monk","table-sort.monk"],"names":[],"mappings":"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","file":"view.js"} \ No newline at end of file diff --git a/src/app.js b/src/app.js index 77a43e8..6aac5fc 100644 --- a/src/app.js +++ b/src/app.js @@ -20,6 +20,7 @@ const debounce = (func, wait, immediate) => { }; const el = id => $(`[data-template=${id}]`)[0] || console.error('Unable to render to', id); const clone = obj => JSON.parse(JSON.stringify(obj)); +const basicDetails = ['level', 'range', 'duration', 'casting_time', 'saving_throw', 'aoe', 'source']; /** * Global store and view holders @@ -164,7 +165,6 @@ const initSpells = s => s.map((spell, i) => { spell.selected = false; spell.ranking = 0; spell.level = parseInt(spell.level) ? spell.level : 0; - spell.prettyLevel = spell.level === 0 ? 'C' : spell.level; return spell; }); @@ -256,6 +256,17 @@ const spellDetails = name => { } else { let data = clone(store.spells.find(spell => name === spell.name)); data.description = descriptionPrettifier(data.description); + data.details = basicDetails.map(detail => { + if (data[detail]) { + return { + label: detail.replace('_', ' '), + value: data[detail] + }; + } + }); + if (data.components && data.components.raw) { + data.details.push({label: 'components', value: data.components.raw}); + } view.spell_details.update({ data, @@ -293,6 +304,17 @@ const renderPrint = () => { .map(spell => { spell = clone(spell); spell.description = descriptionPrettifier(spell.description); + spell.details = basicDetails.map(detail => { + if (spell[detail]) { + return { + label: detail.replace('_', ' '), + value: spell[detail] + }; + } + }); + if (spell.components && spell.components.raw) { + spell.details.push({label: 'components', value: spell.components.raw}); + } return spell; }); view.spell_list_print.update({data: selectedSpells}); diff --git a/src/views/spell-details.monk b/src/views/spell-details.monk index f844ca6..f1d1ac3 100644 --- a/src/views/spell-details.monk +++ b/src/views/spell-details.monk @@ -3,52 +3,20 @@ close
{{ data.name }}
-

{% unsafe data.description %}

-
- +

{% unsafe data.description %}

-
- - -
+
+ +
{% else %}
diff --git a/src/views/spell-list-print.monk b/src/views/spell-list-print.monk index ba777f0..3f247ab 100644 --- a/src/views/spell-list-print.monk +++ b/src/views/spell-list-print.monk @@ -9,15 +9,14 @@ {{ spell.level }} - Range: {{ spell.range }} - Casting Time: {{ spell.casting_time }} - Duration: {{ spell.duration }} - {% if spell.components && spell.components.raw %} - Components: {{ spell.components.raw }} - {% endif %} - {% if spell.ritual %} - Ritual - {% endif %} +
    + {% for detail of spell.details %} +
  • + {{ detail.label }} {{ detail.value }} +
    • + {% endfor %} +
+ {% unsafe spell.description %} diff --git a/src/views/spell-list.monk b/src/views/spell-list.monk index 0e93600..0e38627 100644 --- a/src/views/spell-list.monk +++ b/src/views/spell-list.monk @@ -1,23 +1,25 @@ {% if data.length %} {% for spell of data %} - - - - - - - {{ spell.name }} - - - - {{ spell.school }} - - - {{ spell.prettyLevel }} - - + {% if spell.name %} + + + + + + + {{ spell.name }} + + + + {{ spell.school }} + + + {{ spell.level }} + + + {% endif %} {% endfor %} {% else %}