Skip to content

Commit

Permalink
Conditionals feature (#2830)
Browse files Browse the repository at this point in the history
Introduces conditional styling feature.
  • Loading branch information
shefalijoshi authored Mar 31, 2020
1 parent e7e5116 commit ee4a81b
Show file tree
Hide file tree
Showing 109 changed files with 6,612 additions and 865 deletions.
4 changes: 2 additions & 2 deletions copyright-notice.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Open MCT, Copyright (c) 2014-2018, United States Government
Open MCT, Copyright (c) 2014-2020, United States Government
as represented by the Administrator of the National Aeronautics and Space
Administration. All rights reserved.
Expand All @@ -18,4 +18,4 @@
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.
-->
-->
4 changes: 2 additions & 2 deletions copyright-notice.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government
* Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
Expand All @@ -18,4 +18,4 @@
* 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.
*****************************************************************************/
*****************************************************************************/
3 changes: 2 additions & 1 deletion example/generator/GeneratorMetadataProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ define([
values: [
{
key: "name",
name: "Name"
name: "Name",
format: "string"
},
{
key: "utc",
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
"request": "^2.69.0",
"split": "^1.0.0",
"style-loader": "^1.0.1",
"uuid": "^3.3.3",
"v8-compile-cache": "^1.1.0",
"vue": "2.5.6",
"vue-loader": "^15.2.6",
Expand Down
4 changes: 3 additions & 1 deletion src/MCT.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2018, United States Government
* Open MCT, Copyright (c) 2014-2020, United States Government
* as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved.
*
Expand Down Expand Up @@ -264,6 +264,8 @@ define([
this.install(this.plugins.GoToOriginalAction());
this.install(this.plugins.ImportExport());
this.install(this.plugins.WebPage());
this.install(this.plugins.Condition());
this.install(this.plugins.ConditionWidget());
}

MCT.prototype = Object.create(EventEmitter.prototype);
Expand Down
34 changes: 18 additions & 16 deletions src/plugins/LADTable/components/LADTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,24 @@
*****************************************************************************/

<template>
<table class="c-table c-lad-table">
<thead>
<tr>
<th>Name</th>
<th>Timestamp</th>
<th>Value</th>
</tr>
</thead>
<tbody>
<lad-row
v-for="item in items"
:key="item.key"
:domain-object="item.domainObject"
/>
</tbody>
</table>
<div class="c-lad-table-wrapper">
<table class="c-table c-lad-table">
<thead>
<tr>
<th>Name</th>
<th>Timestamp</th>
<th>Value</th>
</tr>
</thead>
<tbody>
<lad-row
v-for="item in items"
:key="item.key"
:domain-object="item.domainObject"
/>
</tbody>
</table>
</div>
</template>

<script>
Expand Down
Loading

0 comments on commit ee4a81b

Please sign in to comment.