Merge branch 'master' of git://github.com/dougreside/zotero-oac

umd-mith · Aug 8, 2010 · f824d2d · f824d2d
2 parents a028859 + 10315d3
commit f824d2d
Show file tree

Hide file tree

Showing 14 changed files with 567 additions and 999 deletions.
diff --git a/chrome/content/zotero-content/annotations/AudioPlayer.swf b/chrome/content/zotero-content/annotations/AudioPlayer.swf
diff --git a/chrome/content/zotero-content/annotations/ImageVectorDrawer.js b/chrome/content/zotero-content/annotations/ImageVectorDrawer.js
@@ -54,7 +54,7 @@ $.extend(Note.prototype, {
 
 var drawer;
 function build(mode, scale, old) {
-	alert(old);
+
 	drawer = new VectorDrawer(mode, scale, old, $("#to-mark"), Note);
 }
 

diff --git a/chrome/content/zotero-content/annotations/PlayerUI.js b/chrome/content/zotero-content/annotations/PlayerUI.js
@@ -1,7 +1,7 @@
 (function ($, _) {
 	var rootNS = this;
 
-	function parseTime(s) {
+	rootNS.parseTime=function(s) {
 		var m = /(?:(\d+):)?(?:(\d+):)?(\d+(?:\.\d+)?)/.exec(s);
 		var ret = 0;
 		if (m[1]) ret += m[1]*(m[2]? 60:1)*60;
@@ -49,7 +49,7 @@
 
 
  			var percent = parseInt((val*p.getDuration())/100);
-
+		
  			p.seekTo(parseTime(percent));
 
 	}
@@ -61,8 +61,8 @@
 		$("#player-ui-new-volume").bind("volumeChange",{obj:self},self.changeVolume);
 		$("#player-ui-seek").bind("posStartChange",{obj:self},self.startPosChange);
 		$("#player-ui-seek").bind("slideChange",{obj:self},self.seekToPos);
-		$(".player-ui-play", self._container).click(function () {self._isPlaying=true;p.play();});
-		$(".player-ui-pause", self._container).click(function () {self._isPlaying=false;p.pause();});
+		$(".player-ui-play", self._container).click(function () {$(document).trigger("mediaPlaying");self._isPlaying=true;p.play();});
+		$(".player-ui-pause", self._container).click(function () {$(document).trigger("mediaPaused");self._isPlaying=false;p.pause();});
 
 
 		$("form", self._container).submit(function(e){e.preventDefault();});
@@ -71,6 +71,7 @@
 			var percent = parseInt(100*(p.getPosition()/p.getDuration()));
 			if (self._isPlaying){
 				$( "#player-ui-seek" ).slider( "option", "value", percent );
+				$(document).trigger("mediaTimeChange",[p.getPosition()]);
 			}
 			$(".player-ui-length", self._container).text(self.formatTime(p.getDuration()));
 			$(".player-ui-volume", self._container).text(Math.round(p.getVolume()*100));

diff --git a/chrome/content/zotero-content/annotations/TimeMarker.js b/chrome/content/zotero-content/annotations/TimeMarker.js
@@ -223,15 +223,15 @@ jQuery.extend(rootNS.TimeMarker.prototype, {
 	displayMoments: function() {
 		var output = "";
 		for (var i=0;i<this._moments.length;i++){
-			output += "<tr class='time-marker-moment'><td>"+this._moments[i]+"</td><td><span onclick='changeNote(this,false,"+this._moments[i].id+")'>"+this._moments[i].note+"</span></td><td><span class='editButtonSpan' onclick='changeNote(this.parentNode.previousSibling.firstChild,false,"+this._moments[i].id+")'><img src='chrome://zotero-content/skin/annotations/images/annotate-audio-edit.png' alt='edit' /></a></td><td><span class='deleteButtonSpan' onclick='deleteNote(this,false,"+this._moments[i].id+")'><img src='chrome://zotero-content/skin/annotations/images/annotate-audio-delete.png' alt='delete' /></a></td></tr>";
+			output += "<tr id='mom_"+this._moments[i].id+"' class='time-marker-moment'><td>"+this._moments[i]+"</td><td><span onclick='changeNote(this,false,\""+this._moments[i].note+"\","+this._moments[i].id+")'>"+this._moments[i].note+"</span></td><td><span class='editButtonSpan' onclick='changeNote(this.parentNode.previousSibling.firstChild,false,\""+this._moments[i].note+"\","+this._moments[i].id+")'><img src='chrome://zotero-content/skin/annotations/images/annotate-audio-edit.png' alt='edit' /></a></td><td><span class='deleteButtonSpan' onclick='deleteNote(this,false,"+this._moments[i].id+")'><img src='chrome://zotero-content/skin/annotations/images/annotate-audio-delete.png' alt='delete' /></a></td></tr>";
 		}
 
 		this._momentList.html(output);
 	},
 	displayRanges: function() {
 		var output="";
 				for (var i=0;i<this._ranges.length;i++){
-			output += "<tr class='time-marker-range'><td>"+this._ranges[i]+"</td><td><span onclick='changeNote(this,true,"+this._ranges[i].id+")'>"+this._ranges[i].note+"</span></td><td><span class='editButtonSpan' onclick='changeNote(this.parentNode.previousSibling.firstChild,true,"+this._ranges[i].id+")' href='#'><img src='chrome://zotero-content/skin/annotations/images/annotate-audio-edit.png' alt='edit' /></a></td><td><span class='deleteButtonSpan' onclick='deleteNote(this,true,"+this._ranges[i].id+")'><img src='chrome://zotero-content/skin/annotations/images/annotate-audio-delete.png' alt='delete' /></a></td></tr>";
+			output += "<tr id='rng_"+this._ranges[i].id+"' class='time-marker-range'><td>"+this._ranges[i]+"</td><td><span onclick='changeNote(this,true,\""+this._ranges[i].note+"\","+this._ranges[i].id+")'>"+this._ranges[i].note+"</span></td><td><span class='editButtonSpan' onclick='changeNote(this.parentNode.previousSibling.firstChild,true,\""+this._moments[i].note+"\","+this._moments[i].id+")' href='#'><img src='chrome://zotero-content/skin/annotations/images/annotate-audio-edit.png' alt='edit' /></a></td><td><span class='deleteButtonSpan' onclick='deleteNote(this,true,"+this._ranges[i].id+")'><img src='chrome://zotero-content/skin/annotations/images/annotate-audio-delete.png' alt='delete' /></a></td></tr>";
 		}
 		this._rangeList.html(output);
 	}