Skip to content

Commit

Permalink
Moved jQuery to top and added jQuery.noConflict();
Browse files Browse the repository at this point in the history
  • Loading branch information
@dziudek
dziudek committed Nov 16, 2012
1 parent b0dd66c commit 19f32fd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 2 additions & 4 deletions meet_gavern/layouts/blocks/head.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@

$font_iter++;
}
// include JavaScript
$this->API->addJS('//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js');
$this->API->addJS($this->API->URLtemplate().'/js/bootstrap.js');

// load prefixer
if($this->API->get("css_prefixer", '0')) {
Expand All @@ -72,7 +69,8 @@
$this->API->addJSFragment('$GK_MENU = [];' . "\n" . '$GK_MENU[\'animation\'] = "' . $this->API->get('menu_animation', 'width_height_opacity') . "\";\n" . '$GK_MENU[\'animation_speed\'] = "' . $this->API->get('menu_speed', 'fast') . "\";\n");
$this->API->addJSFragment( "\n".'$GK_TMPL_URL = "' . $this->API->URLtemplate() . '";'."\n" );
$this->API->addJSFragment( "\n".'$GK_URL = "' . $this->API->URLbase() . '";'."\n" );

// include JavaScript
$this->API->addJS($this->API->URLtemplate().'/js/bootstrap.js');
$this->API->addJS($this->API->URLtemplate().'/js/page.js');
$this->API->addJS($this->API->URLtemplate().'/js/gk.menu.js');
// load CSS compresssion
Expand Down
2 changes: 2 additions & 0 deletions meet_gavern/layouts/default.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
<?php endif; ?>
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
<script type="text/javascript">jQuery.noConflict();</script>
<jdoc:include type="head" />
<?php $this->layout->loadBlock('head'); ?>
<?php $this->layout->loadBlock('cookielaw'); ?>
Expand Down

1 comment on commit 19f32fd

@AndyOughton
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is the error I have causing a conflict between Meet Gavern and Ignite Gallery. I am not a programer. can you give a gentle walk through of what I need to do so that Java loads first. I can post the messages from the Ignite technician (who was great) unfortunately I could not get technical support for Meet Gavern and was directed to this forum

Please sign in to comment.