From 9c61493a12a76448e85dbf48792e585550f2be8b Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Tue, 31 Jan 2017 09:58:35 +0200 Subject: [PATCH] Updated persona tab to Polymer 1 --- rpg-docs/client/globalHelpers/evaluate.js | 8 ++ rpg-docs/client/style/cards.css | 6 +- .../views/character/features/features.html | 2 +- .../views/character/features/features.js | 5 - .../personaDetailsDialog.html | 28 +++-- .../personaDetailsDialog.js | 39 +++---- .../views/character/persona/persona.html | 103 ++++++++---------- .../client/views/character/persona/persona.js | 12 +- .../persona/textDialog/textDialog.html | 9 +- .../persona/textDialog/textDialog.js | 17 ++- .../proficiencyListItem.html | 6 +- .../proficiencyListItem.js | 8 +- .../dialogStack/dialogStack.css | 4 + 13 files changed, 116 insertions(+), 131 deletions(-) diff --git a/rpg-docs/client/globalHelpers/evaluate.js b/rpg-docs/client/globalHelpers/evaluate.js index df6000d3..d986b1f0 100644 --- a/rpg-docs/client/globalHelpers/evaluate.js +++ b/rpg-docs/client/globalHelpers/evaluate.js @@ -23,3 +23,11 @@ Template.registerHelper("evaluateSignedSpaced", function(charId, string) { Template.registerHelper("evaluateString", function(charId, string) { return evaluateString(charId, string); }); + +Template.registerHelper("evaluateShortString", function(charId, string) { + if (_.isString(string)){ + return evaluateString( + charId, string.split(/^( *[-*_]){3,} *(?:\n+|$)/m)[0] + ); + } +}); diff --git a/rpg-docs/client/style/cards.css b/rpg-docs/client/style/cards.css index 39067162..c38dfbb2 100644 --- a/rpg-docs/client/style/cards.css +++ b/rpg-docs/client/style/cards.css @@ -45,7 +45,7 @@ padding: 16px 0; } -.card .bottom.list .subhead { +.card .bottom.list .paper-font-subhead { color: rgba(0,0,0,0.54); font-size: 14px; font-weight: 500; @@ -79,3 +79,7 @@ .card .left paper-icon-button[disabled] { color: rgba(255, 255, 255, 0.2); } + +.card img, .card iron-image { + max-width: 100%; +} diff --git a/rpg-docs/client/views/character/features/features.html b/rpg-docs/client/views/character/features/features.html index 0da844f0..cda72b1e 100644 --- a/rpg-docs/client/views/character/features/features.html +++ b/rpg-docs/client/views/character/features/features.html @@ -102,7 +102,7 @@ {{#if description}}
- {{#markdown}}{{evaluateString charId shortDescription}}{{/markdown}} + {{#markdown}}{{evaluateShortString charId description}}{{/markdown}}
{{/if}} {{#if hasUses}} diff --git a/rpg-docs/client/views/character/features/features.js b/rpg-docs/client/views/character/features/features.js index b54f62a9..ecf54782 100644 --- a/rpg-docs/client/views/character/features/features.js +++ b/rpg-docs/client/views/character/features/features.js @@ -3,11 +3,6 @@ Template.features.helpers({ var features = Features.find({charId: this._id}, {sort: {color: 1, name: 1}}); return features; }, - shortDescription: function() { - if (_.isString(this.description)){ - return this.description.split(/^( *[-*_]){3,} *(?:\n+|$)/m)[0]; - } - }, hasUses: function(){ return this.usesValue() > 0; }, diff --git a/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.html b/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.html index 93900df5..38f0c332 100644 --- a/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.html +++ b/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.html @@ -2,10 +2,9 @@ {{#baseDialog title=name class="deep-purple white-text" hideColor="true" hideDelete="true" startEditing=startEditing}} {{#with char}}
{{alignment}} {{gender}} {{race}}
- + {{/with}} {{else}} {{#with char}} @@ -15,22 +14,21 @@ diff --git a/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js b/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js index 063eaea6..018525dc 100644 --- a/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js +++ b/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js @@ -1,7 +1,3 @@ -Template.personaDetailsEdit.onRendered(function(){ - updatePolymerInputs(this); -}); - Template.personaDetailsDialog.helpers({ char: function() { return Characters.findOne( @@ -11,25 +7,20 @@ Template.personaDetailsDialog.helpers({ } }); +inputHandler = (field) => _.debounce(function(event){ + var input = event.currentTarget.value; + Characters.update(this._id, { + $set: {[field]: input} + }, { + removeEmptyStrings: false, + trimStrings: false, + }); +}, 300); + Template.personaDetailsEdit.events({ - "change #nameInput": function(event){ - var input = event.currentTarget.value; - Characters.update(this._id, {$set: {name: input}}); - }, - "change #alignmentInput": function(event){ - var input = event.currentTarget.value; - Characters.update(this._id, {$set: {alignment: input}}); - }, - "change #genderInput": function(event){ - var input = event.currentTarget.value; - Characters.update(this._id, {$set: {gender: input}}); - }, - "change #raceInput": function(event){ - var input = event.currentTarget.value; - Characters.update(this._id, {$set: {race: input}}); - }, - "change #pictureInput": function(event){ - var input = event.currentTarget.value; - Characters.update(this._id, {$set: {picture: input}}); - }, + "input #nameInput, change #nameInput": inputHandler("name"), + "input #alignmentInput, change #alignmentInput": inputHandler("alignment"), + "input #genderInput, change #genderInput": inputHandler("gender"), + "input #raceInput, change #raceInput": inputHandler("race"), + "input #pictureInput, change #pictureInput": inputHandler("picture"), }); diff --git a/rpg-docs/client/views/character/persona/persona.html b/rpg-docs/client/views/character/persona/persona.html index 3f74e0b9..327e3053 100644 --- a/rpg-docs/client/views/character/persona/persona.html +++ b/rpg-docs/client/views/character/persona/persona.html @@ -1,74 +1,63 @@