Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / skins / default / nicetitle.js

diff --git a/skins/default/nicetitle.js b/skins/default/nicetitle.js
index c8f073f..30c2286 100644 (file)
--- a/skins/default/nicetitle.js
+++ b/skins/default/nicetitle.js
@@ -433,9 +433,15 @@ function moveNiceTitle(e)
                X = e.pageX;
                }
        w_title = Number(CURRENT_NICE_TITLE.style.width.replace(/^(\d+).*$/, '$1'));
+<<<<<<< HEAD
        if (w_title + X > (window.innerWidth - 20))
                {
                X = window.innerWidth - w_title - 20;
+=======
+       if (w_title + X > (window.innerWidth + (document.documentElement.scrollLeft || window.pageXOffset) - 20))
+               {
+               X = (window.innerWidth + (document.documentElement.scrollLeft || window.pageXOffset) - 20) - w_title;
+>>>>>>> skinnable-master
                }
 
        if (document.all)
@@ -446,7 +452,11 @@ function moveNiceTitle(e)
                {
                Y = e.pageY;
                }
+<<<<<<< HEAD
        if (Y > (window.innerHeight - 60))
+=======
+       if (Y > (window.innerHeight + (document.documentElement.scrollTop || window.pageYOffset) - 60))
+>>>>>>> skinnable-master
                {
                Y = Y - 25 - 60;
                }