Freeboard
/
freeboard
mirror of https://github.com/Freeboard/freeboard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

merging updates from https://github.com/Freeboard/freeboard/pull/141

pull/142/head
Vish 2015-08-19 17:00:16 -04:00
parent ea5a4b49c3
commit ba02ee033c
4 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/freeboard+plugins.js
View File

@ -4424,15 +4424,17 @@ freeboard.loadDatasourcePlugin({
var indicatorElement = $('<div class="indicator-light"></div>');
var currentSettings = settings;
var isOn = false;
var onText;
var offText;
function updateState() {
indicatorElement.toggleClass("on", isOn);
if (isOn) {
stateElement.text((_.isUndefined(currentSettings.on_text) ? "" : currentSettings.on_text));
stateElement.text((_.isUndefined(onText) ? (_.isUndefined(currentSettings.on_text) ? "" : currentSettings.on_text) : onText));
}
else {
stateElement.text((_.isUndefined(currentSettings.off_text) ? "" : currentSettings.off_text));
stateElement.text((_.isUndefined(offText) ? (_.isUndefined(currentSettings.off_text) ? "" : currentSettings.off_text) : offText));
}
}
@ -4450,6 +4452,12 @@ freeboard.loadDatasourcePlugin({
if (settingName == "value") {
isOn = Boolean(newValue);
}
if (settingName == "on_text") {
onText = newValue;
}
if (settingName == "off_text") {
offText = newValue;
}
updateState();
}

5
js/freeboard+plugins.min.js vendored
View File

File diff suppressed because one or more lines are too long

14
js/freeboard.plugins.js
View File

@ -1401,15 +1401,17 @@ freeboard.loadDatasourcePlugin({
var indicatorElement = $('<div class="indicator-light"></div>');
var currentSettings = settings;
var isOn = false;
var onText;
var offText;
function updateState() {
indicatorElement.toggleClass("on", isOn);
if (isOn) {
stateElement.text((_.isUndefined(currentSettings.on_text) ? "" : currentSettings.on_text));
stateElement.text((_.isUndefined(onText) ? (_.isUndefined(currentSettings.on_text) ? "" : currentSettings.on_text) : onText));
}
else {
stateElement.text((_.isUndefined(currentSettings.off_text) ? "" : currentSettings.off_text));
stateElement.text((_.isUndefined(offText) ? (_.isUndefined(currentSettings.off_text) ? "" : currentSettings.off_text) : offText));
}
}
@ -1427,6 +1429,12 @@ freeboard.loadDatasourcePlugin({
if (settingName == "value") {
isOn = Boolean(newValue);
}
if (settingName == "on_text") {
onText = newValue;
}
if (settingName == "off_text") {
offText = newValue;
}
updateState();
}

2
js/freeboard.plugins.min.js vendored
View File

File diff suppressed because one or more lines are too long