From 67c5f576a3682f38585de999897288f759b7cdc5 Mon Sep 17 00:00:00 2001
From: Marcel Greter <marcel.greter@ocbnet.ch>
Date: Fri, 11 Dec 2015 22:00:41 +0100
Subject: [PATCH] Re-enable full user agent detection

Chrome would be recognized as mozilla, since its user
agent string tells us that it is mozilla compatible.
This lead to some wrong detections in ocbnet slider.
---
 layout.min.js | 11 ++++++-----
 layout.src.js | 12 +++++++++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/layout.min.js b/layout.min.js
index eb93bd3..5e4e566 100644
--- a/layout.min.js
+++ b/layout.min.js
@@ -1,5 +1,6 @@
-(function(c){function x(a,b,d){for(var q=0,g=d.length;q<g;q++)c.isFunction(d[q][a])&&d[q][a].call(d[q],b)}function v(a,b){x("preLayout",a,b);for(var d=0,c=b.length;d<c;d++){var g=b[d].layout.children;g&&g.length&&v(a,g)}x("postLayout",a,b)}function C(a,b){x("updateLayout",a,b);for(var d=0,c=b.length;d<c;d++){var g=b[d].layout.children;g&&g.length&&C(a,g)}}function e(a,b){var d={force:a},e=b?c(b):r;s&&(l.css("overflow-y",s),s=null);t&&(l.css("overflow-x",t),t=null);var g=n.innerWidth(),f=n.innerHeight();
-v(d,e);var h=n.innerWidth(),k=n.innerHeight();if(g!=h||f!=k)if(v(d,e),g=n.innerWidth(),f=n.innerHeight(),h!=g||k!=f){if(D||k!=f)t=l.css("overflow-x"),"hidden"!=t&&l.css("overflow-x","scroll");if(D||h!=g)s=l.css("overflow-y"),"hidden"!=s&&l.css("overflow-y","scroll");v(d,e)}C(d,e)}for(var n=c(window),l=null,y=60,u,r=c(),p=c(),t,s,f=navigator.userAgent.toLowerCase(),h=/(msie) ([\w.]+)/.exec(f)||0>f.indexOf("compatible")&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(f)||[],f=h[1]||"",h=h[2]||"0",z="msie"==!f||
-8!=parseInt(h,10),D="mozilla"==f,w=window.requestAnimationFrame,k=window.cancelAnimationFrame||window.cancelRequestAnimationFrame,f=["ms","moz","webkit","o"],h=0;h<f.length&&!w;++h)w=window[f[h]+"RequestAnimationFrame"],k=window[f[h]+"CancelAnimationFrame"]||window[f[h]+"CancelRequestAnimationFrame"];if(w)var m=function(a){return w(a)};m||(m=window.setTimeout);k||(k=window.clearTimeout);var F=m,G=k;e.config=function(a,b){switch(a){case "fps":y=b;break;case "vsync":z=b;break;case "default":m=F;k=G;
-break;case "fallback":m=window.setTimeout,k=window.clearTimeout}A=z?function(){e()}:E};e.schedule=function(a,b){if(b||!u)u&&k(u),u=m(function(){e();u=null},a||0)};e.defer=function(a,b){"undefined"==typeof b&&(b=1E3/y);return m(a,b)};e.undefer=function(a){return k(a)};e.add=function(a){l||(l=c("BODY:first"));a.layout=c.extend({children:[]},a.layout);a.layout&&a.layout.parent?(a.layout.parent.layout.children||(a.layout.parent.layout.children=[]),a.layout.parent.layout.children.push(a)):r=r.add(c(a));
-c.isFunction(a.startLayout)&&a.startLayout.call(a);a=c(a);0==p.length&&0<a.length&&c(window).bind("resize",A);p=p.add(a)};e.del=function(a){c.isFunction(a.stopLayout)&&a.stopLayout.call(a);a=c(a);p=p.not(a);r=r.not(a);0==p.length&&c(window).unbind("resize",A)};var B=!1,E=function(){if(B)return!1;B=m(function(){e();B=!1},1E3/y)},A=z?function(){e()}:E;"undefined"==typeof OCBNET&&(OCBNET={});OCBNET.Layout=e})(jQuery);
+(function(c){function y(a,d,u){for(var b=0,f=u.length;b<f;b++)c.isFunction(u[b][a])&&u[b][a].call(u[b],d)}function v(a,d){y("preLayout",a,d);for(var b=0,c=d.length;b<c;b++){var f=d[b].layout.children;f&&f.length&&v(a,f)}y("postLayout",a,d)}function D(a,d){b.initialized=!0;y("updateLayout",a,d);for(var c=0,e=d.length;c<e;c++){var f=d[c].layout.children;f&&f.length&&D(a,f)}}function b(a,d){var e={force:a},g=d?c(d):r;s&&(m.css("overflow-y",s),s=null);t&&(m.css("overflow-x",t),t=null);var f=q.innerWidth(),
+k=q.innerHeight();v(e,g);var h=q.innerWidth(),l=q.innerHeight();if(f!=h||k!=l){v(e,g);var n=q.innerWidth(),p=q.innerHeight();if(h!=n||l!=p)f=function(){if(E||l!=p)t=m.css("overflow-x"),"hidden"!=t&&m.css("overflow-x","scroll");if(E||h!=n)s=m.css("overflow-y"),"hidden"!=s&&m.css("overflow-y","scroll")},b.initialized&&f(),v(e,g),b.initialized||f()}D(e,g)}for(var q=c(window),m=null,z=60,l,r=c(),h=c(),t,s,e=navigator.userAgent.toLowerCase(),n=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||
+/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||0>e.indexOf("compatible")&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[],e=n[1]||"",n=n[2]||"0",A="msie"==!e||8!=parseInt(n,10),E="mozilla"==e,w=window.requestAnimationFrame,g=window.cancelAnimationFrame||window.cancelRequestAnimationFrame,x=["ms","moz","webkit","o"],p=0;p<x.length&&!w;++p)w=window[x[p]+"RequestAnimationFrame"],g=window[x[p]+"CancelAnimationFrame"]||window[x[p]+"CancelRequestAnimationFrame"];if(w)var k=function(a){return w(a)};
+k||(k=window.setTimeout);g||(g=window.clearTimeout);var G=k,H=g;b.ua={browser:e,version:n};b.config=function(a,d){switch(a){case "fps":z=d;break;case "vsync":A=d;break;case "default":k=G;g=H;break;case "fallback":k=window.setTimeout,g=window.clearTimeout}B=A?function(){b()}:F};b.schedule=function(a,d){if(d||!l)l&&g(l),l=k(function(){b();l=null},a||0)};b.defer=function(a,b){"undefined"==typeof b&&(b=1E3/z);return k(a,b)};b.undefer=function(a){return g(a)};b.add=function(a){m||(m=c("BODY:first"));a.layout=
+c.extend({children:[]},a.layout);a.layout&&a.layout.parent?(a.layout.parent.layout.children||(a.layout.parent.layout.children=[]),a.layout.parent.layout.children.push(a)):r=r.add(c(a));c.isFunction(a.startLayout)&&a.startLayout.call(a);a=c(a);0==h.length&&0<a.length&&c(window).bind("resize",B);h=h.add(a)};b.del=function(a){c.isFunction(a.stopLayout)&&a.stopLayout.call(a);a=c(a);h=h.not(a);r=r.not(a);0==h.length&&c(window).unbind("resize",B)};var C=!1,F=function(){if(C)return!1;C=k(function(){b();
+C=!1},1E3/z)},B=A?function(){b()}:F;"undefined"==typeof OCBNET&&(window.OCBNET={});OCBNET.Layout=b})(jQuery);
diff --git a/layout.src.js b/layout.src.js
index b1656f1..c37b2ba 100644
--- a/layout.src.js
+++ b/layout.src.js
@@ -51,9 +51,9 @@
 	var ua = navigator.userAgent.toLowerCase();
 
 	// only match for ie and mozilla so far
-	var match = // /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
-	            // /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
-	            // /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
+	var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
+	            /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
+	            /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
 	            /(msie) ([\w.]+)/.exec( ua ) ||
 	            ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
 	            [];
@@ -199,6 +199,7 @@
 		var body_2nd_x = win.innerWidth();
 		var body_2nd_y = win.innerHeight();
 
+		// check if layout triggered any scrollbar changes
 		if (body_1st_x != body_2nd_x || body_1st_y != body_2nd_y)
 		// if (body_1st_x > body_2nd_x || body_1st_y > body_2nd_y)
 		{
@@ -259,6 +260,11 @@
 	};
 	// EO Manager
 
+	// expose ua info
+	Manager.ua = {
+		'browser': browser,
+		'version': version
+	};
 
 	// static global function
 	Manager.config = function (key, value)