Commit e7d1623295856ff7de9a97ba2d236307d0eb46ae

Merge conflict - Line200 --
  
154154 swt.get('how').text += '\n - by ' + swt.get('who');
155155 }
156156 console.log(swt.get('how'));
157 anno.addAnnotation(newanno);
157 anno.addAnnotation(swt.get('how'));
158158 });
159159 //console.log(swtr.sweets.toJSON());
160160 swtr.appView.$overlay.hide();
197197 });
198198 anno.addPlugin('CustomFields', this.showSwtHelp);
199199 anno.addHandler('onSelectionCompleted', this.setShape);
200 anno.showAnnotations(); });
201
202
203200 this.$overlay = $('#app-overlay');
204201 this.$img = $('#annotatable-img');
205202 this.imgURL = this.$img.attr('src');
284284 },
285285 showHide: function() {
286286 if($("input:checked").length) {
287 $("p").toggle();
287 //$("p").toggle();
288288 $('.annotorious-item-unfocus').css("opacity", "0.5");
289289 }
290290 else {
291 $("p").toggle();
291 //$("p").toggle();
292292 $('.annotorious-item-unfocus').css("opacity", "0");
293293 }
294294