ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-23 09:25:29 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'nasa/open1392' into open1392b

Browse Source 
Conflicts:
	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
This commit is contained in:
Victor Woeltjen
2015-06-29 16:09:01 -07:00
parent 0b4aa730f4 a7c90f2476
commit 970698c77b
23 changed files with 573 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/commonUI/browse/src/windowing/FullscreenAction.js
View File

@ -29,8 +29,8 @@ define(
function () {
"use strict";
var ENTER_FULLSCREEN = "Enter full screen mode.",
EXIT_FULLSCREEN = "Exit full screen mode.";
var ENTER_FULLSCREEN = "Enter full screen mode",
EXIT_FULLSCREEN = "Exit full screen mode";
/**
* The fullscreen action toggles between fullscreen display