Changeset 23

Timestamp:

12/04/09 12:19:01 (9 months ago)

Author:

guillaume

Message:

• improve browser detection (window.mozilla and widow.opera are not safe)
• compatibility with epiphany browser . epiphany identify itself as safari (use the same engine) . but 'elementFromPoint' javascript function behave like mozilla one

Location:

trunk/jslib

Files:

• browser-compat.js (modified) (2 diffs)
• dare-dare.js (modified) (2 diffs)

trunk/jslib/browser-compat.js

@@ -21 +21 @@
         this._browser                   = undefined;
 
-        /* DETECT BROWSER */
-        console.log(window.navigator.product);
-        console.log(window.navigator.userAgent);
-        console.log('net=' + window.netscape);
-        console.log('ie=' + window.ie);
-        console.log('op=' + window.opera);
+        /* DETECT BROWSER 
+                window.mozilla & window.opera browser detect methods are not safe:
+                        if you declare an HTML tag with 'opera' id, window.opera will be set even
+                        if you do not use opera
 
-        // WARNING: opera also set netscape
-        if (window.opera)
-        { this._browser = 'opera'; }
-        else if (window.netscape)
-        { this._browser = 'mozilla'; }
-        else
-        { this._browser = 'unknown'; }
+                NOTES:
+                        epiphany & chromium use safari user-agent
+        */
+        browsers = [
+                ['Firefox', 'mozilla'], ['MSIE' , 'ie'],
+                ['Chrome' , 'chrome'] , ['Opera', 'opera'], ['Apple', 'safari']
+        ]
 
+        console.log(navigator.userAgent);
+        this._browser = 'undefined';
+        for (var i = 0; i < browsers.length; i++)
+        {
+                if(navigator.userAgent.indexOf(browsers[i][0]) != -1)
+                { this._browser = browsers[i][1]; break; }
+        }
         console.log('browser=' + this._browser);
 
@@ -45 +50 @@
         this.viewportElementFromPoint = function(doc, win, xpos, ypos)
                 {
-                        if (this._browser == 'opera')
-                        {       ypos += win.pageYOffset; }
+                        if (this._browser == 'opera' || this._browser == 'safari')
+                        {       
+                                // while epiphany identify itself as safari, it behave as firefox
+                                // for this function
+                                // so we must fallback to the default method if we found no HTML element
+                                elt = doc.elementFromPoint(xpos, ypos + win.pageYOffset);
+                                if(elt)
+                                { return(elt); }
+                        }
 
                         return doc.elementFromPoint(xpos, ypos);

trunk/jslib/dare-dare.js

@@ -398 +398 @@
         if(ylineup >= 0)
         {
-                img = this.content.getElementById('page' + ylineup);
+                var img = this.content.getElementById('page' + ylineup);
                 console.log('img=' + img)
-                top = img.offsetTop + img.offsetHeight;
+                var top = img.offsetTop + img.offsetHeight;
                 // little move
                 top += ((pagenum - (pagenum % this._viewport[0])) / this._viewport[0]) % 2;
@@ -430 +430 @@
         var img = this.compat.viewportElementFromPoint(this.content, this.contentw, 20, 30);
         console.log('vp.img= ' + img)
+        if(img != null)
+        { console.log('img idx=' + img.getAttribute('pagenum')); }
         var start = img == null ? 0 : parseInt(img.getAttribute('pagenum'));