FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

sliding text clock: BUGFIX - rows defintions skipping out on unsupported isEmpty call

pull/2178/head
adrian w kirk 2022-09-30 11:55:02 +01:00
parent cc551b6496
commit 643b0b92dc
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/slidingtext/slidingtext.js
View File

@ -319,8 +319,9 @@ function initDisplay(settings) {
var row_type_overide = date_formatter.defaultRowTypes(); var row_type_overide = date_formatter.defaultRowTypes();
mergeMaps(row_types,row_type_overide); mergeMaps(row_types,row_type_overide);
mergeMaps(row_types,settings.row_types); mergeMaps(row_types,settings.row_types);
var row_defs = (settings.row_defs != null && !settings.row_defs.isEmpty())? var row_defs = (settings.row_defs != null && settings.row_defs.length > 0)?
settings.row_defs : date_formatter.defaultRowDefs(); settings.row_defs : date_formatter.defaultRowDefs();
console.log("row_defs " + JSON.stringify(row_defs));
row_displays = []; row_displays = [];
for(var i=0; i< row_defs.length; i++){ for(var i=0; i< row_defs.length; i++){
@ -357,7 +358,8 @@ function mergeObjects(obj1, obj2){
const heights = { const heights = {
vsmall: [20,15], vvsmall: [20,15],
vsmall: [23,18],
small: [25,20], small: [25,20],
msmall: [30,22], msmall: [30,22],
medium: [40,25], medium: [40,25],
@ -421,13 +423,13 @@ function create_row_type(row_type, row_def){
scroll_offs.push((row_display)=> row_display.scrollOffToBottom()); scroll_offs.push((row_display)=> row_display.scrollOffToBottom());
} }
var scroll_off; var scroll_off;
if(scroll_offs.size === 0){ if(scroll_offs.length === 0){
scroll_off = (row_display)=> row_display.scrollOffToLeft(); scroll_off = (row_display)=> row_display.scrollOffToLeft();
} else if(scroll_offs.size === 1){ } else if(scroll_offs.length === 1){
scroll_off = scroll_offs[0]; scroll_off = scroll_offs[0];
} else { } else {
scroll_off = (row_display) =>{ scroll_off = (row_display) =>{
var idx = (Math.random() * scroll_off.size) | 0; var idx = (Math.random() * scroll_off.length) | 0;
return scroll_offs[idx](row_display); return scroll_offs[idx](row_display);
}; };
} }

2
apps/slidingtext/slidingtext.locale.en.js
View File

@ -37,7 +37,7 @@ class EnglishDateFormatter extends DateFormatter {
constructor() { constructor() {
super(); super();
this.row_types = { this.row_types = {
small: {size: 'small'} small: {size: 'vsmall'}
}; };
this.row_defs = [ this.row_defs = [
{ {

5
apps/slidingtext/slidingtext.settings.js
View File

@ -13,7 +13,9 @@
date_formatter: 'en', date_formatter: 'en',
row_types: { row_types: {
large:{ large:{
angle_to_horizontal: 90 angle_to_horizontal: 90,
scroll_off: ['down'],
scroll_in: ['up'],
}, },
medium: { medium: {
size: 'msmall' size: 'msmall'
@ -49,7 +51,6 @@
angle_to_horizontal: 0 angle_to_horizontal: 0
}, },
large: { large: {
size: 'vlarge',
angle_to_horizontal: 90, angle_to_horizontal: 90,
speed: 'slow', speed: 'slow',
color: 'major', color: 'major',