Annotation Tools: Clean-up

common/static/js/vendor/ova/catch/js/catch.js

@@ -1123,17 +1123,10 @@ CatchAnnotation.prototype = {
         
         // checks to make sure that Grouping is redone when switching tags in text annotations
         if (this.options.media === 'text') {
-            if (this.current_tab ==='public') {
+            if (typeof this.annotator.plugins.Grouping !== 'undefined') {
                 // this is to check if user is is MyNotes instead of the annotation component
-                if (typeof this.annotator.plugins.Grouping !== 'undefined') {
-                    this.annotator.plugins.Grouping.useGrouping = 0;
-                }
-            } else {
-                // this is to check if user is is MyNotes instead of the annotation component
-                if (typeof this.annotator.plugins.Grouping !== 'undefined'){
-                    this.annotator.plugins.Grouping.useGrouping = 1;
-                }
-            }
+                this.annotator.plugins.Grouping.useGrouping = this.current_tab === 'public' ? 0 : 1;
+            } 
             this.annotator.publish("changedTabsInCatch");
         }
         // Change userid and refresh
@@ -1164,8 +1157,9 @@ CatchAnnotation.prototype = {
         this.clean = true;
 
         // the following cannot run in notes for there are no highlights
-        if($("#notesHolder").length === 0)
+        if ($("#notesHolder").length === 0) {
             this._clearAnnotator();
+        }
         
         var annotator = this.annotator;
         var loadFromSearch = annotator.plugins.Store.options.loadFromSearch;