Minor tweaking to make event naming more consistent

src/editor.js

@@ -115,7 +115,7 @@ annotorious.Editor.prototype.open = function(opt_annotation, opt_event) {
       goog.dom.appendChild(field.el, f);
     }
   });
-  this._annotator.fireEvent(annotorious.events.EventType.ANNOTATION_EDITOR_SHOWN, opt_annotation);
+  this._annotator.fireEvent(annotorious.events.EventType.EDITOR_SHOWN, opt_annotation);
 }
 
 /**

src/events.js

@@ -105,6 +105,16 @@ annotorious.events.EventType = {
    * The current selection was changed
    */
   SELECTION_CHANGED: 'onSelectionChanged',
+
+  /**
+   * The annotation editor was opened.  Pass the annotation object if it exists.
+   */
+  EDITOR_SHOWN: 'onEditorShown',
+
+  /**
+   * The annotation popop was opened.  Pass the annotation object.
+   */
+  POPUP_SHOWN: 'onPopupShown',
 
   /**
    * The annotation popup widget is about to hide
@@ -129,16 +139,6 @@ annotorious.events.EventType = {
   /**
    * An existing annotation was updated
    */
-  ANNOTATION_UPDATED: 'onAnnotationUpdated',
-
-  /**
-   * The annotation editor was opened.  Pass the annotation object if it exists.
-   */
-  ANNOTATION_EDITOR_SHOWN: 'onAnnotationEditorShown',
-
-  /**
-   * The annotation popop was opened.  Pass the annotation object.
-   */
-  ANNOTATION_POPUP_SHOWN: 'onAnnotationPopupShown'
+  ANNOTATION_UPDATED: 'onAnnotationUpdated'
 
 };

src/popup.js

@@ -175,7 +175,7 @@ annotorious.Popup.prototype.show = function(annotation, xy) {
 
   goog.style.setOpacity(this.element, 0.9);
   goog.style.setStyle(this.element, 'pointer-events', 'auto');
-  this._annotator.fireEvent(annotorious.events.EventType.ANNOTATION_POPUP_SHOWN, annotation);
+  this._annotator.fireEvent(annotorious.events.EventType.POPUP_SHOWN, annotation);
 }
 
 /**