Merge pull request #477 from nasa/open337

Review and integrate open337
This commit is contained in:
Victor Woeltjen 2016-01-27 14:33:37 -08:00
commit 7c23f803e8
9 changed files with 117 additions and 8 deletions

View File

@ -119,6 +119,12 @@ define([
]
}
],
"filters": [
{
"implementation": "filters/ReverseFilter.js",
"key": "reverse"
}
],
"stylesheets": [
{
"stylesheetUrl": "css/normalize.min.css",

View File

@ -266,6 +266,8 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa
.gl-plot-tick,
.tick-label {
direction: rtl;
unicode-bidi:bidi-override;
font-size: 0.7rem;
position: absolute;
overflow: hidden;

View File

@ -0,0 +1,44 @@
/*****************************************************************************
* 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*/
define(function () {
'use strict';
/**
* Implements the `reverse` filter, which reverses text strings.
* Useful in cases where text should be reversed for presentational
* reasons (e.g. in conjunction with CSS tricks involing text direction),
* allowing such behavior to be handled independently from the controller
* layer.
*
* @constructor
* @memberof platform/commonUI/general
*/
function ReverseFilter() {
return function reverse(value) {
return value && value.toString().split('').reverse().join('');
};
}
return ReverseFilter;
});

View File

@ -0,0 +1,45 @@
/*****************************************************************************
* 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/filters/ReverseFilter'],
function (ReverseFilter) {
'use strict';
describe("The reverse filter", function () {
var reverse;
beforeEach(function () {
reverse = new ReverseFilter();
});
it("reverses text", function () {
expect(reverse('foo')).toEqual('oof');
});
it("returns undefined for undefined inputs", function () {
expect(reverse(undefined)).toBeUndefined();
});
});
}
);

View File

@ -20,6 +20,7 @@
"directives/MCTScroll",
"directives/MCTSplitPane",
"directives/MCTSplitter",
"filters/ReverseFilter",
"services/Popup",
"services/PopupService",
"services/UrlService",

View File

@ -4299,10 +4299,10 @@ textarea {
.field-hints,
.fields {
}
.field-hints {
}
*/ }
/* line 30, ../../../../general/res/sass/forms/_datetime.scss */
@ -7329,6 +7329,8 @@ table {
/* line 267, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-tick,
.tick-label {
direction: rtl;
unicode-bidi: bidi-override;
font-size: 0.7rem;
position: absolute;
overflow: hidden;

View File

@ -4196,10 +4196,10 @@ textarea {
.field-hints,
.fields {
}
.field-hints {
}
*/ }
/* line 30, ../../../../general/res/sass/forms/_datetime.scss */
@ -7202,6 +7202,8 @@ table {
/* line 267, ../../../../general/res/sass/plots/_plots-main.scss */
.gl-plot-tick,
.tick-label {
direction: rtl;
unicode-bidi: bidi-override;
font-size: 0.7rem;
position: absolute;
overflow: hidden;

View File

@ -47,7 +47,7 @@
<div ng-repeat="tick in subplot.getRangeTicks()"
class="gl-plot-tick gl-plot-y-tick-label"
ng-style="{ bottom: (100 * $index / (subplot.getRangeTicks().length - 1)) + '%' }">
{{tick.label}}
{{tick.label | reverse}}
</div>
<div class="gl-plot-y-options gl-plot-local-controls"
ng-if="axes[1].options.length > 1">
@ -125,7 +125,7 @@
class="gl-plot-tick gl-plot-x-tick-label"
ng-show="$index > 0 && $index < (subplot.getDomainTicks().length - 1)"
ng-style="{ left: (100 * $index / (subplot.getDomainTicks().length - 1)) + '%' }">
{{tick.label}}
{{tick.label | reverse}}
</div>
<div class="gl-plot-label gl-plot-x-label">
{{axes[0].active.name}}

View File

@ -221,6 +221,13 @@ define(
CustomRegistrars.prototype.services =
mapUpon(customRegistrar("service"));
/**
* Register Angular filters.
* @param {Array} extensions the resolved extensions
*/
CustomRegistrars.prototype.filters =
mapUpon(customRegistrar("filter"));
/**
* Register functions which will run after bootstrapping.
* @param {Array} extensions the resolved extensions