From 72937119e3f91a5c6d34158cdab3938244c400ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20G=C3=B6tzinger?= Date: Mon, 29 Jun 2015 09:01:24 +0200 Subject: [PATCH] jQuery im noConflict-Modus betreiben --- public/js/aeo.js | 4 ++-- public/js/aeo.min.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/js/aeo.js b/public/js/aeo.js index 440e833..1aee4fb 100644 --- a/public/js/aeo.js +++ b/public/js/aeo.js @@ -27,8 +27,8 @@ function doWithMootols() { function doWithJQuery() { jQuery('a[name^="aeo-obfuscated-"]').each(function(i, el) { - if (!$(el).hasClass('aeo-with-title')) { - $(el).attr('title',tooltip_js_on); + if (!jQuery(el).hasClass('aeo-with-title')) { + jQuery(el).attr('title',tooltip_js_on); } aeo_prepare_link(el); } diff --git a/public/js/aeo.min.js b/public/js/aeo.min.js index 3becda2..fd202b2 100644 --- a/public/js/aeo.min.js +++ b/public/js/aeo.min.js @@ -2,7 +2,7 @@ var map;onReadyAeo(function(){aeo_dom_ready();});function aeo_dom_ready(){if(window.MooTools){doWithMootols();}else if(window.jQuery){doWithJQuery();}} function doWithMootols(){$$('a').filter(function(el){return el.getAttribute('name')!=null&&el.getAttribute('name').match('^aeo-obfuscated-')=='aeo-obfuscated-'}).each(function(el){if(!el.hasClass('aeo-with-title')){el.setAttribute('title',tooltip_js_on);} aeo_prepare_link(el);});} -function doWithJQuery(){jQuery('a[name^="aeo-obfuscated-"]').each(function(i,el){if(!$(el).hasClass('aeo-with-title')){$(el).attr('title',tooltip_js_on);} +function doWithJQuery(){jQuery('a[name^="aeo-obfuscated-"]').each(function(i,el){if(!jQuery(el).hasClass('aeo-with-title')){jQuery(el).attr('title',tooltip_js_on);} aeo_prepare_link(el);});} function aeo_prepare_link(el){el.setAttribute('href','javascript:aeo_link_decode(\''+el.getAttribute('href')+'\');');} function rot13init(){this.map=new Array();var s="abcdefghijklmnopqrstuvwxyz";for(var i=0;i