Merge commit 'ol/newui' into newui
authorrajbot <raj@archive.org>
Tue, 12 Oct 2010 21:38:47 +0000 (21:38 +0000)
committerrajbot <raj@archive.org>
Tue, 12 Oct 2010 21:38:47 +0000 (21:38 +0000)
Conflicts:
BookReader/BookReader.css
BookReader/BookReader.js

1  2 
BookReader/BookReader.css
BookReader/BookReader.js
BookReaderIA/inc/BookReader.inc

Simple merge
@@@ -3691,6 -3720,17 +3747,22 @@@ BookReader.prototype.bindToolbarNavHand
          self.rightmost();
          return false;
      });
++
++    jToolbar.find('.read').click(function(e) {
++        self.ttsToggle();
++        return false;
++    });
+     
+     // $$$mang cleanup
+     $('#BRzoomer .zoom_in').bind('click', function() {
+         self.zoom(1);
+         return false;
+     });
+     
+     $('#BRzoomer .zoom_out').bind('click', function() {
+         self.zoom(-1);
+         return false;
+     });
  }
  
  // updateToolbarZoom(reduce)
Simple merge