Skip to content

Commit

Permalink
feature 2588: use jQuery() function instead of $(), avoiding possible…
Browse files Browse the repository at this point in the history
… conflicts with other frameworks

git-svn-id: http://piwigo.org/svn/trunk@13870 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
mistic100 committed Apr 3, 2012
1 parent 14228ae commit 3c68e2a
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
24 changes: 12 additions & 12 deletions themes/default/template/index.tpl
Expand Up @@ -18,14 +18,14 @@
{/foreach}
</div>
{footer_script}{literal}
$("#sortOrderLink").click(function() {
var elt = $("#sortOrderBox");
elt.css("left", Math.min( $(this).offset().left, $(window).width() - elt.outerWidth(true) - 5))
.css("top", $(this).offset().top + $(this).outerHeight(true))
jQuery("#sortOrderLink").click(function() {
var elt = jQuery("#sortOrderBox");
elt.css("left", Math.min( jQuery(this).offset().left, jQuery(window).width() - elt.outerWidth(true) - 5))
.css("top", jQuery(this).offset().top + jQuery(this).outerHeight(true))
.toggle();
});
$("#sortOrderBox").on("mouseleave", function() {
$(this).hide();
jQuery("#sortOrderBox").on("mouseleave", function() {
jQuery(this).hide();
});
{/literal}{/footer_script}
{/strip}</li>
Expand All @@ -46,14 +46,14 @@ $("#sortOrderBox").on("mouseleave", function() {
{/foreach}
</div>
{footer_script}{literal}
$("#derivativeSwitchLink").click(function() {
var elt = $("#derivativeSwitchBox");
elt.css("left", Math.min( $(this).offset().left, $(window).width() - elt.outerWidth(true) - 5))
.css("top", $(this).offset().top + $(this).outerHeight(true))
jQuery("#derivativeSwitchLink").click(function() {
var elt = jQuery("#derivativeSwitchBox");
elt.css("left", Math.min( jQuery(this).offset().left, jQuery(window).width() - elt.outerWidth(true) - 5))
.css("top", jQuery(this).offset().top + jQuery(this).outerHeight(true))
.toggle();
});
$("#derivativeSwitchBox").on("mouseleave", function() {
$(this).hide();
jQuery("#derivativeSwitchBox").on("mouseleave", function() {
jQuery(this).hide();
});
{/literal}{/footer_script}
{/strip}</li>
Expand Down
12 changes: 6 additions & 6 deletions themes/default/template/picture.tpl
Expand Up @@ -35,14 +35,14 @@ function changeImgSrc(url,typeSave,typeMap)
document.cookie = 'picture_deriv='+typeSave+';path={/literal}{$COOKIE_PATH}{literal}';
}

$("#derivativeSwitchLink").click(function() {
var elt = $("#derivativeSwitchBox");
elt.css("left", Math.min( $(this).offset().left, $(window).width() - elt.outerWidth(true) - 5))
.css("top", $(this).offset().top + $(this).outerHeight(true))
jQuery("#derivativeSwitchLink").click(function() {
var elt = jQuery("#derivativeSwitchBox");
elt.css("left", Math.min( jQuery(this).offset().left, jQuery(window).width() - elt.outerWidth(true) - 5))
.css("top", jQuery(this).offset().top + jQuery(this).outerHeight(true))
.toggle();
});
$("#derivativeSwitchBox").on("mouseleave click", function() {
$(this).hide();
jQuery("#derivativeSwitchBox").on("mouseleave click", function() {
jQuery(this).hide();
});
{/literal}{/footer_script}
{strip}<a id="derivativeSwitchLink" title="{'Photo sizes'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
Expand Down

0 comments on commit 3c68e2a

Please sign in to comment.