From 9ddb2e6830b72bfe57891a53445fe073ee32ea42 Mon Sep 17 00:00:00 2001 From: "Matteo Nastasi (mop)" Date: Wed, 7 Dec 2011 08:34:37 +0100 Subject: [PATCH] moved js code from html to js files --- base-test.html => test-base.html | 0 test-dd.html | 18 ++++ test-div-coord.html | 75 ++----------- test_dd.html | 175 ------------------------------- xynt-dd-test.js | 8 ++ xynt-div-coord-test.js | 95 +++++++++++++++++ 6 files changed, 128 insertions(+), 243 deletions(-) rename base-test.html => test-base.html (100%) create mode 100644 test-dd.html delete mode 100644 test_dd.html create mode 100644 xynt-dd-test.js create mode 100644 xynt-div-coord-test.js diff --git a/base-test.html b/test-base.html similarity index 100% rename from base-test.html rename to test-base.html diff --git a/test-dd.html b/test-dd.html new file mode 100644 index 0000000..8fdfaf4 --- /dev/null +++ b/test-dd.html @@ -0,0 +1,18 @@ + + + + + + + + + + + +
+ +
+ +
+ + diff --git a/test-div-coord.html b/test-div-coord.html index 09af921..f9ada6b 100644 --- a/test-div-coord.html +++ b/test-div-coord.html @@ -1,87 +1,26 @@ + + - + -
-
+
aa1
aa2
aa3
aa4
aa5
aa6
aa7
aa8
aa9
aaA
aaB
aaC
aaD
aaE
aaF
aa0
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
bb1
bb2
bb3
bb4
bb5
bb6
bb7
bb8
bb9
bbA
bbB
bbC
bbD
bbE
bbF
bb0
-
-
+
+ +
aa1
aa2
aa3
aa4
aa5
aa6
aa7
aa8
aa9
aaA
aaB
aaC
aaD
aaE
aaF
aa0
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
bb1
bb2
bb3
bb4
bb5
bb6
bb7
bb8
bb9
bbA
bbB
bbC
bbD
bbE
bbF
bb0
diff --git a/test_dd.html b/test_dd.html deleted file mode 100644 index 2b879ae..0000000 --- a/test_dd.html +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - - - - - -
- -
- -
- - diff --git a/xynt-dd-test.js b/xynt-dd-test.js new file mode 100644 index 0000000..3cc8e54 --- /dev/null +++ b/xynt-dd-test.js @@ -0,0 +1,8 @@ +function dropt1() +{ + ; //alert("t1"); +} +window.onload = function() { + console.log("HT"+$('t1')); + xynt_dd.call($('t1'), dropt1, -1600, 1600, 10,10); +} \ No newline at end of file diff --git a/xynt-div-coord-test.js b/xynt-div-coord-test.js new file mode 100644 index 0000000..f678f3f --- /dev/null +++ b/xynt-div-coord-test.js @@ -0,0 +1,95 @@ + +function dimension() +{ + //var w = getStyle(window.document.body, "width", "width"); + //var h = getStyle(window.document.body, "height", "height"); + var w = window.innerWidth; + var h = window.innerHeight; + + console.log("W: "+w+" H: "+h); + + $('board-drag').style.left = (parseInt(w) / 2 - 2)+"px"; + $('board-drag').style.top = "0px"; + /*$('board-drag').style.width = (10)+"px"; */ + $('board-drag').style.height = (parseInt(h) - 2)+"px"; + + $('board').xynt_divcoo_hidescroll = 0; + $('board').style.top = "0px"; + $('board').style.left = "0px"; + // $('board').style.width = (parseInt(w) / 2 - 2)+"px"; + $('board').style.height = (parseInt(h) - 2)+"px"; + + $('board').style.width = parseInt($('board-drag').style.left)+$('board').xynt_divcoo_hidescroll+"px"; + if (parseInt($('board').style.width) > $('board').clientWidth) { + // alert("di qui"); + $('board').xynt_divcoo_hidescroll = parseInt($('board').style.width) - $('board').clientWidth; + $('board').style.width = parseInt($('board-drag').style.left)+$('board').xynt_divcoo_hidescroll+"px"; + // $('board').style.width = (parseInt($('board').style.width) + $('board').xynt_divcoo_hidescroll)+"px"; + } + + // $('board2').style.left = (parseInt(w) / 2 - 1 + parseInt($('board-drag').style.width))+"px"; + $('board2').style.left = parseInt($('board-drag').style.left)+parseInt($('board-drag').style.width)+1+"px"; + $('board2').style.top = "0px"; + $('board2').style.width = (w - (parseInt($('board-drag').style.left)+parseInt($('board-drag').style.width)+4))+"px"; + // $('board2').style.width = (parseInt(w) / 2 - 2 - 10)+"px"; + $('board2').style.height = (parseInt(h) - 2)+"px"; + + + + var h1 = $('board2').clientHeight; + var h2 = $('board').clientHeight; + + if (h1 > h2) { + $('board2').style.height = h2+"px"; + } + else if (h2 > h1) { + $('board').style.height = h1+"px"; + } + + console.log($('board2').scrollTop); + $('board').scrollTop = $('board2').scrollTop; +} + + +function resize(event, obj) +{ + if (event == 'drag') { + var w = window.innerWidth; + + $('board').style.width = parseInt($('board-drag').style.left)-1+$('board').xynt_divcoo_hidescroll+"px"; + $('board2').style.left = parseInt($('board-drag').style.left)+parseInt($('board-drag').style.width)+1+"px"; + $('board2').style.width = (w - (parseInt($('board-drag').style.left)+parseInt($('board-drag').style.width)+4))+"px"; + console.log("conn_update: "+event); + } +} + + +function scroll() +{ + // console.log("scroll"); + // $('board').style.top = -parseInt($('board2').scrollTop)+"px"; + $('board').scrollTop = $('board2').scrollTop; +} + +function scroll2() +{ + // console.log("scroll2:"); + $('board2').scrollTop = $('board').scrollTop; +} + +function dropr1() +{ + ; //alert("t1"); +} + +window.onload = function () { + dimension(); + $('board').xynt_conn_update = resize; + var ret = ExtendsInst($('board-drag'), xynt_dd, [ dropr1, -1600, 1600, 0,0 ]); + console.log("RET: "+ret); + console.log("xynt_conn_ect-v"); + console.log($('board-drag').xynt_conn_ect); + $('board-drag').xynt_conn_ect($('board')); + // console.log($('board-drag')); + return; +} -- 2.17.1