[Mobile] Info Button
Added info button to grid/list items on mobile. When the button is pressed, info bubble appears for 750ms or the same infobutton is pressed to dismiss immediately.
This commit is contained in:
@@ -9,6 +9,13 @@
|
||||
"key": "info-bubble",
|
||||
"templateUrl": "info-bubble.html"
|
||||
}
|
||||
],
|
||||
"controllers": [
|
||||
{
|
||||
"key": "InfoController",
|
||||
"implementation": "controllers/InfoController.js",
|
||||
"depends": [ "$scope", "$timeout", "infoService" ]
|
||||
}
|
||||
],
|
||||
"containers": [
|
||||
{
|
||||
@@ -41,12 +48,18 @@
|
||||
"$rootScope"
|
||||
]
|
||||
}
|
||||
],
|
||||
],
|
||||
"constants": [
|
||||
{
|
||||
"key": "INFO_HOVER_DELAY",
|
||||
"value": 2000
|
||||
}
|
||||
],
|
||||
"representations": [
|
||||
{
|
||||
"key": "info-button",
|
||||
"templateUrl": "templates/info-button.html"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
25
platform/commonUI/inspect/res/templates/info-button.html
Normal file
25
platform/commonUI/inspect/res/templates/info-button.html
Normal file
@@ -0,0 +1,25 @@
|
||||
<!--
|
||||
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.
|
||||
-->
|
||||
|
||||
<div ng-controller="InfoController" ng-click='tryToDis($event)'>
|
||||
<a class='ui-symbol icon mobile-info'>i</a>
|
||||
</div>
|
||||
69
platform/commonUI/inspect/src/controllers/InfoController.js
Normal file
69
platform/commonUI/inspect/src/controllers/InfoController.js
Normal file
@@ -0,0 +1,69 @@
|
||||
/*****************************************************************************
|
||||
* 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*/
|
||||
|
||||
/**
|
||||
* Module defining InfoController.
|
||||
*/
|
||||
define(
|
||||
[],
|
||||
function () {
|
||||
"use strict";
|
||||
function InfoController($scope, $timeout, infoService) {
|
||||
var touchPosition,
|
||||
bubble;
|
||||
function trackPosition(event) {
|
||||
// Record mouse position, so bubble can be shown at latest
|
||||
// mouse position (not just where the mouse entered)
|
||||
touchPosition = [ event.pageX, event.pageY ];
|
||||
}
|
||||
|
||||
function display(event) {
|
||||
var domainObject = $scope.domainObject;
|
||||
console.log(domainObject.getId());
|
||||
trackPosition(event);
|
||||
|
||||
if(!bubble) {
|
||||
bubble = infoService.display(
|
||||
"info-table",
|
||||
domainObject.getModel().name,
|
||||
domainObject.useCapability('metadata'),
|
||||
touchPosition
|
||||
);
|
||||
} else {
|
||||
bubble();
|
||||
bubble = undefined;
|
||||
}
|
||||
|
||||
$timeout(function () {
|
||||
// If a bubble is showing, dismiss it after timeout
|
||||
if (bubble) {
|
||||
bubble();
|
||||
bubble = undefined;
|
||||
}
|
||||
}, 750);
|
||||
}
|
||||
$scope.tryToDis = display;
|
||||
}
|
||||
return InfoController;
|
||||
}
|
||||
);
|
||||
Reference in New Issue
Block a user