From e7d1623295856ff7de9a97ba2d236307d0eb46ae Mon Sep 17 00:00:00 2001
From: Bhanu <bhanu@servelots.com>
Date: Fri, 23 May 2014 16:01:56 +0530
Subject: [PATCH] Merge conflict - Line200 --

---
 swtr/static/js/swtmaker.js |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/swtr/static/js/swtmaker.js b/swtr/static/js/swtmaker.js
index bdd8182..f259b8c 100644
--- a/swtr/static/js/swtmaker.js
+++ b/swtr/static/js/swtmaker.js
@@ -154,7 +154,7 @@
               swt.get('how').text += '\n - by ' + swt.get('who');
             }
             console.log(swt.get('how'));
-            anno.addAnnotation(newanno);
+            anno.addAnnotation(swt.get('how'));
           });
           //console.log(swtr.sweets.toJSON());
           swtr.appView.$overlay.hide();
@@ -197,9 +197,6 @@
       });
       anno.addPlugin('CustomFields', this.showSwtHelp); 
       anno.addHandler('onSelectionCompleted', this.setShape);  
-        anno.showAnnotations(); });
-
-
       this.$overlay = $('#app-overlay');
       this.$img = $('#annotatable-img');
       this.imgURL = this.$img.attr('src');
@@ -287,11 +284,11 @@
     },
     showHide: function() {
       if($("input:checked").length) {
-        $("p").toggle();
+        //$("p").toggle();
         $('.annotorious-item-unfocus').css("opacity",  "0.5");
       }
       else {
-        $("p").toggle();
+        //$("p").toggle();
         $('.annotorious-item-unfocus').css("opacity", "0");
       }
 
-- 
1.7.10.4