Skip to content

Commit ace9fb6

Browse files
committed
Issue 198: made Flashembed work in noConflict mode
1 parent efdc442 commit ace9fb6

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/overlay/overlay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
maskConf.closeOnClick = maskConf.closeOnEsc = false;
8989
}
9090

91-
// get overlay and triggerr
91+
// get overlay and trigger
9292
var jq = conf.target || trigger.attr("rel");
9393
overlay = jq ? $(jq) : null || trigger;
9494

src/toolbox/toolbox.flashembed.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292

293293
jQuery.fn.flashembed = function(opts, conf) {
294294
return this.each(function() {
295-
$(this).data("flashembed", flashembed(this, opts, conf));
295+
jQuery(this).data("flashembed", flashembed(this, opts, conf));
296296
});
297297
};
298298
}

src/tooltip/tooltip.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,13 +237,13 @@
237237

238238
if (!tip.data("__set")) {
239239

240-
tip.bind(event[0], function() {
240+
tip.unbind(event[0]).bind(event[0], function() {
241241
clearTimeout(timer);
242242
clearTimeout(pretimer);
243243
});
244244

245245
if (event[1] && !trigger.is("input:not(:checkbox, :radio), textarea")) {
246-
tip.bind(event[1], function(e) {
246+
tip.unbind(event[1]).bind(event[1], function(e) {
247247

248248
// being moved to the trigger element
249249
if (e.relatedTarget != trigger[0]) {
@@ -252,7 +252,7 @@
252252
});
253253
}
254254

255-
// bind again for same tip element
255+
// bind agein for if same tip element
256256
if (!conf.tip) tip.data("__set", true);
257257
}
258258

test/overlay/index.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
<script src="../js/jquery-1.4.2.js"></script>
2+
<script src="../js/jquery-1.5.min.js"></script>
33
<script src="../../src/toolbox/toolbox.expose.js"></script>
44
<script src="../../src/overlay/overlay.js"></script>
55

0 commit comments

Comments
 (0)