ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-26 00:01:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,758 Commits 989 Branches 212 Tags 191 MiB
86ebd14ae7
Commit Graph

152 Commits

Author SHA1 Message Date
Victor Woeltjen
a1a7b2b8ce [Build] Remove unused variables 
...to satisfy JSHint
 2016-03-04 11:41:48 -08:00
Victor Woeltjen
ac5ac8d34e [Build] Remove boilerplate from scripts 
No longer necessary after JSHint configuration.
 2016-03-04 10:46:38 -08:00
Pete Richards
96d9f8c194 [Templates] load plot templates with require 
Load templates with requirejs.

https://github.com/nasa/openmctweb/issues/673
 2016-03-01 10:52:07 -08:00
Pete Richards
748673f99b Merge branch 'master' into open638_rebase 2016-03-01 10:48:53 -08:00
Victor Woeltjen
7240ff4f8d [Templates] Update mct-control spec 
...to reflect usage of templateLinker, to support including
templates via RequireJS text plugin
 2016-02-26 16:22:55 -08:00
Victor Woeltjen
596735352a [Templates] Simplify MCTToolbar 
Use mct-form as a basis; simply change the template.
 2016-02-26 15:17:31 -08:00
Victor Woeltjen
2d03e3e6d4 [Templates] Remove unused template path calculation 2016-02-26 15:03:45 -08:00
Victor Woeltjen
5c3d8508a2 [Templates] Use templateLinker for forms 
...for compatibility with both template and templateUrl
 2016-02-26 15:01:40 -08:00
Victor Woeltjen
741d4476e6 [Templates] Use text plugin for toolbar 2016-02-26 13:12:35 -08:00
Victor Woeltjen
bf1fa0ac4c [Templates] Include templates using text plugin 
Resolves #673
 2016-02-26 13:07:50 -08:00
Pete Richards
fcdf89a4ee Merge branch 'master' into open638_rebase 2016-02-23 10:56:13 -08:00
Henry
24c750b41e [Plot] Fixed jsLint, removed onchange 
Removed ngChange from mct-control

Removed ng-change
 2016-02-09 21:19:47 -08:00
Henry
ab1c79f25d [Plot] Switched to $watchCollection on form model 2016-02-09 20:52:47 -08:00
Henry
be031285b9 Added form-level change event 2016-02-08 17:46:21 -08:00
Victor Woeltjen
0a5097a945 Merge pull request #642 from nasa/open460 
[Build] Move to npm-based build
 2016-02-08 12:21:01 -08:00
Henry
abf5f22155 [Plots] #638 added onchange handling in order to synchronize forms with domain object model. 
Fixed failing test

Added tests

jslint errors

Minor refactoring of layout bundle

revert layout/bundle.json
 2016-02-04 14:26:21 -08:00
Charles Hacskaylo
f2903f4030 [Frontend] Final styling on properties form in Inspector 
open #638
Added custom radio button control and modified
PlotOptionsController / plotOptionsStructure
accordingly; spacing, borders, etc. are
all as finally intended;
 2016-02-04 14:25:02 -08:00
Charles Hacskaylo
371669fbce [Frontend] Mods in progress to form layout 
open #638
Major progress on form-row markup and CSS when
in Inspector 'part' context; General fixes cleanups
to custom checkbox/radio CSS;
 2016-02-04 14:23:29 -08:00
Charles Hacskaylo
f1b6d7f749 [Frontend] New custom radio mctControl 
open #638
Markup and initial CSS
 2016-02-04 14:23:28 -08:00
Victor Woeltjen
aebae27391 [Tests] Remove suite.json files 
Remove obsolete suite.json files; #482
 2016-02-02 09:35:50 -08:00
Victor Woeltjen
38e703a121 [Build] Fix failing test 
Acquire reference to moment as an argument instead of
assuming global availability; this appears to be no longer
be present globally after build changes
 2016-01-29 10:33:43 -08:00
Victor Woeltjen
3a4f6a7229 [Build] Update dependency references 
...to reflect movement of third-party libraries to
bower_components.
 2016-01-28 11:18:57 -08:00
Victor Woeltjen
7a160a0a98 [Build] Remove third-party libraries 2016-01-28 11:13:11 -08:00
Henry
a023b0e19c Fixed failing MCTToolbarSpec 2016-01-14 19:22:33 -08:00
Henry
66e827de2e Fixed Outstanding issues from merge 2016-01-14 18:51:53 -08:00
Victor Woeltjen
cec197f888 [API Refactor] Remove bundle.json files 2016-01-08 15:32:18 -08:00
Victor Woeltjen
df631ba40e [API Refactor] Update failing specs 2016-01-08 12:58:06 -08:00
Victor Woeltjen
1443ab61e3 [API] Obey strict DI from FormController 2016-01-08 09:42:38 -08:00
Victor Woeltjen
de53247d56 [API] Convert JSON bundles to imperative form 2016-01-07 15:08:08 -08:00
Victor Woeltjen
7d4e7a0925 [Time Conductor] Allow ng-blur on mct-controls 2015-11-27 12:29:53 -08:00
Charles Hacskaylo
fd3059b380 [Frontend] Final cleanups, tweaks; Refactored s-icon-btn 
open #208
Unit tested in both themes;
.s-icon-btn refactored slightly to focus on usage
as an icon-only element, removed overlap designations
with .s-btn in markup;
Colors normalized for theming;
Code cleanup;
 2015-11-20 16:47:04 -08:00
Charles Hacskaylo
1d83516982 [Frontend] Time Controller Markup and Styling 
open #1515
open #117
Significant re-org in menus.scss continued:
Refactored s-menu to s-menu-btn;
moved look-related style def's into .s-menu;
.menu now extends .s-menu;
 2015-09-24 15:38:52 -07:00
Victor Woeltjen
dbe1875e70 [Themes] Resolve conflicts 
Resolve conflicts in preparation for merge, nasa/openmctweb#118
 2015-09-22 16:12:44 -07:00
Victor Woeltjen
acdd35cf65 [Forms] Fix select control 
Use ng-show instead of ng-if to suppress the
'Select One' option after user has chosen something
in a select box; the latter appears to be incompatible
with Angular 1.4.x. nasa/openmct#113
 2015-09-16 12:23:26 -07:00
Charles Hacskaylo
bb1a02c8bd [Frontend] Significant re-factoring of CSS and markup 
open #95
IN-PROGRESS!;
Mostly buttons and menus classes (s-btn and s-menu);
Removed unused templates and .css files;
Normalized some button containers;
 2015-09-02 18:02:58 -07:00
Victor Woeltjen
7fe866060b [Code Style] Use prototypes in forms bundle 
WTD-1482.
 2015-08-14 13:44:08 -07:00
Victor Woeltjen
1c187c3914 [Code Style] Begin refactoring forms bundle 
WTD-1482
 2015-08-13 14:44:27 -07:00
Victor Woeltjen
31eb366e7f [JSDoc] Add namespace docs 
WTD-1482.
 2015-08-07 12:13:15 -07:00
Victor Woeltjen
c08a460d30 [JSDoc] Add annotations 
Bulk-add JSDoc annotations, WTD-1482.
 2015-08-07 11:44:54 -07:00
Victor Woeltjen
67d1201214 Merge branch 'open-master' into open1272 
Merge in latest from master branch into topic branch
for WTD-1272

Conflicts:
	platform/forms/test/controllers/DateTimeControllerSpec.js
 2015-06-19 13:16:33 -07:00
Charles Hacskaylo
4887ba0e58 Merge in open-master, resolve conflicts 2015-06-16 13:53:00 -07:00
Victor Woeltjen
6aff6d8d2b [Forms] Update spec for date-time control 
WTD-1272.
 2015-06-15 13:05:37 -07:00
Victor Woeltjen
05a114cc75 [Forms] Use MM-DD in date-time control 
Use month and day instead of day-of-year in date-time
control, WTD-1272.
 2015-06-15 13:01:43 -07:00
Charles Hacskaylo
af0c2e7827 [Fronted] Significant refactoring of mixins for containers and buttons 
WTD-839
Refactoring in advance of style mods to switcher when in frame;
Cleanup of markup to remove 'icon' class from invoke-menu elements;
 2015-06-12 10:00:51 -07:00
Victor Woeltjen
fd63aa30ea [Forms] Add test for date-time controller 
Add test case to complete coverage of date-time controller;
done in the context of WTD-884 (albeit unrelated) to improve
code coverage.
 2015-06-10 14:31:34 -07:00
Victor Woeltjen
fcd214ed60 [Forms] Show initial value in datetime control 
Initialize value for datetime control based on available
data, and keep up-to-date with changes from UI. Supports
clocks/timers, which use datetime as an entry field,
WTD-1221.
 2015-06-04 09:16:25 -07:00
Victor Woeltjen
28805cd55c [Forms] Add test cases to DateTimeController 
Add test cases for behavioral changes to DateTimeController,
added for WTD-1221.
 2015-06-04 09:15:39 -07:00
Victor Woeltjen
45568ecb21 [Forms] Allow date-time controls to be optional 
Don't force date-time inputs to act as if they are
required; allow them to be treated as optional, but
enforce that this only occurs when left completely
empty (as opposed to partially complete.)

Supports WTD-1221.
 2015-06-04 09:15:04 -07:00
Victor Woeltjen
10863514cb [Licenses] Add license headers 
WTD-1051.
 2015-05-13 16:43:30 -07:00
Victor Woeltjen
fa5bc326e1 [Containment] Update failing specs 
Update failing specs after changes for composition
policy to enforce containment rules, WTD-962.
 2015-04-10 17:47:49 -07:00
Victor Woeltjen
952f380c33 [Containment] Make ngModel optional 
Make the ngModel dependency of mct-control optional, to avoid
breaking mct-control usages which don't also use ng-model.
WTD-962.
 2015-04-09 13:10:27 -07:00
Victor Woeltjen
cc0a46d5cc [Containment] Set validity in locator 
Set validity of selected location from locator control, to
disallow creation when no valid location is selected (which
is possible due to containment rules.) WTD-962.
 2015-04-07 22:30:21 -07:00
Charles Hacskaylo
8018c8f42e [Frontend] Sanding and polishing on common front-end elements 
WTD-1048
Originally did a lot of this work in warp1048 by mistake
This commit pulls in all /platform-only changes from that branch
Mods are mostly related to WTD-1046 specifically, but also touch toolbar and buttons
 2015-03-20 16:37:42 -07:00
Victor Woeltjen
988f539ee1 [Platform] Bring in changes 
Bring in open-source-friendly changes to CSS, fonts, templates,
related to WTD-1045.
 2015-03-20 09:11:07 -07:00
Charles Hacskaylo
e7e0c6829e [Frontend] Added "first" CSS class applied to form-row elements 
WTD-1002
WTD-1005
Made form.html add CSS class "first" to each form-row element in order to allow proper border-top styling;
 2015-03-11 15:09:48 -07:00
Charles Hacskaylo
cc181dbdc9 [Frontend] Form and form control enhancements 
WTD-1002
Added Angular hooks to allow form elements to have JSON defined CSS classes
Form element cleanups
 2015-03-10 22:36:35 -07:00
Charles Hacskaylo
c640d6238b [Frontend] Markup and CSS mods to fix click area in btn-menu objects 
WTD-1002
WTD-942
Mods to markup and CSS to make click-area of menu buttons occupy full area of button
 2015-03-06 10:55:40 -08:00
Charles Hacskaylo
679e56d231 [Frontend] Tweaks and minor mods 
WTD-894
Changed image CSS from contain to cover
Modded default colors for text and telemetry elements to visibility;
Moved click handler position in menu-button.html for better clickability;

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
 2015-03-04 14:45:24 -08:00
Charles Hacskaylo
448b535de0 [Frontend] Markup and CSS mods to clean up form elements display 
WTD-610
CSS and markup mods principally focused on selects, checkboxes and composite controls;
Cleaned up positioning and formatting in .l-result area of query form bottom;
Removed display of view type when only a single view available for an object in switcher.html

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	vista/query/res/templates/channel-query.html
	vista/query/res/templates/channel-selector.html
	vista/query/res/templates/evr-query.html
 2015-03-04 14:43:21 -08:00
Charles Hacskaylo
9c001fabd9 [Frontend] Form element style and markup fixes 
WTD-610
Fixed markup in select.html;
Rebuilt associated CSS in _selects.scss;
Still to-do: checkbox valign and spacing

Conflicts:
	platform/commonUI/general/res/css/forms.css
	platform/commonUI/general/res/css/items.css
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/css/tree.css
 2015-03-04 14:41:50 -08:00
Charles Hacskaylo
a0f31132e3 [Frontend] In-progress checkin: color palette SASS 
WTD-847
Significant markup and CSS for color palette support;
 2015-02-25 18:17:11 -08:00
Charles Hacskaylo
db87147bbd [Frontend] Normalized buttons in toolbar 
WTD-894
Fixed application of CSS styles in HTML templates to format buttons properly;
In-progress...
 2015-02-25 09:54:44 -08:00
Victor Woeltjen
59ff539bfb [Fixed Position] Update specs for coverage 
Update specs to restore code coverage after changes for WTD-881.
 2015-02-24 09:18:00 -08:00
Victor Woeltjen
1c69d1f2da [Fixed Position] Add text, image properties 
Add buttons for text, image properties to the Fixed Position
toolbar, WTD-881.
 2015-02-23 19:16:09 -08:00
Victor Woeltjen
0030efc29e [Forms] Implement DialogButtonController 
Implement controller for dialog buttons sufficient to satisfy
spec; these will be used to launch dialogs to collect user input
for Image Properties et al to complete toolbar for Fixed Position
view, WTD-881.
 2015-02-23 19:06:09 -08:00
Victor Woeltjen
3e95a96c69 [Forms] Add dialog button spec 
Add spec for a button which should show a dialog for
input on a single value, to support Image properties
in Fixed Position view, WTD-881.
 2015-02-23 18:52:53 -08:00
Victor Woeltjen
894a5b8f89 [Fixed Position] Add text color property 
Add a property to the Fixed Position toolbar to set text
color, WTD-881.
 2015-02-23 18:17:24 -08:00
Victor Woeltjen
6068f0f9c2 [Forms] Add ColorController spec 
Add spec for ColorController, introduced to support color
selection in the Fixed Position toolbar, WTD-881
 2015-02-23 17:06:27 -08:00
Victor Woeltjen
00f85447a2 [Fixed Position] Add color chooser 
Add color picker for fill color, WTD-881
 2015-02-23 16:47:52 -08:00
Victor Woeltjen
6c7dfb878b [Edit] Avoid rebuilding toolbar on edit 
Avoid rebuilding the toolbar in Edit mode whenever
any change occurs to avoid losing the binding to the
current selection state; needed for color picker to
work properly for WTD-881.
 2015-02-23 15:57:45 -08:00
Victor Woeltjen
2be58579dc [Fixed Position] Add 'Add' menu button 
Add UI for the Add button in fixed position view,
WTD-880.
 2015-02-20 11:30:04 -08:00
Victor Woeltjen
46e17b9496 [Forms] Handle disabled state generally 
Handle disabled state for items in a toolbar generally,
instead of only in buttons. WTD-684.
 2015-01-15 15:46:25 -08:00
Victor Woeltjen
34416090f0 [Forms] Document mct-toolbar 
Add brief usage notes for mct-toolbar, WTD-684.
 2015-01-15 15:43:20 -08:00
Victor Woeltjen
c49e641bca [Forms] Add color picker 
Add color picker, for use in toolbars. WTD-684.
 2015-01-15 15:35:11 -08:00
Victor Woeltjen
a9ebd1b869 [Forms] Allow buttons to be disabled 
Allow buttons to be disabled, particularly for use
in toolbars. WTD-684.
 2015-01-15 15:27:31 -08:00
Victor Woeltjen
b5393ae9da [Forms] Add button control 
Add an mct-control for buttons, for use in toolbars.
WTD-684.
 2015-01-15 15:26:27 -08:00
Victor Woeltjen
4b51c37067 [Forms] Allow textfield size to be specified 
Allow specification of size per-textfield from toolbar
structure definitions; WTD-684.
 2015-01-15 15:10:57 -08:00
Victor Woeltjen
fa9df65ddf [Forms] Transition toolbar markup 
Transition markup from pre-Angular to complete toolbar
template, WTD-684.
 2015-01-15 15:06:40 -08:00
Victor Woeltjen
72cd21171d [Forms] Remove obsolete templates 
Remove obsolete template declarations from the bundle
definition for platform/forms. WTD-684.
 2015-01-15 14:24:12 -08:00
Victor Woeltjen
aed6787f2c [Forms] Copy mct-form to mct-toolbar 
Copy mct-form template and scripts to use as a basis
for mct-toolbar. WTD-684.
 2015-01-15 14:23:01 -08:00
Victor Woeltjen
244583b2f7 [Forms] Separate out FormController 
Separate out the controller for mct-form from its
directive definition, to allow reuse by the
mct-toolbar directive, WTD-684.
 2015-01-15 14:08:01 -08:00
Victor Woeltjen
75f4daa5c3 [Forms] Add specs, doc for CompositeController 
Add spec and in-line documentation for CompositeController,
introduced to support integration of forms with the Create
menu, WTD-593.
 2014-12-03 16:19:01 -08:00
Victor Woeltjen
218f732dc2 [Forms] Add CompositeController 
Add a controller for composite controls; this is used
to flag contained controls as required when they have
been partially filled in (to treat entering one of two
such fields as invalid.) WTD-593.
 2014-12-03 16:07:46 -08:00
Victor Woeltjen
6a6797bf53 [Forms] Handle required flag in composite controls 
Handle the ng-required flag in composite controls.
WTD-593.
 2014-12-03 15:51:42 -08:00
Victor Woeltjen
363a6f6b47 [Forms] Add composite control type 
Add a type for composite controls, to allow populating
arrays (e.g. preferred size). WTD-593.
 2014-12-03 15:08:41 -08:00
Victor Woeltjen
3a7f35487d [Forms] Add usage documentation 
Add documentation for using the mct-form directive
introduced for WTD-530.
 2014-11-28 15:58:19 -08:00
Victor Woeltjen
1bfc21270b [Forms] Fill in specs 
Fill in specs for scripts which support the mct-form
and mct-control directives. WTD-530.
 2014-11-28 15:33:40 -08:00
Victor Woeltjen
29c5a7aaba [Forms] Add skeleton specs 
Add skeleton specs for scripts from the Forms
component. WTD-530.
 2014-11-28 14:40:35 -08:00
Victor Woeltjen
a04b30a383 [Forms] Add clarifying comments 
Add in-line documentation to directives and
controller used for the Forms component. WTD-530.
 2014-11-28 14:36:00 -08:00
Victor Woeltjen
7f59175313 [Forms] Remove unused templates 
Remove unused templates (these have been reorganized
into the controls directory.) WTD-530
 2014-11-28 14:18:36 -08:00
Victor Woeltjen
354327accc [Forms] Support patterns 
Support patterns for text fields, using the ng-pattern
directive. WTD-530.
 2014-11-28 14:08:33 -08:00
Victor Woeltjen
aaa0ff768d [Forms] Get date-time as UNIX timestamp 
Get date-time as a UNIX timestamp (in milliseconds
since start of 1970) add the model level for date-time
controls. WTD-530.
 2014-11-28 13:35:24 -08:00
Victor Woeltjen
a464fee6df [Forms] Date time controls 
Implement date time controls up to the point that
they validate, and information (albeit not the right
information) propagates back up to the containing
form. WTD-530.
 2014-11-28 13:15:02 -08:00
Victor Woeltjen
bc3d1270d2 [Forms] Simplify select model value 
Simplify select control's interaction with the model;
only store the value associated with the option, not
the name (which is just displayed for the user.)

WTD-530.
 2014-11-26 13:23:30 -08:00
Victor Woeltjen
d7c7e2835f [Forms] Let Angular force required rows 
Pass along ng-required values such that Angular may
handle tracking of form validity based on the presence
of required fields. WTD-530.
 2014-11-26 13:20:07 -08:00
Victor Woeltjen
ede3e4f31e [Forms] Add validation classes 
Add classes for required, valid, and invalid, based on
form state and on arguments passed into the form.
WTD-530.
 2014-11-26 13:15:12 -08:00
Victor Woeltjen
b31b4770d1 [Forms] Communicate dirty state 
Communicate dirty state out of generated forms;
WTD-530.
 2014-11-26 13:08:57 -08:00
Victor Woeltjen
77c1b150d9 [Forms] Add more form controls 
Add remaining platform form controls; amend mct-form
and mct-control directives to better communicate state.
Begin working on problem of communicating validation
back out of the form. WTD-530.
 2014-11-26 12:50:51 -08:00
Victor Woeltjen
658d485ccc [Forms] Initial minimal functionality 
Initial minimal working implementation where a
two-way binding between form and form user is
observable.

Notably, change ng-options to options, since
ng-options is terminal (it breaks mct-control).

WTD-530
 2014-11-26 10:43:48 -08:00
Victor Woeltjen
9576673b84 [Forms] Add mct-control directive 
Add an mct-control directive which can represent
individual form controls. WTD-530.
 2014-11-26 08:43:41 -08:00