32c7cc2424
[Treeview] Cleanup order
...
Rearrange the sass so that classes appear in the
order that they appear in browse.html, with
correct nesting as well.
No changes to the actual UI from this.
2015-08-20 14:51:32 -07:00
dcfcfa74bb
Merge branch 'master' of https://github.com/nasa/openmctweb into open72
...
Conflicts:
platform/commonUI/general/res/css/theme-espresso.css
2015-08-20 13:25:39 -07:00
79529e4879
[Treeview] Open in new tab settings
...
When an object is opened in a new tab, the left
pane will be closed by default. Otherwise it will
be open by default. #72 .
2015-08-20 13:14:57 -07:00
503c8e2f03
[Treeview] Collapse button styling
...
Changed color to better match topbar buttons.
Icon changes direction when pane is open vs
closed.
2015-08-20 13:02:40 -07:00
570e0f31b2
[Treeview] Rename layout to pane
...
To better reflect what the file is modifying
2015-08-20 12:05:48 -07:00
83c86c748c
[Treeview] Remove unnecissary file
...
_splitter.scss merged into _layout.scss, within the
tree folder
2015-08-20 11:59:03 -07:00
4b3ca316e1
[Treeview] Update tests
...
For the existence of ngModel
2015-08-20 11:50:44 -07:00
3f7b874b38
[Treeview] Remove console.log
2015-08-20 11:47:16 -07:00
ed96889fce
[Treeview] Fix splitter bar movement
...
Fixed the splitter bar so that it is now
draggable again.
2015-08-20 11:25:11 -07:00
d2bc8227c7
[Treeview] Create button and slide transition
...
Made the create button visible when the left
pane is closed. Added a transition between
opening and closing the pane.
2015-08-20 10:41:30 -07:00
81ece1190e
[Treeview] Collapse button styling
...
Made smaller, with flat left side.
2015-08-20 09:19:09 -07:00
62f7ca5a0a
[Treeview] Treeview collapse toggle
...
Clicking on the pane tab now toggles the
treeview.
2015-08-19 16:57:11 -07:00
29b1cfa890
[Treeview] Rename variable for clarity
...
paneModel's pane to leftPane, for clarity
once a right pane is added.
2015-08-19 16:47:12 -07:00
e44e50823e
[Treeview] Treeview collapse
...
Clicking on the pane tab now will make the treeview
invisible, and set the width to 0. BUT, this does
not immediately move the splitter bar, though it
does go to the correct width if clicked.
Needs more work.
2015-08-19 16:44:42 -07:00
4a730f875f
[Treeview] Clicking toggles model property
...
Clicking on the pane tab icon toggles ngModel.pane
2015-08-19 16:29:55 -07:00
8108a3b81c
[Treeview] Html style
2015-08-19 16:02:49 -07:00
b8958edf72
[Treeview] Fixing errors, commits
2015-08-19 16:00:51 -07:00
2b00b71da9
[Treeview] Error fixing
...
Trying to get mctSplitter error to be fixed.
Reverting to an extent.
2015-08-19 15:45:17 -07:00
9c912b62d3
[Treeview] Modified left splitter
...
Added a 'button' (which does not work yet). It
sticks out of the splitter like a tab.
2015-08-19 15:08:27 -07:00
a4a9acd2ea
Merge branch 'open-master' into open-965
...
Merge in latest into topic branch for WTD-965 to
resolve conflicts.
Conflicts:
platform/commonUI/general/res/css/theme-espresso.css
2015-08-19 14:16:56 -07:00
c118234bbf
[Style] Brace after if criteria
2015-08-19 13:55:02 -07:00
a94763041e
[Move] correct logic and specification
2015-08-19 13:16:36 -07:00
ffd80ed42b
[Treeview] Style
...
Changed indentation in the html
2015-08-19 13:12:37 -07:00
8dad6a3fd5
Merge browse files from branch 'mobile' into open72
2015-08-19 13:04:11 -07:00
26892e7104
[Location] isLink/isOriginal are antonyms
...
Simplify implementation of isLink/isOriginal for better maintainability.
2015-08-19 11:49:45 -07:00
5c74365f4b
[Root] Root model provider sets location
...
Root model provider sets the location of roods so that the location
capability does not need special handling for this.
2015-08-19 11:49:03 -07:00
94854e5965
[Location] can retrieve contextual location
...
Clarify naming of method for retrieving contextual location of a domain
object.
Default behavior for objects that do not have a context is to return
undefined. Note that default behavior is not specified and could change
if needed.
2015-08-19 11:33:45 -07:00
9cf30f4213
[Location] setPrimaryLocation takes location.
...
Rename "persistLocation" to be more clearly named, and make it take an
argument to allow for greater control outside the capability.
2015-08-19 11:25:41 -07:00
eb776e69c0
[JSDoc] Document LocationCapability constructor
2015-08-19 11:13:24 -07:00
f4b87cf70d
[Project source] Updated icomoon.io symbols font project file
2015-08-17 15:47:28 -07:00
366ec3d516
[Frontend] Styles for tabular views and view sections
...
Original issue: https://github.jpl.nasa.gov/MissionControl/vista/issues/30
New CSS and symbols to support tabular views;
Required by JPL branch vista30 (https://github.jpl.nasa.gov/MissionControl/vista/tree/vista30 )
2015-08-17 15:11:27 -07:00
9ab06cfdd2
Merge remote-tracking branch 'github-open/open1506' into open-master
2015-08-17 11:48:23 -07:00
83fce6ad77
[Search] Remove unused dependency
...
Remove unused dependency from generic search worker,
avoids WTD-1511.
2015-08-17 10:45:02 -07:00
94531a39d0
Merge branch 'master' of https://github.com/nasa/openmctweb into searchservice
2015-08-12 13:17:17 -07:00
cab675c8ca
[Search] Timeout length & indexed check
...
Changed timeout to 0 ms. Changed check for
already indexed to an empty return.
2015-08-12 10:57:37 -07:00
0520f1c70c
[Search] Update tests
...
Test creation of the generic search provider
provides mock timeout argument. Slight change to
tree indexing test due to use of useCapability
function.
2015-08-12 09:53:23 -07:00
3b62f1a979
[Search] Break up item indexing
...
Use timeouts to make the generic search's item
indexing not block up the page.
2015-08-12 09:42:21 -07:00
48693df51f
[Search] Input checks
...
More checks to see if the input is empty
before doing search computations.
2015-08-11 13:52:23 -07:00
2d5ec97dc3
[Menu] Listen to element directly
...
Add listener to menu element directly instead of
using ng-click to aid in testing (and for consistency
with related listeners.) WTD-1506.
2015-08-07 14:39:59 -07:00
87aa0cfce2
[Menus] Dismiss menu when clicked
...
Addresses WTD-1506 (context menu does not disappear after
action is chosen); listen for click events on the menu
itself and dismiss the menu when these occur.
2015-08-07 14:34:27 -07:00
058a0d393d
[Compatibility] Store reference instead of binding
2015-08-06 16:55:15 -07:00
b0a23590d4
Revert "[Build] Bump PhantomJS Version"
...
This reverts commit 62f335573a
2015-08-06 16:53:42 -07:00
48a9eef924
Merge branch 'open-master' into open-965
2015-08-06 16:13:37 -07:00
62f335573a
[Build] Bump PhantomJS Version
...
Bump PhantomJS version to latest (for ES5 support) and upgrade
dependencies as necessary.
2015-08-06 16:04:58 -07:00
c80e9bfa26
[Style] JSLint Compliance
2015-08-06 15:21:28 -07:00
ec62c27f36
[Representations] grid-item and label display links
...
grid-item and label representations now use the "location" capability
to determine whether or not to show a link indicator.
2015-08-06 15:12:02 -07:00
19b80ded16
Merge remote-tracking branch 'origin/open1423' into open-965
2015-08-06 15:10:52 -07:00
f72f88adfa
[Location] Use parent id as location
...
Use the parent id as the location for a model.
This greatly reduces the recursive work that must be done
during move operations to keep the location accurate.
Additionally, the locationService now implements a method
`persistLocation` which can be used to persist the current object
location as it's original location.
2015-08-06 15:05:47 -07:00
f083d019a3
[Entanglement] Move service recursively updates locations
...
When moving an object that supports composition, child objects which
are originals must have their location updated as well. Children which
are links should not have their location updated, nor should any of
their children be updated.
2015-08-06 15:05:47 -07:00
10ec30ba76
[Entanglement] MoveService updates the location of moved objects
...
The move service updates the location of moved objects when those
objects are originals.
2015-08-06 15:05:46 -07:00
