Skip to content

Fix the error dialog not displaying in the old mobile web UI #1053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
peternewman wants to merge 8 commits into
base: 0.10
Choose a base branch
from
Open

Fix the error dialog not displaying in the old mobile web UI #1053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1cfc592
Fix the error dialog not displaying in the old web UI
peternewman Feb 29, 2016
ba5d0d2
Merge branch 'debian' of https://github.com/peternewman/ola into debian
peternewman Feb 29, 2016
b701ff9
Merge branch '0.10' into debian
peternewman Feb 29, 2016
b615f53
Merge branch '0.10' of https://github.com/OpenLightingProject/ola int…
peternewman Mar 1, 2016
6e75486
Merge branch 'debian' of https://github.com/peternewman/ola into debian
peternewman Mar 1, 2016
754a858
New placeholder for NEWS
peternewman Mar 1, 2016
9986e94
Merge branch '0.10' into debian
peternewman Feb 19, 2018
4ec1f3e
Fix the version for a NEWS update
peternewman Feb 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ x/y/2018 ola-0.10.7
Bugs:
* Fix the build on Windows
* Entire codebase now passes codespell testing
* Fix the error dialog not displaying in the old web UI
*

Internal:
Expand Down
20 changes: 17 additions & 3 deletions javascript/ola/mobile/universe_tab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ goog.require('goog.ui.Button');
goog.require('goog.ui.Container');

goog.require('ola.BaseFrame');
goog.require('ola.Dialog');
goog.require('ola.UniverseControl');
goog.require('ola.UniverseItem');
goog.require('ola.common.RdmSectionControl');
Expand Down Expand Up @@ -372,19 +373,19 @@ ola.mobile.UniverseTab.prototype.saveSection_ = function() {
var value = form.elements[id].value;
var int_val = parseInt(value);
if (isNaN(int_val)) {
this._showErrorDialog('Invalid Value',
this.showErrorDialog_('Invalid Value',
items[i]['description'] + ' must be an integer');
return;
}
var min = items[i]['min'];
if (min != undefined && int_val < min) {
this._showErrorDialog('Invalid Value',
this.showErrorDialog_('Invalid Value',
items[i]['description'] + ' must be > ' + (min - 1));
return;
}
var max = items[i]['max'];
if (max != undefined && int_val > max) {
this._showErrorDialog('Invalid Value',
this.showErrorDialog_('Invalid Value',
items[i]['description'] + ' must be < ' + (max + 1));
return;
}
Expand Down Expand Up @@ -428,3 +429,16 @@ ola.mobile.UniverseTab.prototype.saveSectionComplete_ = function(e) {
this.loadSection_();
}
};


/**
* Show the dialog with an error message
* @private
*/
ola.mobile.UniverseTab.prototype.showErrorDialog_ = function(title, error) {
var dialog = ola.Dialog.getInstance();
dialog.setTitle(title);
dialog.setContent(error);
dialog.setButtonSet(goog.ui.Dialog.ButtonSet.OK);
dialog.setVisible(true);
};