sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

partial #1221

Browse Source
This commit is contained in:
Daniel Camargo 2013-05-24 15:17:59 -03:00
parent a704985c25
commit d82ddbf7f2
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/library/Crunchbutton/App.php
View File

@ -262,7 +262,7 @@ class Crunchbutton_App extends Cana_App {
}
public function isCompat() {
if (preg_match('/(Firefox\/1\.)|(MSIE (1|2|3|4|5|6|7|8|9|10)\b)/i',$_SERVER['HTTP_USER_AGENT'])) {
if (preg_match('/(Firefox\/1\.)|(MSIE (1|2|3|4|5|6|7|8|9)\b)/i',$_SERVER['HTTP_USER_AGENT'])) {
return false;
} else {
return true;

6
include/views/default/crunchbutton/bundle/js.phtml
View File

@ -105,7 +105,11 @@ $(function() {
<script src="/assets/js/suggestions.js?v=<?=Cana_Util::gitVersion()?>"></script>
<? endif ; ?>
<script src="/assets/js/quo.js?v=<?=Cana_Util::gitVersion()?>"></script>
<?php
/* Issue #1221 - QuoJs does not support IE - if is IE not use QuoJs (workaround html.phtml:8) */
if( c::Browser()->browser != 'MSIE' ) { ?>
<script src="/assets/js/quo.js?v=<?=Cana_Util::gitVersion()?>"></script>
<?php } ?>
<script src="/assets/js/orm.js?v=<?=Cana_Util::gitVersion()?>"></script>
<script src="/assets/js/community.js?v=<?=Cana_Util::gitVersion()?>"></script>
<script src="/assets/js/restaurant.js?v=<?=Cana_Util::gitVersion()?>"></script>

11
include/views/default/crunchbutton/layout/html.phtml
View File

@ -1,10 +1,19 @@
<?=$this->display('layout/html.top')?>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.4.4/underscore-min.js"></script>
<?php
/* Issue #1221 - QuoJs does not support IE - this is a workaround */
if( c::Browser()->browser == 'MSIE' ) { ?>
<script type="text/javascript">
var $$ = $;
$$.fn.tap = function( func ){
$(document).on( 'click', $( this ).selector , func );
}
</script>
<?php } ?>
<? if (c::config()->bundle) : ?>
<script src="/assets/js/bundle.js?v=<?=Cana_Util::gitVersion()?>&s=app"></script>
<? else : ?>