Commit e7d1623295856ff7de9a97ba2d236307d0eb46ae

Merge conflict - Line200 --
  • Diff rendering mode:
  • inline
  • side by side

swtr/static/js/swtmaker.js

154 swt.get('how').text += '\n - by ' + swt.get('who');154 swt.get('how').text += '\n - by ' + swt.get('who');
155 }155 }
156 console.log(swt.get('how'));156 console.log(swt.get('how'));
157 anno.addAnnotation(newanno);
157 anno.addAnnotation(swt.get('how'));
158 });158 });
159 //console.log(swtr.sweets.toJSON());159 //console.log(swtr.sweets.toJSON());
160 swtr.appView.$overlay.hide();160 swtr.appView.$overlay.hide();
……
197 });197 });
198 anno.addPlugin('CustomFields', this.showSwtHelp); 198 anno.addPlugin('CustomFields', this.showSwtHelp);
199 anno.addHandler('onSelectionCompleted', this.setShape); 199 anno.addHandler('onSelectionCompleted', this.setShape);
200 anno.showAnnotations(); });
201
202
203 this.$overlay = $('#app-overlay');200 this.$overlay = $('#app-overlay');
204 this.$img = $('#annotatable-img');201 this.$img = $('#annotatable-img');
205 this.imgURL = this.$img.attr('src');202 this.imgURL = this.$img.attr('src');
……
284 },284 },
285 showHide: function() {285 showHide: function() {
286 if($("input:checked").length) {286 if($("input:checked").length) {
287 $("p").toggle();
287 //$("p").toggle();
288 $('.annotorious-item-unfocus').css("opacity", "0.5");288 $('.annotorious-item-unfocus').css("opacity", "0.5");
289 }289 }
290 else {290 else {
291 $("p").toggle();
291 //$("p").toggle();
292 $('.annotorious-item-unfocus').css("opacity", "0");292 $('.annotorious-item-unfocus').css("opacity", "0");
293 }293 }
294294