alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/master' into open115b

Browse Source 
Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js
This commit is contained in:
Victor Woeltjen
2015-10-09 10:28:50 -07:00
parent d8276c532b 756f728865
commit 1efa97e6f5
24 changed files with 1325 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/features/conductor/src/ConductorRepresenter.js
View File

@@ -28,13 +28,8 @@ define(
var CONDUCTOR_HEIGHT = "100px",
TEMPLATE = [
'<div style=',
'"position: absolute; bottom: 0; width: 100%; ',
'overflow: hidden; ',
'height: ' + CONDUCTOR_HEIGHT + '">',
"<mct-include key=\"'time-conductor'\" ng-model='ngModel'>",
"</mct-include>",
'</div>'
"<mct-include key=\"'time-conductor'\" ng-model='conductor'>",
"</mct-include>"
].join(''),
THROTTLE_MS = 200,
GLOBAL_SHOWING = false;
@@ -166,8 +161,7 @@ define(
this.conductorElement =
this.$compile(TEMPLATE)(this.conductorScope());
this.element.after(this.conductorElement[0]);
this.element.addClass('abs');
this.element.css('bottom', CONDUCTOR_HEIGHT);
this.element.addClass('l-controls-visible l-time-controller-visible');
GLOBAL_SHOWING = true;
}
};