Commit c0039bd3 by frlngweb2-VM

Merge branch 'master' of git.embl.de:monfort/dynamix

Conflicts:
	js/widgets/masterWidget.js
parents 6080b6e8 0425fa3c
*.pyc
*.sh
......@@ -192,30 +192,6 @@ define(
}));
},
// initWidget: function(){
// this.toggleSButton.checked = this.parentGroup.get("toggleSignal");
// if (this.toggleSButton.checked) query("#"+this.toggleFButton.id).style("color", "#00008B");
// else query("#"+this.toggleFButton.id).style("color", "gray");
// // this.toggleFButton.checked = this.parentGroup.get("toggleFeatures");
// this.toggleFButton.checked = this.parentGroup.get("toggleFeatures");
// if (this.toggleFButton.checked) query("#"+this.toggleSButton.id).style("color", "#00008B");
// else query("#"+this.toggleSButton.id).style("color", "gray");
// // parentGroupMode = this.parentGroup.get("widgetGroupMode");
// this.selector.set('value', this.parentGroup.groupMode);
// if (parentGroupMode === 'automatic' || parentGroupMode === 'manual'){
// this.watchParentGroup();
// this._updateShownTrackNumber('0');
// this._updateRelevantTrackNumber('0');
// this._updateRelevantShownTrackNumber('0');
// this._enableButtons();
// query("#"+this.groupStateInfoCircleID).style("color", this.orangeStateInfoIconDom);
// }
// if (parentGroupMode === 'disabled'){
// this._disableButtons();
// }
// },
watchParentGroup: function(){
this.parentGroupAllShownWatcher = this.watchParentGroupAllShown();
this.parentGroupIsMaxTracksReachedWatcher = this.watchParentGroupIsMaxTracksReached();
......@@ -246,15 +222,6 @@ define(
// delete this.parentGroupNumberRelevantShownOnIntervalWatcher;
},
// watchParentGroupMode: function(){
// return this.parentGroup.watch("widgetGroupMode", lang.hitch(this, function(name, oldMode, newMode){
// // this.set("widgetGroupMode", newMode);
// this.set("widgetGroupMode", newMode);
// this.selector.set('value', newMode, false); // fire event
// // this._onWidgetGroupModeChange(oldMode, newMode);
// }));
// },
_onWidgetGroupModeChange: function(oldMode, newMode){
if (oldMode === 'disabled' && (newMode === 'automatic' || newMode === 'manual')){
......@@ -455,9 +422,8 @@ define(
},
_checkGroupMissingRelevantBlinking: function(){
// TOO MESSY WHEN MANY GROUPS
// WAS REMOVED
// BLINKING IS TOO MESSY WHEN MANY GROUPS
// if (!this.groupAllShown){
// this._blinkGroupStateColorCircle();
// }
......@@ -467,7 +433,6 @@ define(
// }
},
_blinkGroupStateColorCircle: function(){
var stateColorCircleNode = this.groupStateInfoCircle;
if (this.stateColorCircleAnim){
......
......@@ -63,7 +63,6 @@ define(
id: null,
pluginName: null, // (*)
//new
groupWidgets: null,
groupWidgetsById: {},
groupWidgetsList: [],
......@@ -140,13 +139,7 @@ define(
this._set("allGroupsAllShown", allS);
},
// postMixInProperties : function() {
//after having the values
//before rendering HTML
// this.inherited(arguments);
// },
/* BUG FIX
/* DOJO BUG FIX
** see http://dojo-toolkit.33424.n3.nabble.com/Making-a-minimal-menu-dropdown-td1780079.html
** Avoid a scope error when closing the drop down menu */
focus: function(){
......@@ -155,7 +148,6 @@ define(
// native dropDown button function, can overwrite because this element _HasDropDown
_onDropDownMouseDown: function(ev){
// if (domClass.contains(ev.target, "dijitButtonNode") | domClass.contains(ev.target, "dijitButtonContents")){
if (domClass.contains(ev.target, "dijitButtonNode")
| domClass.contains(ev.target, "dijitButtonContents")
| domClass.contains(ev.target, "fa")){
......@@ -207,20 +199,7 @@ define(
** resolved promise to directly go to next
**
** buttonList: the list of buttons contains either all the "refresh" button,
** either all the "add" buttons or all the "remove" buttons.
*/
// _masterButtonClickHandler: function(buttonList){
// var buttonToClick = buttonList[0];
// var clickHandlerPromise = buttonToClick.onClick();
// var iterCount = 0; // to indicate next button in list within the promise
// for ( i = 1; i < buttonList.length; i++){
// clickHandlerPromise = clickHandlerPromise.then(lang.hitch(this, function(){
// iterCount++; // increment to go to next button in list
// var buttonToClick = buttonList[iterCount];
// return buttonToClick.onClick(); // returns a "clickHandler" promise
// }));
// }
// },
** either all the "add" buttons or all the "remove" buttons. */
_masterButtonClickHandler: function(buttonList){
var clickHandlerPromise = this.dx.newResolvedDummyPromise();
array.forEach(buttonList, lang.hitch(this, function(buttonToClick){
......@@ -235,7 +214,8 @@ define(
// this.mainStateImage.src
// if (!oldMaxTrReached && !!newMaxTrReached) domStyle.set(this.mainGroupMaxTrackIcon, 'display', 'inline-block');
// if (!!oldMaxTrReached && !newMaxTrReached) domStyle.set(this.mainGroupMaxTrackIcon, 'display', 'none');
if (!!newMaxTrReached && ( this.totalRelevantShownNumber < this.totalRelevantNumber ) ) domStyle.set(this.mainGroupMaxTrackIcon, 'display', 'inline-block');
// if (!!newMaxTrReached && ( this.totalRelevantShownNumber < this.totalRelevantNumber ) ) domStyle.set(this.mainGroupMaxTrackIcon, 'display', 'inline-block');
if (!!newMaxTrReached) domStyle.set(this.mainGroupMaxTrackIcon, 'display', 'inline-block');
if (!newMaxTrReached) domStyle.set(this.mainGroupMaxTrackIcon, 'display', 'none');
},
......@@ -301,7 +281,6 @@ define(
this._onNumberOnIntervalChange("numberRelevantShownOnInterval", "totalRelevantShownNumber");
}))
);
// dxGroupWidget.placeAt(this.dropDown, "last");
this._checkMasterButtons();
this._onNumberOnIntervalChange("numberShownOnInterval", "totalShownNumber");
this._onNumberOnIntervalChange("numberRelevantOnInterval", "totalRelevantNumber");
......@@ -326,10 +305,6 @@ define(
},
_onGroupModeChange: function(oldMode, newMode){
//Next changes nothing for button
// if ((oldMode === 'manual' || oldMode === 'automatic') && (newMode === 'manual' || newMode === 'automatic')) return;
// if ((oldMode === 'disabled') && (newMode === 'disabled')) return;
// For all the other cases we have to check!
this._checkAllGroupsAllShown();
this._checkMasterButtons();
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment