CAMP/padmaEssay
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jquery noConflict

Browse Source
This commit is contained in:
sanj 2010-11-23 11:29:45 +01:00
parent e930a4cd58
commit 449895f5b2
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jquery.tooltip.js
View File

@ -13,7 +13,7 @@
* http://www.gnu.org/licenses/gpl.html
*/
;(function($) {
(function($) {
// the tooltip element
var helper = {},

8
padma.layers.js
View File

@ -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);

2
padma.links.js
View File

@ -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, {});
}

8
test.html
View File

@ -8,7 +8,7 @@
<script type="text/javascript" src="jquery.tooltip.js"></script>
<script type="text/javascript" src="padma.layers.js"></script>
<script type="text/javascript" src="padma.links.js"></script>
<script type="text/javascript" src="test.js"></script>
<script type="text/javascript" src="testOkno.js"></script>
<script type="text/javascript" src="utils.js"></script>
</head>
<body>
@ -72,12 +72,6 @@
<h1>
Lorem Ipsum
</h1>
<div id="padmaSidebar">
<div id="padmaSidebarWrapper"></div>
<div id="aboutTxt">
Abstract / About goes here.
</div>
</div>
<div id="essay">
<div class="para">