Changeset 223

Timestamp:

04/15/08 22:24:28 (7 months ago)

Author:

Stuart Thiel

Message:

-Fixed #184
-Further fixed #185

Currently associating MediaAnnotations? with the URL (local or remote, in that order of preference) of the item being viewed.

Files:

• MediAnnotateXPI/trunk/srcExtension/chrome/vertov/content/overlay.js (modified) (8 diffs)
• MediAnnotateXPI/trunk/srcExtension/chrome/vertov/content/overlay.xul (modified) (1 diff)
• MediAnnotateXPI/trunk/srcExtension/install.rdf (modified) (1 diff)
• MediAnnotateXPI/trunk/update_mediannotate.rdf (modified) (1 diff)
• MediAnnotateXPI/trunk/vertov.xpi (modified) (previous)

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

@@ -66 +66 @@
-        //Let's init things to blank and let real decisions be made later if necessary.
-        this.parentItem = false;
+        
-        this.current_url = false;
-        this.isMediaAnnotation = false;
@@ -74 +75 @@
-        } else {
-                this.isMediaAnnotation = this.isXMLNote(this.item);
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        if(this.item && (this.isPlayableItem())) {
-            this.current_url = this.getPlayableURL();
+            alert(this.current_url);
-                document.getElementById("zotero-items-tree").ondblclick = function ondblclick(event) {
-                        mediannotate.workItOut(event);
-                }
+                
+                if(this.isMediaAnnotation) {
+                        this.applyChange();
+                        this.prepareMAEntryView(this.item);
+                } else {
+                        //In the even that we're not a Media Annotation, let's put the old item info panel back. 
+                        document.getElementById('zotero-item-pane-content').selectedPanel = oldPanel;
+                }
+        
+
-
-        } else {
@@ -116 +124 @@
-    
-  prepareMAEntryView: function(item) {
-        var xmlString = item.getNote();
-        var objDOMParser = new DOMParser();
-
-
+
-
-        //update the fields
-
-
-
+
+
+
+
+
+
-        document.getElementById('ma-start-time').value = sprintf(this.sprintfString, (start/1000/60/60), ((start%(1000*60*60))/1000/60), ((start%(1000*60))/1000), ((start%1000)/33.3));
-        document.getElementById('ma-end-time').value = sprintf(this.sprintfString, (end/1000/60/60), ((end%(1000*60*60))/1000/60), ((end%(1000*60))/1000), ((end%1000)/33.3));
@@ -132 +141 @@
-        document.getElementById('ma-old-end-time').value = end;
-        document.getElementById('ma-itemRef').value = item.getID();
+        document.getElementById('ma-url').value = url;
-                
-        this.showMAPanel();
@@ -143 +153 @@
-        this.RelatedItems.reload();
-  }, 
+ 
-  
-  showMAPanel: function() {
@@ -153 +164 @@
-  
-  getPlayableURL: function() {
-
-
+
+
+
+
+
-    return url;
-  },
-  
+  getUrlFromMA: function(item) {
+        var objDOMParser = new DOMParser();
+        var xmlDoc = objDOMParser.parseFromString(item.getNote(), "text/xml");  
+        try {
+                return xmlDoc.evaluate("//url", xmlDoc, null, XPathResult.ANY_TYPE, null).iterateNext().textContent;
+        } catch(e) {};
+        return false;
+  }, 
+  
-  getBestPlayableURL: function(item) {
-
-
+
-        if(item.isRegularItem()) {
-this.
+
-                if (snapID) {
-                        url = Zotero.Items.get(snapID).getLocalFileURL();
-                } 
+        } else {
+                if(item.getLocalFileURL) url = item.getLocalFileURL();
-        }
-    return url;
@@ -195 +219 @@
-                var newNote = "<mediannotate><description>" + document.getElementById('ma-description').value  + "</description>\n" +
-                  "<start>" + Math.round(oldStartValue) + "</start>\n" +
-
+
+
+
-                try {
-                        item.updateNote(newNote);
@@ -223 +249 @@
-                var newNote = "<mediannotate><description></description>\n" +
-                  myApplet.wrappedJSObject.getTime() + 
+                  "<url><![CDATA["+this.current_url+"]]></url>" +
-                  "</mediannotate>";            
-                this.item.updateNote(newNote);

MediAnnotateXPI/trunk/srcExtension/chrome/vertov/content/overlay.xul

@@ -31 +31 @@
-                        <textbox id="ma-description" rows="8" cols="25" flex="1" multiline="true" onchange="mediannotate.applyChange()"/>
-                        <label id="ma-itemRef" hidden="true" />
+                        <label id="ma-url" hidden="true" />
-                        <label id="ma-RelatedItemsLabel" class="zotero-clicky" value="Related: [click here]" crop="end" onclick="mediannotate.RelatedItems.showPopup();"/>
-                        <label id="ma-TagsLabel" class="zotero-clicky" value="Tags: [click here]" crop="end" onclick="mediannotate_tags.showPopup();"/>

MediAnnotateXPI/trunk/srcExtension/install.rdf

@@ -5 +5 @@
-    <em:id>videannotate@htmlweb.com</em:id>
-    <em:name>Vertov</em:name>
-2.2
+3
-    <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>
-2.2
+3
-          <targetApplication>
-            <RDF:Description>