From d649e208a7313583d52412e650bf8b45e4302e33 Mon Sep 17 00:00:00 2001 From: lduarte1991 Date: Tue, 26 Aug 2014 15:59:16 -0400 Subject: [PATCH] Annotation Tools: Adding Check for Grouping in MyNotes - Grouping instance checked instead of prototype - adding comments --- common/static/js/vendor/ova/catch/js/catch.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/common/static/js/vendor/ova/catch/js/catch.js b/common/static/js/vendor/ova/catch/js/catch.js index a5da7106a8..a1f5c46bf9 100644 --- a/common/static/js/vendor/ova/catch/js/catch.js +++ b/common/static/js/vendor/ova/catch/js/catch.js @@ -1124,9 +1124,15 @@ 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') { - this.annotator.plugins.Grouping.useGrouping = 0; + // 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.annotator.plugins.Grouping.useGrouping = 1; + // 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.publish("changedTabsInCatch"); } @@ -1156,7 +1162,10 @@ CatchAnnotation.prototype = { var searchtype = searchtype || ""; var searchInput = searchInput || ""; this.clean = true; - this._clearAnnotator(); + + // the following cannot run in notes for there are no highlights + if($("#notesHolder").length === 0) + this._clearAnnotator(); var annotator = this.annotator; var loadFromSearch = annotator.plugins.Store.options.loadFromSearch;