Merge pull request #151 from pe4cey/keep-inspector-style-open

Keep viz style editor open

Author: oskarhane

app/scripts/controllers/D3Graph.coffee

@@ -68,10 +68,22 @@ angular.module('neo4jApp.controllers')
         graphView.update()
         selectItem(selectedItem)
 
+      closeContextMenuForItem = (d) =>
+        if d is selectedItem
+          d?.selected = no
+          selectedItem = null
+        else
+          selectedItem?.selected = no
+          d?.selected = yes
+          selectedItem = d
+
+        graphView.update()
+        selectedItem
+
       $rootScope.$on 'layout.changed', (-> graphView?.resize())
 
       $rootScope.$on 'close.contextMenu', (->
-        toggleSelection(selectedItem)
+        closeContextMenuForItem selectedItem
       )
 
       $scope.$watch 'displayInternalRelationships', (displayInternalRelationships) ->

app/scripts/controllers/Inspector.coffee

@@ -99,19 +99,16 @@ angular.module('neo4jApp.controllers')
         Inspector.visible = !Inspector.visible
 
       $scope.selectArrowWidth = (item, size) ->
-        $scope.$emit 'close.contextMenu'
         item.style = graphStyle.changeForSelector(item.style.selector, size)
 
       $scope.selectCaption = (item, caption) ->
-        $scope.$emit 'close.contextMenu'
         item.style = graphStyle.changeForSelector(item.style.selector, { caption: caption})
 
       $scope.isSelectedCaption = (item, caption) ->
         grassProps = item.style.props
         grassProps.caption is "#{caption}" or (!grassProps.caption and caption in ["<id>", "<type>"])
 
       $scope.selectScheme = (item, scheme) ->
-        $scope.$emit 'close.contextMenu'
         item.style = graphStyle.changeForSelector(item.style.selector, angular.copy(scheme))
 
       $scope.selectSize = (item, size) ->
@@ -127,9 +124,4 @@ angular.module('neo4jApp.controllers')
         width: nodeDisplaySizes[idx]
         height: nodeDisplaySizes[idx]
 
-      $scope.$watch('style', (oldValue, newValue) ->
-        unless oldValue is newValue or newValue is not null
-          $scope.$emit 'close.contextMenu'
-      )
-
   ]