Skip to content

Commit

Permalink
fix jQuery 1.8.0 and jQuery UI 1.8.22 bug with dialog buttons; http:/…
Browse files Browse the repository at this point in the history
  • Loading branch information
haraldpdl committed Aug 14, 2012
1 parent 339993b commit 03e047f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
7 changes: 6 additions & 1 deletion catalog/admin/includes/template_top.php
Expand Up @@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com http://www.oscommerce.com
Copyright (c) 2010 osCommerce Copyright (c) 2012 osCommerce
Released under the GNU General Public License Released under the GNU General Public License
*/ */
Expand All @@ -22,6 +22,11 @@
<script type="text/javascript" src="<?php echo tep_catalog_href_link('ext/jquery/jquery-1.8.0.min.js'); ?>"></script> <script type="text/javascript" src="<?php echo tep_catalog_href_link('ext/jquery/jquery-1.8.0.min.js'); ?>"></script>
<script type="text/javascript" src="<?php echo tep_catalog_href_link('ext/jquery/ui/jquery-ui-1.8.22.min.js'); ?>"></script> <script type="text/javascript" src="<?php echo tep_catalog_href_link('ext/jquery/ui/jquery-ui-1.8.22.min.js'); ?>"></script>


<script type="text/javascript">
// fix jQuery 1.8.0 and jQuery UI 1.8.22 bug with dialog buttons; http://bugs.jqueryui.com/ticket/8484
if ( $.attrFn ) { $.attrFn.text = true; }
</script>

<?php <?php
if (tep_not_null(JQUERY_DATEPICKER_I18N_CODE)) { if (tep_not_null(JQUERY_DATEPICKER_I18N_CODE)) {
?> ?>
Expand Down
7 changes: 6 additions & 1 deletion catalog/includes/template_top.php
Expand Up @@ -5,7 +5,7 @@
osCommerce, Open Source E-Commerce Solutions osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com http://www.oscommerce.com
Copyright (c) 2010 osCommerce Copyright (c) 2012 osCommerce
Released under the GNU General Public License Released under the GNU General Public License
*/ */
Expand All @@ -30,6 +30,11 @@
<script type="text/javascript" src="ext/jquery/jquery-1.8.0.min.js"></script> <script type="text/javascript" src="ext/jquery/jquery-1.8.0.min.js"></script>
<script type="text/javascript" src="ext/jquery/ui/jquery-ui-1.8.22.min.js"></script> <script type="text/javascript" src="ext/jquery/ui/jquery-ui-1.8.22.min.js"></script>


<script type="text/javascript">
// fix jQuery 1.8.0 and jQuery UI 1.8.22 bug with dialog buttons; http://bugs.jqueryui.com/ticket/8484
if ( $.attrFn ) { $.attrFn.text = true; }
</script>

<?php <?php
if (tep_not_null(JQUERY_DATEPICKER_I18N_CODE)) { if (tep_not_null(JQUERY_DATEPICKER_I18N_CODE)) {
?> ?>
Expand Down

0 comments on commit 03e047f

Please sign in to comment.