Skip to content

Commit

Permalink
fixed issue where markItUp settings weren't being set correctly due t…
Browse files Browse the repository at this point in the history
…o loading of jqx config at bottom of page
  • Loading branch information
David McReynolds committed Oct 15, 2014
1 parent 332adff commit 0d727ad
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 0 additions & 3 deletions fuel/modules/fuel/views/_blocks/fuel_footer.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
<script type="text/javascript">
<?=$this->load->module_view(FUEL_FOLDER, '_blocks/fuel_header_jqx', array(), TRUE)?>
</script>
<?=js('jqx/jqx', 'fuel')?>
<?php $fuel_js = $this->fuel->config('fuel_javascript'); ?>
<?php foreach($fuel_js as $m => $j) : echo js(array($m => $j))."\n\t"; endforeach; ?>
Expand Down
4 changes: 4 additions & 0 deletions fuel/modules/fuel/views/_blocks/fuel_header.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@
<?php foreach($css as $m => $c) : echo css(array($m => $c))."\n\t"; endforeach; ?>
<?=js('jquery/jquery', 'fuel')?>

<script type="text/javascript">
<?=$this->load->module_view(FUEL_FOLDER, '_blocks/fuel_header_jqx', array(), TRUE)?>
</script>

</head>

0 comments on commit 0d727ad

Please sign in to comment.