Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

merge changes of Navbar.js #10

Open
wants to merge 47 commits into
from

Conversation

Projects
None yet
3 participants
@ghost

ghost commented Sep 22, 2011

Hi, Mang,

I changed Navbar.js to use the original BookReader.js, and commented a few lines in BookReader.js to hide the original navbar.

David

Doug Reside and others added some commits Sep 21, 2011

Doug Reside Api changes 2a84a71
Doug Reside Added plugin registry d08d74e
@jgsmith jgsmith Initial commit of new-style one-page view plugin 6b4ae14
@respinos respinos initial commit of 2up plugin fe35b8c
Doug Reside Got rid of namespace for indexUpdated trigger 7f70450
@respinos respinos don't use triggers for jumptoindex 2424a3f
@jgsmith jgsmith prefix events with br_ 31a9773
@respinos respinos don't use triggers for jumptoindex 745e98f
@mangtronix mangtronix Merge remote branch 'respinos/master' into codesprint 1575cd0
@jgsmith jgsmith Get .js in sync with .coffee b88c70f
Doug Reside fixed the camel case 497fe5a
@mangtronix mangtronix Merge remote branch 'dougreside/master' into codesprint d9e2aaa
@mangtronix mangtronix Codesprinting ca061fe
@jgsmith jgsmith Merge remote-tracking branch 'upstream/codesprint' 42a0493
@respinos respinos explicit border c3dae08
@mangtronix mangtronix Code sprint 8087645
@mangtronix mangtronix Merge remote branch 'respinos/master' into codesprint 2a38528
@respinos respinos explicit border 977402c
@mangtronix mangtronix Merge remote branch 'respinos/master' into codesprint 6d715a8
@jgsmith jgsmith Merge remote-tracking branch 'upstream/codesprint' 28eb48f
@mangtronix mangtronix Pass correct index to plugin 27856cc
@jgsmith jgsmith Moved listOfPlugins to private scope 99c5823
@jgsmith jgsmith Should work with most recent version of BookReader.js 3ce9561
@jgsmith jgsmith Merge remote-tracking branch 'upstream/codesprint'
Conflicts:
	BookReader/BookReader.js
10984b6
@jgsmith jgsmith syncing Plugins/plugins name d2ebacc
@jgsmith jgsmith everything in plugins/ now 431c2f8
Mauricio Giraldo Navbar plugin for check
First version of the navigation bar as a plugin to be tested.
87244d5
Mauricio Giraldo Minor cleanup 99d5691
@mangtronix mangtronix Dead code removal e522998
@jgsmith jgsmith Initial commit of 'single page, but all of them in a list' view 432b7e7
Mauricio Giraldo Added mouse listeners and fixed bugs
Jiao, Dazhi and Giraldo, Mauricio
66321c6
Mauricio Giraldo Navbar and BookReader
Ignore previous commits
74529de
@mangtronix mangtronix Merge remote branch 'jgsmith/master' into codesprint db27fa0
Dazhi Jiao Added author to navbar.js 9f671a9
@jgsmith jgsmith Merge remote-tracking branch 'upstream/codesprint' 40a86f2
@jgsmith jgsmith first steps in making BookReader.js able to appear multiple times;
registerPlugin now expects a css class name accompanying the plugin class
30c4b53
Dazhi Jiao Use original BookReader.js bde222d
Dazhi Jiao Merge remote-tracking branch 'upstream/codesprint' dba4dca
@jgsmith jgsmith revert to prior version d3df2c8
@jgsmith jgsmith Add this.plugins, look for plugin names in css classes af0a7a2
@jgsmith jgsmith add hide and show methods aef1e58
@mangtronix mangtronix Add view mode icon to toolbar and switch to that view when clicked. WIP. c813077
@mangtronix mangtronix Merge remote branch 'jgsmith/master' into codesprint 4c53791
@jgsmith jgsmith Correct spelling of pluginClass in registerPlugin() 51aff37
@mangtronix mangtronix Merge remote branch 'jgsmith/master' into codesprint 1e13b7a
@mangtronix mangtronix Page stream view hooks up mostly automatically to UI 10912df
Dazhi Jiao Merge remote-tracking branch 'upstream/codesprint' c41e168
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment