Changeset 147

Timestamp:

02/12/08 06:47:05 (1 year ago)

Author:

Stuart Thiel

Message:

-Fixed #127 and #129
--If it's not a media annotation, we use the simple load movie, otherwise we pass the note so that extra info can be parsed out for setting the ins and outs.

Files:

• MediAnnotateXPI/trunk/ma.xpi (modified) (previous)
• MediAnnotateXPI/trunk/srcExtension/chrome/MediAnnotate/content/SMediAnnotate.jar (modified) (previous)
• MediAnnotateXPI/trunk/srcExtension/chrome/MediAnnotate/content/overlay.js (modified) (2 diffs)
• MediAnnotateXPI/trunk/srcExtension/install.rdf (modified) (1 diff)
• MediAnnotateXPI/trunk/update_mediannotate.rdf (modified) (1 diff)

MediAnnotateXPI/trunk/srcExtension/chrome/MediAnnotate/content/overlay.js

@@ -189 +189 @@
-  
-  workItOut: function(event) {
-
+
+
-  },
-  
@@ -195 +196 @@
-    if(!this.current_url) return;
-        var myApplet = content.document.getElementById('MA-applet');
-myApplet.wrappedJSObject.loadMovie(this.current_url
-if(this.isMediaAnnotation) myApplet.wrappedJSObject.setTime(this.item.getNote()
+if(this.isMediaAnnotation) myApplet.wrappedJSObject.loadMovie(this.current_url, this.item.getNote()
+else myApplet.wrappedJSObject.loadMovie(this.current_url
-  },  
-  

MediAnnotateXPI/trunk/srcExtension/install.rdf

@@ -5 +5 @@
-    <em:id>videannotate@htmlweb.com</em:id>
-    <em:name>MediAnnotate</em:name>
-1
+2
-    <em:creator>Stuart Thiel Concordia University University</em:creator>
-    <em:developer>Stuart Thiel</em:developer>

MediAnnotateXPI/trunk/update_mediannotate.rdf

@@ -8 +8 @@
-      <RDF:li>
-        <RDF:Description>
-1
+2
-          <targetApplication>
-            <RDF:Description>