Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/JMRI/JMRI
Browse files Browse the repository at this point in the history
I/JMRI"

This reverts commit da202bd, reversing
changes made to 6d5a941.
  • Loading branch information
mattharris committed Oct 1, 2015
2 parents da202bd + c12d864 commit bf41bdd
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions web/js/panel.js
Expand Up @@ -9,6 +9,7 @@
* CSS classes are used throughout to attach events to correct widgets, as well as control appearance.
* The JSON type is used to send changes to JSON server and to listen for changes made elsewhere.
* Drawn widgets are handled by drawing directly on the javascript "canvas" layer.
* An internal (to JMRI) heartbeat sensor is used to avoid one browser holding multiple server connections (refresh, links, etc.)
*
* TODO: show error notification or grey-out panel when panel and/or server goes away
* TODO: handle "&" in usernames (see Indicator Demo 00.xml)
Expand All @@ -27,6 +28,7 @@
**********************************************************************************************/

//persistent (global) variables
var $gTimeout = 45; //heartbeat timeout in seconds
var $gWidgets = {}; //array of all widget objects, key=CSSId
var $gPanelList = {}; //store list of available panels
var $gPanel = {}; //store overall panel info
Expand Down

0 comments on commit bf41bdd

Please sign in to comment.