jquery noConflict

14 years ago · 449895f5b2
4 changed files with 11 additions and 9 deletions
--- 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 = {},
--- 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);
--- 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, {}); 
        }
--- a/test.html
+++ b/test.html
@ -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">