Changeset 172

Show
Ignore:
Timestamp:
03/07/08 22:33:25 (10 months ago)
Author:
Stuart Thiel
Message:

-Fixed #116 and #146
-Yeah, two things got done at once. whoops.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • MediAnnotateXPI/trunk/srcExtension/chrome/MediAnnotate/content/mediannotate.html

    r136 r172  
    88function appletFinishedLoading() { 
    99  var evt = document.createEvent("Events"); 
    10   evt.initEvent("MyMediAnnotateExtensionEvent", true, false); 
     10  evt.initEvent("VertovAppletFinishedLoacingEvent", true, false); 
    1111  document.dispatchEvent(evt);   
    1212} 
     13 
     14function addAnnotation() { 
     15  var evt = document.createEvent("Events"); 
     16  evt.initEvent("VertovAddAnnotationEvent", true, false); 
     17  document.dispatchEvent(evt);   
     18} 
     19 
    1320 
    1421</script> 

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

    r166 r172  
    33* This is the install script code.  
    44*/ 
    5 const MY_EXTENSION_VERSION = "0.6.8.6"; 
     5const MY_EXTENSION_VERSION = "0.6.8.6.2"; 
    66const MY_EXTENSION_STRING = "mediannotate.install.finished"; 
    77function initializeOverlay() { 
    …… 
    2020        var ios = Components.classes['@mozilla.org/network/io-service;1'].getService(Ci.nsIIOService); 
    2121        var chromeReg = Components.classes['@mozilla.org/chrome/chrome-registry;1'].getService(Ci.nsIChromeRegistry); 
    22         var fileURL = chromeReg.convertChromeURL(ios.newURI("chrome://mediannotate/content/setCert.jar", null, null)).QueryInterface(Ci.nsIFileURL); 
     22        var fileURL = chromeReg.convertChromeURL(ios.newURI("chrome://mediannotate/content/acceptVertovCertificate.jar", null, null)).QueryInterface(Ci.nsIFileURL); 
    2323        var file = fileURL.file.clone().QueryInterface(Ci.nsILocalFile); 
    2424        if(file.exists()) { 
    …… 
    223223  workItOut: function(event) { 
    224224        if(!content.document || !content.document.getElementById('MA-applet')) ZoteroPane.loadURI(getFileFromChrome("chrome://mediannotate/content/mediannotate.html"), event); 
    225         else this.myListener(); 
    226   }, 
    227    
    228   myListener: function(event) { 
     225        else this.loadMovieInApplet(); 
     226  }, 
     227   
     228  loadMovieInApplet: function(event) { 
    229229    if(!this.current_url) return; 
    230230        var myApplet = content.document.getElementById('MA-applet'); 
    …… 
    297297                  .QueryInterface(Components.interfaces.nsIInterfaceRequestor) 
    298298                  .getInterface(Components.interfaces.nsIDOMWindow); 
    299 mainWindow.document.addEventListener("MyMediAnnotateExtensionEvent", function(e) { mediannotate.myListener(e); }, false, true); 
     299mainWindow.document.addEventListener("VertovAppletFinishedLoacingEvent", function(e) { mediannotate.loadMovieInApplet(e); }, false, true); 
     300mainWindow.document.addEventListener("VertovAddAnnotationEvent", function(e) { mediannotate.addMediaAnnotation(e); }, false, true); 
    300301 
    301302 

  • MediAnnotateXPI/trunk/srcExtension/install.rdf

    r168 r172  
    55    <em:id>videannotate@htmlweb.com</em:id> 
    66    <em:name>MediAnnotate</em:name> 
    7     <em:version>0.6.8.6.1</em:version> 
     7    <em:version>0.6.8.6.2</em:version> 
    88    <em:creator>Stuart Thiel Concordia University University</em:creator> 
    99    <em:developer>Stuart Thiel</em:developer> 

  • MediAnnotateXPI/trunk/update_mediannotate.rdf

    r168 r172  
    88      <RDF:li> 
    99        <RDF:Description> 
    10           <version>0.6.8.6.1</version> 
     10          <version>0.6.8.6.2</version> 
    1111          <targetApplication> 
    1212            <RDF:Description>