Code cleanup: #6990 use prototype functions instead of own ones where possible in...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2848 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index b6aa5f5..cd34c70 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2007-12-17  Ingmar Schlecht  <ingmar@typo3.org>
 
        * Fixed bug #6996: Versioning in clickmenu was unavailable for non-admins due to a problem of an earlier bugfix #4160 (Thanks to Helmut Hummel for the correction)
+       * Code cleanup: #6990 use prototype functions instead of own ones where possible in clickmenu (Thanks to Helmut Hummel)
 
 2007-12-17 Andreas Otto <andreas.otto@dkd.de>
 

diff --git a/typo3/js/clickmenu.js b/typo3/js/clickmenu.js
index d554a36..9c66a7e 100644 (file)
--- a/typo3/js/clickmenu.js
+++ b/typo3/js/clickmenu.js
@@ -17,42 +17,6 @@
  * This copyright notice MUST APPEAR in all copies of this script
  */
 
-
-/**
- * extends the window object to get cross-browser window dimensions
- * 
- * @return     an object with a width and height property
- */
-window.getDimensions = function() {
-       var w = window.innerWidth
-                       || document.documentElement.clientWidth
-                       || document.body.clientWidth
-                       || 0;
-       var h = window.innerHeight
-                       || document.documentElement.clientHeight
-                       || document.body.clientHeight
-                       || 0;
-       return { width: w, height: h };
-}
-
-
-/**
- * extends the window object to identify the scroll offset of the page
- *
- * @return     an object with a top and a left position property
- */
-window.getScrollOffset = function() {
-        var l = window.pageXOffset
-                || document.documentElement.scrollLeft
-                || document.body.scrollLeft
-                || 0;
-        var t = window.pageYOffset
-                || document.documentElement.scrollTop
-                || document.body.scrollTop
-                || 0;
-        return { top: t, left: l };
-}
-
 /**
  * new clickmenu code to make an AJAX call and render the 
  * AJAX result in a layer next to the mouse cursor
@@ -127,11 +91,11 @@ var Clickmenu = {
                        obj.innerHTML = data;
                        var x = this.mousePos.X;
                        var y = this.mousePos.Y;
-                       var dimsWindow = window.getDimensions();
+                       var dimsWindow = document.viewport.getDimensions();
                        dimsWindow.width = dimsWindow.width-20; // saving margin for scrollbars
 
                        var dims = Element.getDimensions(obj); // dimensions for the clickmenu
-                       var offset = window.getScrollOffset();
+                       var offset = document.viewport.getScrollOffsets();
                        var relative = { X: this.mousePos.X - offset.left, Y: this.mousePos.Y - offset.top };
 
                        // adjusting the Y position of the layer to fit it into the window frame