Changeset 25075 for main/trunk/model-cols-dev
- Timestamp:
- 2012-02-13T14:08:47+13:00 (12 years ago)
- Location:
- main/trunk/model-cols-dev/peijones/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/model-cols-dev/peijones/js/annotator/pkg/annotator-full.min.js
r24948 r25075 639 639 640 640 var rangeString = u.ranges[0].startOffset + "_" + u.ranges[0].endOffset; 641 641 642 /* 642 643 var found = false; 643 644 for(var i = 0; i < gs.annotationArray.keys.length; i++){if(gs.annotationArray.keys[i] == rangeString){found = true; break;}} … … 649 650 gs.annotationArray[rangeString] = u; 650 651 console.log("(setup) Adding " + u.quote + ", " + u.text + ", " + u.tags + " to " + rangeString); 652 showRebuildOption(); 653 */ 651 654 return u 652 655 }; … … 659 662 var w, v, y, x; 660 663 x = u.highlights; 661 664 662 665 for (v = 0, y = x.length; v < y; v++) { 663 666 w = x[v]; … … 666 669 667 670 var rangeString = u.ranges[0].startOffset + "_" + u.ranges[0].endOffset; 668 gs.toDeleteArray[rangeString] = gs.annotationArray[rangeString];671 gs.toDeleteArray[rangeString] = u; 669 672 gs.toDeleteArray.keys.push(rangeString); 670 673 gs.annotationArray[rangeString] = null; 671 674 showRebuildOption(); 672 675 this.publish("annotationDeleted", [u]); 673 676 return u … … 1593 1596 gs.annotationArray[rangeString] = u; 1594 1597 console.log("(setup) Adding " + u.quote + ", " + u.text + ", " + u.tags + " to " + rangeString); 1598 showRebuildOption(); 1595 1599 return h(u.highlights).data("annotation", u) 1596 1600 }; … … 2066 2070 }) 2067 2071 } 2072 /* 2068 2073 if (this.options.showEditPermissionsCheckbox === true) { 2069 2074 this.annotator.editor.addField({ … … 2074 2079 }) 2075 2080 } 2081 */ 2082 console.log(this.annotator.editor); 2076 2083 this.annotator.viewer.addField({ 2077 2084 load: this.updateViewer -
main/trunk/model-cols-dev/peijones/js/documentmaker/PhotoNotes-1.5.js
r24823 r25075 1 1 2 3 /*********************************************************/4 2 /*** Photo Notes Container *******************************/ 5 /*********************************************************/ 3 6 4 function PhotoNoteContainer(element, config) 7 5 { … … 79 77 }; 80 78 81 82 83 /*********************************************************/84 79 /*** Photo Note ******************************************/ 85 /*********************************************************/ 80 86 81 function PhotoNote(text,id,rect) 87 82 { … … 410 405 { 411 406 this.maxRight = currentNote.container.element.offsetWidth; 412 this.maxBottom = currentNote.container.element.offsetHeight - 3;407 this.maxBottom = currentNote.container.element.offsetHeight + $("#noZoom").position().top - 3; 413 408 return true; 414 409 } … … 443 438 { 444 439 currentNote.rect.left = parseInt(this.element.style.left); 445 currentNote.rect.top = parseInt(this.element.style.top) ;440 currentNote.rect.top = parseInt(this.element.style.top) - $("#noZoom").position().top; 446 441 currentNote.rect.width = parseInt(this.element.style.width); 447 442 currentNote.rect.height = parseInt(this.element.style.height); … … 467 462 /* outer most box */ 468 463 this.gui.ElementRect.style.left = this.rect.left + 'px'; 469 this.gui.ElementRect.style.top = this.rect.top + 'px';464 this.gui.ElementRect.style.top = this.rect.top + $("#noZoom").position().top + 'px'; 470 465 this.gui.ElementRect.style.width = this.rect.width + 'px'; 471 466 this.gui.ElementRect.style.height = this.rect.height + 'px'; … … 484 479 485 480 this.gui.ElementNote.style.left = this.rect.left + this.XOffset + 'px'; 486 this.gui.ElementNote.style.top = this.rect.top + this.YOffset + this.rect.height + 'px';481 this.gui.ElementNote.style.top = this.rect.top + this.YOffset + this.rect.height + $("#noZoom").position().top + 'px'; 487 482 488 483 } … … 626 621 minWidth: 10, minHeight: 10, // Minimum pixel size of elements. 627 622 minLeft: 0, maxRight: 9999, // Bounding box area. 628 minTop: 0, maxBottom: 9999,623 minTop: $("#noZoom").position().top, maxBottom: 9999, 629 624 zIndex: 1, // The highest Z-Index yet allocated. 630 625 mouseX: 0, mouseY: 0, // Current mouse position, recorded live. … … 696 691 // Record element attributes for mouseMove(). 697 692 elmX = parseInt(element.style.left); 698 elmY = parseInt(element.style.top );693 elmY = parseInt(element.style.top + $("#noZoom").position().top); 699 694 elmW = element.offsetWidth; 700 695 elmH = element.offsetHeight;
Note:
See TracChangeset
for help on using the changeset viewer.