ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-14 21:28:12 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into open933-c

Browse Source 
# Conflicts:
#	platform/commonUI/edit/res/templates/create/create-menu.html
#	platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
#	platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
#	platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
#	platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
#	platform/commonUI/general/res/sass/_archetypes.scss
#	platform/commonUI/general/res/sass/_constants.scss
#	platform/commonUI/general/res/sass/_icons.scss
#	platform/commonUI/general/res/sass/_main.scss
#	platform/commonUI/general/res/sass/_mixins.scss
#	platform/commonUI/general/res/sass/controls/_buttons.scss
#	platform/commonUI/general/res/templates/controls/time-controller.html
#	platform/commonUI/themes/snow/res/sass/_constants.scss
This commit is contained in:
Charles Hacskaylo
2016-08-01 17:11:37 -07:00
parent 579c6b6d24 d1e1ba1c66
commit c699cb8b4b
1081 changed files with 8593 additions and 7252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/features/plot/src/PlotController.js
View File

@ -1,9 +1,9 @@
/*****************************************************************************
* Open MCT Web, Copyright (c) 2014-2015, United States Government
* Open MCT, Copyright (c) 2014-2016, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
* Open MCT Web is licensed under the Apache License, Version 2.0 (the
* Open MCT is licensed under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0.
@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations
* under the License.
*
* Open MCT Web includes source code licensed under additional open source
* Open MCT includes source code licensed under additional open source
* licenses. See the Open Source Licenses file (LICENSES.md) included with
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
@ -319,7 +319,7 @@ define(
/**
* Get the current mode that is applicable to this plot. This
* will include key, name, and glyph fields.
* will include key, name, and cssclass fields.
*/
PlotController.prototype.getMode = function () {
return this.modeOptions.getMode();