From 449895f5b2027adb709445a0c627f944bf7a2bd0 Mon Sep 17 00:00:00 2001 From: sanj Date: Tue, 23 Nov 2010 11:29:45 +0100 Subject: [PATCH] jquery noConflict --- jquery.tooltip.js | 2 +- padma.layers.js | 8 ++++++++ padma.links.js | 2 +- test.html | 8 +------- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/jquery.tooltip.js b/jquery.tooltip.js index 63b715f..1e56cc0 100644 --- a/jquery.tooltip.js +++ b/jquery.tooltip.js @@ -13,7 +13,7 @@ * http://www.gnu.org/licenses/gpl.html */ -;(function($) { +(function($) { // the tooltip element var helper = {}, diff --git a/padma.layers.js b/padma.layers.js index a356fdc..ae7b03f 100644 --- a/padma.layers.js +++ b/padma.layers.js @@ -1,3 +1,5 @@ +(function($) { + var BASE_URL = "http://pad.ma/"; var padmaVideo = function(videoId) { @@ -149,3 +151,9 @@ padmaVideo.getFromCache = function(videoId) { } return false; } + +window.padmaVideo = padmaVideo; +window.filterLayersByTracks = filterLayersByTracks; +window.filterLayersByContributors = filterLayersByContributors; + +})(jQuery); diff --git a/padma.links.js b/padma.links.js index 338fe69..e6805e9 100644 --- a/padma.links.js +++ b/padma.links.js @@ -28,7 +28,7 @@ } // console.log(linkData); - videoObj.getVideoData(setupPadmaLink, {'linkData': linkData, 'jq': that}); + videoObj.getAllData(setupPadmaLink, {'linkData': linkData, 'jq': that}); // v.getVideoData(setupSidenotes, {'linkData': linkData, 'jq': that}); // getPadmaData(linkData, that, {}); } diff --git a/test.html b/test.html index babba96..88bd566 100644 --- a/test.html +++ b/test.html @@ -8,7 +8,7 @@ - + @@ -72,12 +72,6 @@

Lorem Ipsum

-
-
-
- Abstract / About goes here. -
-