--- a/src/widgets/MultiSegments.js Tue Jan 07 12:46:58 2014 +0100
+++ b/src/widgets/MultiSegments.js Fri Jan 24 10:53:17 2014 +0100
@@ -98,7 +98,7 @@
});
// open line on segment click
- $j(document).on("click",".Ldt-Segments-Segment",function(e){
+ IriSP.jQuery(document).on("click",".Ldt-Segments-Segment",function(e){
if (!_this.show_all && currentLine && !currentLine.hasSegmentsNow()) {
currentLine = undefined;
}
--- a/test/external-widget.htm Tue Jan 07 12:46:58 2014 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-<!doctype html>
-<html>
-
- <head>
- <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
- <title>Loading a Widget without the Metadataplayer widgeting framework</title>
- <link href='libs/jquery-ui.css' rel='stylesheet' type='text/css'>
-<!-- <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
---> <link href='test.css' rel='stylesheet' type='text/css'>
- <link href='metadataplayer/Controller.css' rel='stylesheet' type='text/css'>
- <script type="text/javascript" src="libs/jquery.min.js" type="text/javascript"></script>
- <script type="text/javascript" src="libs/jquery-ui.min.js" type="text/javascript"></script>
- <script type="text/javascript" src="libs/underscore-min.js" type="text/javascript"></script>
- <script type="text/javascript" src="libs/mustache.js" type="text/javascript"></script>
- <script type="text/javascript" src="metadataplayer/LdtPlayer-core.js" type="text/javascript"></script>
- <script type="text/javascript" src="metadataplayer/Controller.js" type="text/javascript"></script>
- <style type="text/css">
- #LdtPlayer {
- width: 640px;
- }
- </style>
- </head>
-
- <body>
- <h1>Loading a Widget without the Metadataplayer widgeting framework</h1>
- <div id="LdtPlayer">
- <div id="Ldt-Video"></div>
- <div id="Ldt-Controller"></div>
- </div>
- <script>
- var myDir = new IriSP.Model.Directory(),
- myProject = myDir.remoteSource({
- url: "json/ldt-ogv.json",
- serializer: IriSP.serializers.ldt
- });
- myProject.onLoad(function() {
- IriSP.htmlPlayer(
- myProject.getCurrentMedia(),
- $("#Ldt-Video"),
- {
- width: 640,
- controls: true,
- autostart: true
- }
- );
- var controller = new IriSP.Widgets.Controller(null, {
- container: "Ldt-Controller",
- source: myProject
- });
- });
- </script>
- </body>
-</html>
--- a/test/index.htm Tue Jan 07 12:46:58 2014 +0100
+++ b/test/index.htm Fri Jan 24 10:53:17 2014 +0100
@@ -18,7 +18,6 @@
<li><h2><a href="youtube.htm">with Youtube (uses Popcorn.js and the Popcorn Youtube plugin/player)</a></h2></li>
<li><h2><a href="vimeo.htm">with Vimeo (uses Popcorn.js and the Popcorn Vimeo plugin/player)</a></h2></li>
<li><h2><a href="dailymotion.htm">with Dailymotion (uses custom player functions)</a></h2></li>
- <li><h2><a href="external-widget.htm">Loading a Widget without the Metadataplayer widgeting framework</a></h2></li>
</ul>
</body>
</html>
--- a/test/youtube.htm Tue Jan 07 12:46:58 2014 +0100
+++ b/test/youtube.htm Fri Jan 24 10:53:17 2014 +0100
@@ -7,7 +7,7 @@
<title>Metadataplayer test with Youtube</title>
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
<link href='test.css' rel='stylesheet' type='text/css'>
- <script type="text/javascript" src="../build/LdtPlayer-core.js" type="text/javascript"></script>
+ <script type="text/javascript" src="./metadataplayer/LdtPlayer-core.js" type="text/javascript"></script>
</head>
<body>