mirror of
https://github.com/nasa/openmct.git
synced 2025-06-18 23:28:14 +00:00
#892 Removed browser warning
This commit is contained in:
@ -26,7 +26,6 @@ define([
|
|||||||
"./src/services/PopupService",
|
"./src/services/PopupService",
|
||||||
"./src/SplashScreenManager",
|
"./src/SplashScreenManager",
|
||||||
"./src/StyleSheetLoader",
|
"./src/StyleSheetLoader",
|
||||||
"./src/UnsupportedBrowserWarning",
|
|
||||||
"./src/controllers/TimeRangeController",
|
"./src/controllers/TimeRangeController",
|
||||||
"./src/controllers/DateTimePickerController",
|
"./src/controllers/DateTimePickerController",
|
||||||
"./src/controllers/DateTimeFieldController",
|
"./src/controllers/DateTimeFieldController",
|
||||||
@ -75,7 +74,6 @@ define([
|
|||||||
PopupService,
|
PopupService,
|
||||||
SplashScreenManager,
|
SplashScreenManager,
|
||||||
StyleSheetLoader,
|
StyleSheetLoader,
|
||||||
UnsupportedBrowserWarning,
|
|
||||||
TimeRangeController,
|
TimeRangeController,
|
||||||
DateTimePickerController,
|
DateTimePickerController,
|
||||||
DateTimeFieldController,
|
DateTimeFieldController,
|
||||||
@ -153,13 +151,6 @@ define([
|
|||||||
"THEME"
|
"THEME"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"implementation": UnsupportedBrowserWarning,
|
|
||||||
"depends": [
|
|
||||||
"notificationService",
|
|
||||||
"agentService"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"implementation": SplashScreenManager,
|
"implementation": SplashScreenManager,
|
||||||
"depends": [
|
"depends": [
|
||||||
|
@ -1,64 +0,0 @@
|
|||||||
/*****************************************************************************
|
|
||||||
* Open MCT Web, Copyright (c) 2014-2015, 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
|
|
||||||
* "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.
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
||||||
* License for the specific language governing permissions and limitations
|
|
||||||
* under the License.
|
|
||||||
*
|
|
||||||
* Open MCT Web 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.
|
|
||||||
*****************************************************************************/
|
|
||||||
/*global define*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This bundle provides various general-purpose UI elements, including
|
|
||||||
* platform styling.
|
|
||||||
* @namespace platform/commonUI/general
|
|
||||||
*/
|
|
||||||
define(
|
|
||||||
[],
|
|
||||||
function () {
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
var WARNING_TITLE = "Unsupported browser",
|
|
||||||
WARNING_DESCRIPTION = [
|
|
||||||
"This software has been developed and tested",
|
|
||||||
"using the latest Google Chrome,",
|
|
||||||
"and may be unstable in other browsers."
|
|
||||||
].join(" "),
|
|
||||||
MOBILE_BROWSER = "Safari",
|
|
||||||
DESKTOP_BROWSER = "Chrome";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Shows a warning if a user's browser is unsupported.
|
|
||||||
* @memberof platform/commonUI/general
|
|
||||||
* @constructor
|
|
||||||
* @param {NotificationService} notificationService the notification
|
|
||||||
* service
|
|
||||||
*/
|
|
||||||
function UnsupportedBrowserWarning(notificationService, agentService) {
|
|
||||||
var testToBrowser = agentService.isMobile() ?
|
|
||||||
MOBILE_BROWSER : DESKTOP_BROWSER;
|
|
||||||
|
|
||||||
if (!agentService.isBrowser(testToBrowser)) {
|
|
||||||
notificationService.alert({
|
|
||||||
title: WARNING_TITLE,
|
|
||||||
actionText: WARNING_DESCRIPTION
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return UnsupportedBrowserWarning;
|
|
||||||
}
|
|
||||||
);
|
|
@ -1,98 +0,0 @@
|
|||||||
/*****************************************************************************
|
|
||||||
* Open MCT Web, Copyright (c) 2014-2015, 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
|
|
||||||
* "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.
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
||||||
* License for the specific language governing permissions and limitations
|
|
||||||
* under the License.
|
|
||||||
*
|
|
||||||
* Open MCT Web 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.
|
|
||||||
*****************************************************************************/
|
|
||||||
/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/
|
|
||||||
|
|
||||||
define(
|
|
||||||
["../src/UnsupportedBrowserWarning"],
|
|
||||||
function (UnsupportedBrowserWarning) {
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
var MOBILE_BROWSER = "Safari",
|
|
||||||
DESKTOP_BROWSER = "Chrome",
|
|
||||||
UNSUPPORTED_BROWSERS = [
|
|
||||||
"Firefox",
|
|
||||||
"IE",
|
|
||||||
"Opera",
|
|
||||||
"Iceweasel"
|
|
||||||
];
|
|
||||||
|
|
||||||
describe("The unsupported browser warning", function () {
|
|
||||||
var mockNotificationService,
|
|
||||||
mockAgentService,
|
|
||||||
testAgent;
|
|
||||||
|
|
||||||
function instantiateWith(browser) {
|
|
||||||
testAgent = "Mozilla/5.0 " + browser + "/12.34.56";
|
|
||||||
return new UnsupportedBrowserWarning(
|
|
||||||
mockNotificationService,
|
|
||||||
mockAgentService
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeEach(function () {
|
|
||||||
testAgent = "chrome";
|
|
||||||
mockNotificationService = jasmine.createSpyObj(
|
|
||||||
"notificationService",
|
|
||||||
[ "alert" ]
|
|
||||||
);
|
|
||||||
mockAgentService = jasmine.createSpyObj(
|
|
||||||
"agentService",
|
|
||||||
[ "isMobile", "isBrowser" ]
|
|
||||||
);
|
|
||||||
mockAgentService.isBrowser.andCallFake(function (substr) {
|
|
||||||
substr = substr.toLowerCase();
|
|
||||||
return testAgent.toLowerCase().indexOf(substr) !== -1;
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
[ false, true ].forEach(function (isMobile) {
|
|
||||||
var deviceType = isMobile ? "mobile" : "desktop",
|
|
||||||
goodBrowser = isMobile ? MOBILE_BROWSER : DESKTOP_BROWSER,
|
|
||||||
badBrowsers = UNSUPPORTED_BROWSERS.concat([
|
|
||||||
isMobile ? DESKTOP_BROWSER : MOBILE_BROWSER
|
|
||||||
]);
|
|
||||||
|
|
||||||
describe("on " + deviceType + " devices", function () {
|
|
||||||
beforeEach(function () {
|
|
||||||
mockAgentService.isMobile.andReturn(isMobile);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("is not shown for " + goodBrowser, function () {
|
|
||||||
instantiateWith(goodBrowser);
|
|
||||||
expect(mockNotificationService.alert)
|
|
||||||
.not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
badBrowsers.forEach(function (badBrowser) {
|
|
||||||
it("is shown for " + badBrowser, function () {
|
|
||||||
instantiateWith(badBrowser);
|
|
||||||
expect(mockNotificationService.alert)
|
|
||||||
.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
Reference in New Issue
Block a user