Changeset 121

Timestamp:

12/02/07 11:52:51 (1 year ago)

Author:

Stuart Thiel

Message:

-Fixed #99
-Also addressed the annoying flicker between the Media Annotation Panel and it's underlying info Panel. It still happens when going from a non-MA item to an MA item (I'd have to look much deeper for that), but has otherwise been removed.

Files:

• MediAnnotateXPI/trunk/ma.xpi (modified) (previous)
• MediAnnotateXPI/trunk/srcExtension/chrome/MediAnnotate/content/overlay.js (modified) (5 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

@@ -6 +6 @@
-
-    prepareMediAnnotate: function() {
+    if(!this.isInMidChange) {
+    // Chances are this is a Media Annotation, so let's limit the flicker between items and
+    // just show a Media Annotation panel right away (it flickers if you jump between Media
+    // Annotations because the selection of the item initiates a load). If we're wrong, we
+    // store the old panel and put it back. If jumping between Media Annotations and things
+    // that aren't we'll get more flicker, but initial usability showing says people looking
+    // at Media Annotations are more likely to click on subsequent Media Annotations, and 
+    // if they're not looking at Media Annotations, they're more likely to click on non-
+    // Media Annotaions. The flicker essentially only happens when clicking from a non-
+    // Media Annotation item to a Media Annotation item, and so far we'll just have to live
+    // with it.
+    var oldPanel = document.getElementById('zotero-item-pane-content').selectedPanel;
+    // This being the test of whether the last item shown was a MediaAnnotation Item.
+    if(this.isMediaAnnotation)this.showMAPanel();
-    var extensionMatch = /^.*((mpg)|(avi)|(mov))$/i;
-        var itemId = ZoteroPane.getSelectedItems(true)[0];
-        this.isSaveable = false;
-        this.item = Zotero.Items.get(itemId);
-
@@ -33 +46 @@
-
-        if(this.isMediaAnnotation) {
+                this.applyChange();
-                this.parentItem = Zotero.Items.get(this.item.getSource());
-                this.current_url = this.parentItem.getField('url');
-                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;
-        }
-
@@ -51 +68 @@
-                
-        }
-
-
-
+
-  }, 
-  
@@ -72 +87 @@
-        var xmlDoc = objDOMParser.parseFromString(xmlString, "text/xml");
-        this.xmlDoc = xmlDoc;
-
+
+
-        document.getElementById('ma-description').value = this.xmlDoc.evaluate("//description", this.xmlDoc, null, XPathResult.ANY_TYPE, null).iterateNext().textContent;
-        document.getElementById('ma-start-time').value = this.xmlDoc.evaluate("//start", this.xmlDoc, null, XPathResult.ANY_TYPE, null).iterateNext().textContent;
-        document.getElementById('ma-end-time').value = this.xmlDoc.evaluate("//end", this.xmlDoc, null, XPathResult.ANY_TYPE, null).iterateNext().textContent;
-        document.getElementById('ma-itemRef').value = item.getID();
-
-
-
-
-
-
+
+
-        
-        //Load tags into the popup scrollbar
@@ -89 +101 @@
-  }, 
-  
+  showMAPanel: function() {
+        document.getElementById('zotero-item-pane-content').selectedPanel = document.getElementById('zotero-view-MA');
+  },
+  
-  applyChange: function() {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-  },

MediAnnotateXPI/trunk/srcExtension/install.rdf

@@ -5 +5 @@
-    <em:id>videannotate@htmlweb.com</em:id>
-    <em:name>MediAnnotate</em:name>
-0.7
+2.1
-    <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>
-0.7
+2.1
-          <targetApplication>
-            <RDF:Description>