ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-20 21:53:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,549 Commits 989 Branches 212 Tags 191 MiB
485e6a9de1
Commit Graph

2549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles Hacskaylo
485e6a9de1 [wtf] Merge open155 > github/master 
open #155
open #186
WTF yet again getting merge conflicts when remerging open155;
 2015-10-30 16:24:20 -07:00
Charles Hacskaylo
1e6731e6f2 Merge open155 > github/master 
open155
open186
Trying a third time to resolve conflicts between open155 and master;
 2015-10-30 16:20:57 -07:00
Victor Woeltjen
ec56fe7bfd Merge pull request #222 from nasa/open195 
[Representation] Remove unknown templates from DOM
 2015-10-30 13:39:14 -07:00
Victor Woeltjen
4abb48abd8 [Representation] Update parameters in JSDoc 2015-10-30 13:34:13 -07:00
Victor Woeltjen
a38d4829eb [Representation] Add JSDoc 2015-10-30 12:38:32 -07:00
Victor Woeltjen
d5f1d45759 [Representation] Use $templateRequest 
...from templateLinker, to remove the need to use $http and
to explicitly cache templates.
 2015-10-30 12:35:36 -07:00
Victor Woeltjen
5ed34c1c30 [Representation] Build URLs from templateLinker 2015-10-30 11:02:13 -07:00
Henry
bc82a5bf7e Added additional test for notifications specified as string message 2015-10-30 10:56:16 -07:00
Victor Woeltjen
5af3d575a2 [Representation] Remove redundant listener 
The  event is already listened-for at the representation
level to trigger cleanup, including gestures, so the info gesture
does not need to listen for it as well.

Per code review feedback, nasa/openmctweb#222
 2015-10-30 10:45:44 -07:00
Henry
58198636ed Fixed jslint complaints 2015-10-30 10:32:01 -07:00
Henry
86bf6c6dff Minor refactoring and renaming of variables 2015-10-30 10:30:39 -07:00
Henry
0e07fb860e Added convenience methods for alert and error to the NotificationService 2015-10-30 10:28:08 -07:00
Henry
b3d4f48e2e Allow string or model to simplify message specification 2015-10-30 10:22:24 -07:00
Victor Woeltjen
df3b0bd6fb Merge pull request #221 from nasa/open203 
[Documentation] Images missing from tutorials
 2015-10-29 08:50:03 -07:00
Victor Woeltjen
5b475c9f64 [Representation] Add more test cases 
...for TemplateLinker.
 2015-10-29 08:27:20 -07:00
Victor Woeltjen
a48370abd3 [Representation] Update spec 2015-10-29 08:18:13 -07:00
Victor Woeltjen
54d608adb2 [Representation] Provide initial templates 
...to avoid temporarily replacing with a comment when this
is not needed.
 2015-10-29 08:17:25 -07:00
Victor Woeltjen
5fba6f5ead [Representation] Add more test cases 
...for TemplateLinker, to achieve full code coverage.
 2015-10-29 08:08:01 -07:00
Victor Woeltjen
b177c38656 [Representation] Add JSDoc 
...to TelemetryLinker.
 2015-10-29 07:58:32 -07:00
Victor Woeltjen
59cd346911 [Representation] Add test cases 
...for TemplateLinker
 2015-10-28 17:01:13 -07:00
Victor Woeltjen
e7e66bff4b [Representation] Begin adding TemplateLinker spec 2015-10-28 16:49:19 -07:00
Victor Woeltjen
ca62cc9066 [Representation] Update spec for mct-representation 
...to account for usage of templateLinker to add or remove the
whole element from the DOM when there is or is not a template
to show.
 2015-10-28 16:35:11 -07:00
Victor Woeltjen
01b6fda1f2 [Representation] Update spec for mct-include 
...to account for usage of templateLinker to add or remove the
whole element from the DOM when there is or is not a template
to show.
 2015-10-28 16:11:00 -07:00
Victor Woeltjen
ae0cb63a92 [Representation] Remove template tester 
Remove template tester after verifying that mct-include/mct-representation
elements are added/removed to/from the DOM as appropriate.
 2015-10-28 16:02:52 -07:00
Victor Woeltjen
5604bf6d69 [Representation] Add template tester 
...to simply verification of mct-include/mct-representation
behavior.
 2015-10-28 16:01:55 -07:00
Victor Woeltjen
c5fcc5a558 [Representation] Handle edge cases 
Handle edge cases (e.g. directive priorities, race conditions)
to ensure that mct-representation and mct-include display correctly
when added to or removed from the DOM.
 2015-10-28 15:57:47 -07:00
Victor Woeltjen
ea9f607bba [Representation] Handle undefined scope 
element.scope() may be undefined when wiring in the info
gesture, so check for that.

That this is sometimes undefined appears to be a consequence
of changes to mct-representation, but which changes influence
this are unclear. In any event, it appears that this cannot
be relied-upon per https://github.com/angular/angular.js/issues/9515
 2015-10-28 15:49:18 -07:00
Victor Woeltjen
0404303042 [Representation] Move changes back 
Move changed lines back to their original location to simplify
diff.
 2015-10-28 15:38:11 -07:00
Victor Woeltjen
5677548298 [Representation] Show element synchronously 
...to avoid exceptions when trying to invoke representers
before an mct-representation has been added back into the
DOM.
 2015-10-28 15:32:50 -07:00
Victor Woeltjen
bcc42d705e [Representation] Hide elements without transclusion 2015-10-28 15:30:27 -07:00
Victor Woeltjen
ab008ae497 [Representation] Begin integration 
...of templateLinker into mct-representation. Not working currently
due to prevalence of mct-representation instances with transcluding
directives (hitting a multiple transclusion error.)
 2015-10-28 15:17:36 -07:00
Victor Woeltjen
3d59f6df0b [Representation] Separate out template loading/linking 
...from mct-include, to facilitate reuse for MCTRepresentation.
 2015-10-28 14:51:30 -07:00
Andrew Henry
4708ac0ec1 Removed console.log 2015-10-28 11:26:20 -07:00
Andrew Henry
bd984abc0f Changed encoding of images to address https://github.com/nasa/openmctweb/issues/203 2015-10-28 11:14:07 -07:00
Victor Woeltjen
b4a44dee8f [Representation] Populate mct-include contents 
Remove usage of ng-include and template from mct-include for
compatibility with element-level transclusion. Has useful
side effect of pre-fetching templates and reducing watch
count.
 2015-10-28 11:13:53 -07:00
Victor Woeltjen
942f617bd8 [Representation] Use transclusion for mct-include 
...to add/remove conditionally depending on the existence of
certain templates.

Note that this currently breaks mct-include due to an incompatibility
between element transclusion and directive templates; see
https://github.com/angular/angular.js/issues/3368.
 2015-10-28 10:29:46 -07:00
Victor Woeltjen
757cb0f015 [Representation] Watch for key changes 
...from mct-include. Improves behavior of that directive and supports
testing of changes to remove whole elements when inapplicable,
nasa/openmctweb#195.
 2015-10-28 10:18:59 -07:00
Victor Woeltjen
a2d06583ca Merge pull request #216 from nasa/open-vista54a 
Review and integrate open-vista54a into master
 2015-10-27 14:04:49 -07:00
Charles Hacskaylo
5d5425db04 [Frontend] Finessing and verifying CSS 
vista#54
Verified against fixed position and scrolling views
using SineWave generator;
font-size of glyph tweaked;
 2015-10-27 11:50:16 -07:00
Charles Hacskaylo
a8856c0612 [Frontend] Platform-specific mods to limits 
vista#54
Refactor limits into multiple classes, separating
upr/lwr from red/yellow;
Modded SineWaveLimitCapability accordingly;
Normalized upr/lwr glyphs;
(cherry picked from commit a26d71b)
 2015-10-27 11:43:28 -07:00
akhenry
74f289cb34 Merge pull request #206 from nasa/open150b 
[Plot] Ignore empty lines
 2015-10-27 10:48:33 -07:00
Victor Woeltjen
4ec243c6fb Merge pull request #212 from nasa/open211 
[RequireJS] Specify path for uuid
 2015-10-24 07:48:45 -07:00
akhenry
407d9881ff Merge pull request #200 from nasa/open-toc 
[Documentation] Add table of contents
 2015-10-23 19:16:51 -07:00
akhenry
6ee622b3f5 Merge pull request #192 from nasa/open153 
[CI] Remove non-existent bundle from procfile
 2015-10-23 17:04:04 -07:00
Henry
95ea33b441 Removed notification from bundles 2015-10-23 17:02:25 -07:00
akhenry
099d70b8d9 Merge pull request #175 from nasa/open147 
[Entanglement] Add "Go To Original" action
 2015-10-23 17:00:46 -07:00
Pete Richards
3d996ac466 [RequireJS] Specify path for uuid 
Specify path for uuid, making it available for any code that would require it,
without that code needing to know the path to it.

Fixes https://github.com/nasa/openmctweb/issues/211.
 2015-10-23 16:32:05 -07:00
Henry
896dd8d2c7 Fixed jslint errors 2015-10-23 16:30:51 -07:00
Henry
789b640b9b Refactored dismiss and minimize out of NotificationService and on to returned Notification type 2015-10-23 16:28:42 -07:00
Pete Richards
90828ef63d Merge remote-tracking branch 'github-open/open181' into open-master 2015-10-23 16:23:29 -07:00