[richfaces-svn-commits] JBoss Rich Faces SVN: r19447 - in modules/tests/metamer/trunk/application/src/main/webapp: templates and 1 other directory.
Author: ppitonak(a)redhat.com
Date: 2010-10-05 07:43:05 -0400 (Tue, 05 Oct 2010)
New Revision: 19447
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/resources/script/jquery-v1.2.6.js
modules/tests/metamer/trunk/application/src/main/webapp/templates/footer.xhtml
Log:
* fixed browser detection in footer
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/resources/script/jquery-v1.2.6.js
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/resources/script/jquery-v1.2.6.js 2010-10-05
01:09:24 UTC (rev 19446)
+++
modules/tests/metamer/trunk/application/src/main/webapp/resources/script/jquery-v1.2.6.js 2010-10-05
11:43:05 UTC (rev 19447)
@@ -3547,3 +3547,5 @@
};
});})();
+
+jQueryBrowser = jQuery.noConflict(true);
\ No newline at end of file
Modified: modules/tests/metamer/trunk/application/src/main/webapp/templates/footer.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/templates/footer.xhtml 2010-10-05
01:09:24 UTC (rev 19446)
+++
modules/tests/metamer/trunk/application/src/main/webapp/templates/footer.xhtml 2010-10-05
11:43:05 UTC (rev 19447)
@@ -42,11 +42,8 @@
<!-- human-readable browser detection -->
<c:if test="#{metamer.projectStage != 'Production'}">
- <h:outputScript library="script"
name="jquery-v1.2.6.js" />
- <script type="text/text/javascript">
- var jQueryBrowser = jQuery.noConflict(true);
- </script>
- <h:outputScript library="script"
name="jquery.browser-v2.3.js" />
+ <h:outputScript library="script"
name="jquery-v1.2.6.js"/>
+ <h:outputScript library="script"
name="jquery.browser-v2.3.js"/>
<script type="text/javascript">
String.prototype.capitalize = function(){
return this.replace( /(^|\s)([a-z])/g , function(m,p1,p2){
return p1+p2.toUpperCase(); } );
@@ -54,6 +51,6 @@
jQueryBrowser("span[id$=browserVersion]").text(jQueryBrowser.browser.name.capitalize()
+ ' ' + jQueryBrowser.browser.version + ' @ ' +
jQueryBrowser.os.name.capitalize());
</script>
</c:if>
-
+
</ui:composition>
</html>
\ No newline at end of file