Merge branch 'newui' of git@github.com:openlibrary/bookreader into newui

diff --cc BookReader/BookReader.js
index 5d532a9,1efa4df..3a01f7e
--- 1/BookReader/BookReader.js
--- 2/BookReader/BookReader.js
+++ b/BookReader/BookReader.js
@@@ -3611,8 -3616,10 +3619,10 @@@ BookReader.prototype.initToolbar = func
            "<div id='BRtoolbar'>"
          +   "<span id='BRtoolbarbuttons'>"
          /* XXXmang integrate search */
 -        +     "<form action='javascript:' id='booksearch'><input type='search' id='textSrch' name='textSrch' val='' placeholder='Search inside'/><button type='submit' id='btnSrch' name='btnSrch'>GO</button></form>"
 +        +     "<form action='javascript:br.search($(\"#textSrch\").val());' id='booksearch'><input type='search' id='textSrch' name='textSrch' val='' placeholder='Search inside'/><button type='submit' id='btnSrch' name='btnSrch'>GO</button></form>"
          // XXXmang icons incorrect or handlers wrong
+         +     "<button class='BRicon play'></button>"
+         +     "<button class='BRicon pause'></button>"
          +     "<button class='BRicon info'></button>"
          +     "<button class='BRicon share'></button>"
          +     readIcon
@@@ -3871,12 -3880,11 +3883,13 @@@ BookReader.prototype.bindNavigationHand
      });
      
      // XXX fix integration
 -    $('#booksearch').bind('submit', function() {
 -        self.search($('#textSrch').val());
 -    });
 +    // XXX Mobile safari was not picking up this handler, so 
 +    //     I explictly set the form action in initToolbar()
 +    // $('#booksearch').bind('submit', function() {
 +    //    self.search($('#textSrch').val());
 +    // });
  
+     this.initSwipeData();
      $('#BookReader').die('mousemove.navigation').live('mousemove.navigation',
          { 'br': this },
          this.navigationMousemoveHandler