git.iko.soy/unity8
on xenial help sign in
Use ternary operators as suggested by Andrea
ae2d1a1Albert Astals Cid
plugins/Dash/CardCreator.js+5−22
compare with xenial
unifiedsplit
@@ -226,12 +226,7 @@ function kHeaderRowCodeGenerator() {
226 }\n';
226 }\n';
227 var args = Array.prototype.slice.call(arguments);
227 var args = Array.prototype.slice.call(arguments);
228 var isCardTool = args.shift();
228 var isCardTool = args.shift();
229− var heightCode;
230− if (!isCardTool) {
231− heightCode = "height: root.fixedHeaderHeight; \n";
229+ var heightCode = isCardTool ? "" : "height: root.fixedHeaderHeight; \n";
232− } else {
233− heightCode = "";
234− }
235 var code = kHeaderRowCodeTemplate.arg(args.shift()).arg(heightCode).arg(args.join(',\n'));
230 var code = kHeaderRowCodeTemplate.arg(args.shift()).arg(heightCode).arg(args.join(',\n'));
236 return code;
231 return code;
237}
232}
@@ -431,11 +426,7 @@ function cardString(template, components, isCardTool) {
431 enabled: %1; \n\
426 enabled: %1; \n\
432 \n'.arg(templateInteractive);
427 \n'.arg(templateInteractive);
433
428
434− if (!isCardTool) {
435− code = code.arg("property int fixedHeaderHeight: -1; \n");
429+ code = code.arg(isCardTool ? "" : "property int fixedHeaderHeight: -1; \n");
436− } else {
437− code = code.arg("");
438− }
439
430
440 var hasArt = components["art"] && components["art"]["field"] || false;
431 var hasArt = components["art"] && components["art"]["field"] || false;
441 var hasSummary = components["summary"] || false;
432 var hasSummary = components["summary"] || false;
@@ -538,12 +529,7 @@ function cardString(template, components, isCardTool) {
538 }
529 }
539
530
540 if (headerAsOverlay) {
531 if (headerAsOverlay) {
541− var headerHeightCode;
532+ var headerHeightCode = isCardTool ? "headerHeight" : "root.fixedHeaderHeight";
542− if (isCardTool) {
543− headerHeightCode = "headerHeight";
544− } else {
545− headerHeightCode = "root.fixedHeaderHeight";
546− }
547 code += kOverlayLoaderCode.arg(asynchronous).arg(headerHeightCode);
533 code += kOverlayLoaderCode.arg(asynchronous).arg(headerHeightCode);
548 }
534 }
549
535
@@ -829,11 +815,8 @@ function cardString(template, components, isCardTool) {
829 } else {
815 } else {
830 audioButtonAnchorsFill = 'undefined';
816 audioButtonAnchorsFill = 'undefined';
831 audioButtonWidth = 'height';
817 audioButtonWidth = 'height';
832− if (isCardTool) {
833− audioButtonHeight = 'headerHeight + 2 * units.gu(1)';
818+ audioButtonHeight = isCardTool ? 'headerHeight + 2 * units.gu(1)'
834− } else {
835− audioButtonHeight = 'root.fixedHeaderHeight + 2 * units.gu(1)';
819+ : 'root.fixedHeaderHeight + 2 * units.gu(1)';
836− }
837 }
820 }
838 code += kAudioButtonCode.arg(audioButtonAnchorsFill).arg(audioButtonWidth).arg(audioButtonHeight);
821 code += kAudioButtonCode.arg(audioButtonAnchorsFill).arg(audioButtonWidth).arg(audioButtonHeight);
839 }
822 }