added collateral migration and some other bug fixes

This commit is contained in:
JT Smith 2004-12-30 02:00:28 +00:00
parent b6f9315976
commit 4f8489300f
12 changed files with 321 additions and 329 deletions

View file

@ -16,7 +16,7 @@ function FileUploadControl(workspaceId, imageArray) {
str +='<table style="display: none;">'
str += '<tr id="' + workspaceId + '.template" class="fileUploadRow"><td><img src="' + images["unknown"] + '" style="visibility: hidden"></td>';
str +='<td><input type="file" name="files" size="40" onchange="FileUploadControl_valueChange(event)"></td><td><input type="button" value="Remove" onclick="FileUploadControl_removeButtonClick(event)"></td></tr>';
str +='<td><input type="file" name="file" size="40" onchange="FileUploadControl_valueChange(event)"></td><td><input type="button" value="Remove" onclick="FileUploadControl_removeButtonClick(event)"></td></tr>';
str += '</table>';
@ -120,4 +120,4 @@ function FileUploadControl_valueChange(e) {
}
control.swapImage(firedobj);
}
}

View file

@ -5,6 +5,12 @@
function Display() {
this.dom=document.getElementById&&!document.all;
this.documentElement = document.documentElement;
if (document.compatMode == "BackCompat") {
this.documentElement = document.body;
}
this.focusObjects = new Array();
this.overObjects = new Array();
this.topLevelElement=this.dom? "HTML" : "BODY"
@ -55,8 +61,8 @@ function Display_dragStart(firedobj,xCoordinate,yCoordinate) {
this.dragEnabled=true;
this.pageHeight = document.documentElement.scrollHeight;
this.pageWidth = document.documentElement.scrollWidth;
this.pageHeight = this.documentElement.scrollHeight;
this.pageWidth = this.documentElement.scrollWidth;
this.focusObjects[0]=firedobj.asset;
@ -138,10 +144,10 @@ function Display_move(e){
if (this.dragEnabled){
this.adjustScrollBars(e);
var topScroll = document.documentElement.scrollTop;
var leftScroll =document.documentElement.scrollLeft;
var topScroll = this.documentElement.scrollTop;
var leftScroll =this.documentElement.scrollLeft;
var act = this.spy(this.dom? e.pageX: (e.clientX + document.documentElement.scrollLeft),this.dom? e.pageY: (e.clientY + document.documentElement.scrollTop));
var act = this.spy(this.dom? e.pageX: (e.clientX + this.documentElement.scrollLeft),this.dom? e.pageY: (e.clientY + this.documentElement.scrollTop));
if (act && act.asset) {
this.selectAsset(act.asset);
@ -213,11 +219,13 @@ function Display_keyUp(e) {
function Display_adjustScrollBars(e) {
var scrY=0;
var scrX=0;
if (!this.documentElement) return;
var topScroll = document.documentElement.scrollTop;
var leftScroll = document.documentElement.scrollLeft;
var innerHeight = document.documentElement.clientHeight;
var innerWidth = document.documentElement.clientWidth;
var topScroll = this.documentElement.scrollTop;
var leftScroll = this.documentElement.scrollLeft;
var innerHeight = this.documentElement.clientHeight;
var innerWidth = this.documentElement.clientWidth;
if (e.clientY > innerHeight-this.scrollJump) {
if (e.clientY + topScroll < this.pageHeight - (this.scrollJump + 40)) {

View file

@ -10,6 +10,7 @@ var dragableList=new Array();
//browser check
var dom=document.getElementById&&!document.all
var docElement = document.documentElement;
var pageURL = "";
var dragging=false;
var z,x,y
@ -74,36 +75,36 @@ function dragable_adjustScrollBars(e) {
scrY=0;
scrX=0;
if (e.clientY > document.body.clientHeight-scrollJump) {
if (e.clientY + document.body.scrollTop < pageHeight - (scrollJump + 60)) {
if (e.clientY > docElement.clientHeight-scrollJump) {
if (e.clientY + docElement.scrollTop < pageHeight - (scrollJump + 60)) {
scrY=scrollJump;
window.scroll(document.body.scrollLeft,document.body.scrollTop + scrY);
window.scroll(docElement.scrollLeft,docElement.scrollTop + scrY);
y-=scrY;
}
}else if (e.clientY < scrollJump) {
if (document.body.scrollTop < scrollJump) {
scrY = document.body.scrollTop;
if (docElement.scrollTop < scrollJump) {
scrY = docElement.scrollTop;
}else {
scrY=scrollJump;
}
window.scroll(document.body.scrollLeft,document.body.scrollTop - scrY);
window.scroll(docElement.scrollLeft,docElement.scrollTop - scrY);
y+=scrY;
}
if (e.clientX > document.body.clientWidth-scrollJump) {
if (e.clientX + document.body.scrollLeft < pageWidth - (scrollJump + 60)) {
if (e.clientX > docElement.clientWidth-scrollJump) {
if (e.clientX + docElement.scrollLeft < pageWidth - (scrollJump + 60)) {
scrX=scrollJump;
window.scroll(document.body.scrollLeft + scrX,document.body.scrollTop);
window.scroll(docElement.scrollLeft + scrX,docElement.scrollTop);
x-=scrX;
}
}else if (e.clientX < scrollJump) {
if (document.body.scrollLeft < scrollJump) {
scrX = document.body.scrollLeft;
if (docElement.scrollLeft < scrollJump) {
scrX = docElement.scrollLeft;
}else {
scrX=scrollJump;
}
window.scroll(document.body.scrollLeft - scrX,document.body.scrollTop);
window.scroll(docElement.scrollLeft - scrX,docElement.scrollTop);
x+=scrX;
}
}
@ -111,6 +112,13 @@ function dragable_adjustScrollBars(e) {
//initialization routine, must be called on load. Sets up event handlers
function dragable_init(url) {
docElement = document.documentElement;
if (document.compatMode == "BackCompat") {
docElement = document.body;
}
pageURL = url;
//window.scroll(10,500);
//set up event handlers
@ -149,7 +157,7 @@ function dragable_move(e){
if (dragging){
if (accuracyCount==accuracy) {
tmp = dragable_spy(dom? e.pageX: (e.clientX + document.body.scrollLeft),dom? e.pageY: (e.clientY + document.body.scrollTop));
tmp = dragable_spy(dom? e.pageX: (e.clientX + docElement.scrollLeft),dom? e.pageY: (e.clientY + docElement.scrollTop));
if (tmp.length != 0) {
dragable_dragOver(tmp[0],tmp[1]);
}else {
@ -178,7 +186,7 @@ function dragable_move(e){
return false
}else {
tmp = dragable_spy(dom? e.pageX: (e.clientX + document.body.scrollLeft),dom? e.pageY: (e.clientY + document.body.scrollTop));
tmp = dragable_spy(dom? e.pageX: (e.clientX + docElement.scrollLeft),dom? e.pageY: (e.clientY + docElement.scrollTop));
if (tmp.length == 0) {
currentDiv = null;
@ -207,8 +215,8 @@ function dragable_dragStart(e){
fObj.className="dragging";
//set the page height and width in a var since IE changes them when scrolling
pageHeight = window.document.body.scrollHeight;
pageWidth = window.document.body.scrollWidth;
pageHeight = docElement.scrollHeight;
pageWidth = docElement.scrollWidth;
dragging=true
z=fObj;