Cleaned up loading of popups onClick and onSelect

DigiExam · May 28, 2014 · 8ee3ba2 · 8ee3ba2
1 parent b076772
commit 8ee3ba2
Showing 1 changed file with 44 additions and 74 deletions.
diff --git a/js/src/ng-annotate.coffee b/js/src/ng-annotate.coffee
@@ -270,44 +270,7 @@ ngAnnotate.directive "ngAnnotate", ($rootScope, $compile, $http, $q, NGAnnotatio
 					clearPopups()
 					clearTooltips()
 
-					popup = new NGAnnotatePopup $rootScope.$new()
-					popup.scope.$isNew = true
-					popup.scope.$annotation = annotation
-					popup.$anchor = $span
-
-					popup.scope.$reject = ->
-						removeAnnotation annotation.id, $scope.annotations
-
-						if $scope.onAnnotateDelete?
-							$scope.onAnnotateDelete annotation
-
-						clearPopups()
-						popup.destroy()
-						return
-
-					popup.scope.$close = ->
-						if $scope.onAnnotate?
-							$scope.onAnnotate popup.scope.$annotation
-
-						clearPopups()
-						popup.destroy()
-						return
-
-					popup.scope.$reposition = ->
-						popup.positionTop()
-						popup.positionLeft element.offset().left - popup.$el.innerWidth()
-						return
-
-					activePopups.push popup
-
-					getTemplatePromise = getPopupTemplate options.popupTemplateUrl
-					getTemplatePromise.then (template)->
-						$compile(angular.element(template)) popup.scope, ($content)->
-							popup.$el.html $content
-							popup.$el.appendTo "body"
-							popup.positionTop()
-							popup.positionLeft element.offset().left - popup.$el.innerWidth()
-							popup.show()
+					loadAnnotationPopup annotation, $span, true
 
 				onClick = (event)->
 					$target = angular.element event.target
@@ -321,45 +284,12 @@ ngAnnotate.directive "ngAnnotate", ($rootScope, $compile, $http, $q, NGAnnotatio
 							if p.scope? and p.scope.$annotation.id is targetId
 								clearPopups()
 								return
-					clearPopups()
-					clearTooltips()
-
 					annotation = getAnnotationById $scope.annotations, targetId
-					popup = new NGAnnotatePopup $rootScope.$new()
-					popup.scope.$isNew = false
-					popup.scope.$annotation = annotation
-					popup.$anchor = $target
-
-					popup.scope.$reject = ->
-						removeAnnotation targetId, $scope.annotations
-						if typeof($scope.onAnnotateDelete) is "function"
-							$scope.onAnnotateDelete annotation
-						clearPopups()
-						popup.destroy()
-						return
-
-					popup.scope.$close = ->
-						if typeof($scope.onAnnotate) is "function"
-							$scope.onAnnotate popup.scope.$annotation
-						clearPopups()
-						popup.destroy()
-						return
 
-					popup.scope.$reposition = ->
-						popup.positionTop()
-						popup.positionLeft element.offset().left - popup.$el.innerWidth()
-						return
+					clearPopups()
+					clearTooltips()
 
-					activePopups.push popup
-
-					getTemplatePromise = getPopupTemplate options.popupTemplateUrl
-					getTemplatePromise.then (template)->
-						$compile(angular.element(template)) popup.scope, ($content)->
-							popup.$el.html $content
-							popup.$el.appendTo "body"
-							popup.positionTop()
-							popup.positionLeft element.offset().left - popup.$el.innerWidth()
-							popup.show()
+					loadAnnotationPopup annotation, $target, false
 
 				onMouseEnter = (event)->
 					event.stopPropagation()
@@ -407,6 +337,46 @@ ngAnnotate.directive "ngAnnotate", ($rootScope, $compile, $http, $q, NGAnnotatio
 
 					clearTooltips()
 
+				loadAnnotationPopup = (annotation, anchor, isNew)->
+					popup = new NGAnnotatePopup $rootScope.$new()
+					popup.scope.$isNew = isNew
+					popup.scope.$annotation = annotation
+					popup.$anchor = anchor
+
+					popup.scope.$reject = ->
+						removeAnnotation annotation.id, $scope.annotations
+
+						if $scope.onAnnotateDelete?
+							$scope.onAnnotateDelete annotation
+
+						clearPopups()
+						popup.destroy()
+						return
+
+					popup.scope.$close = ->
+						if $scope.onAnnotate?
+							$scope.onAnnotate popup.scope.$annotation
+
+						clearPopups()
+						popup.destroy()
+						return
+
+					popup.scope.$reposition = ->
+						popup.positionTop()
+						popup.positionLeft element.offset().left - popup.$el.innerWidth()
+						return
+
+					activePopups.push popup
+
+					getTemplatePromise = getPopupTemplate options.popupTemplateUrl
+					getTemplatePromise.then (template)->
+						$compile(angular.element(template)) popup.scope, ($content)->
+							popup.$el.html $content
+							popup.$el.appendTo "body"
+							popup.positionTop()
+							popup.positionLeft element.offset().left - popup.$el.innerWidth()
+							popup.show()
+
 				element.on "mouseover", "span", onMouseEnter
 				element.on "mouseleave", "span", onMouseLeave