Merge pull request 104 - Dropbox connector.

This commit is contained in:
Michael
2014-07-16 18:57:50 -04:00
parent 66ba9d9a65
commit 0f78bae1cc
2 changed files with 377 additions and 377 deletions
+2 -2
View File
@@ -19,8 +19,8 @@
options: { options: {
log: false, log: false,
key: 'YOUR_DROPBOX_APP_KEY', // get one at https://www.dropbox.com/developers/apps key: 'q7vyvfsakyfmp3o',
table: 'adarkroom' // use whatever you like table: 'adarkroom'
}, },
client: false, client: false,
+6 -6
View File
@@ -153,12 +153,6 @@
.click(Engine.exportImport) .click(Engine.exportImport)
.appendTo(menu); .appendTo(menu);
$('<span>')
.addClass('menuBtn')
.text(_('app store.'))
.click(function() { window.open('https://itunes.apple.com/us/app/a-dark-room/id736683061'); })
.appendTo(menu);
if(this.options.dropbox && Engine.Dropbox) { if(this.options.dropbox && Engine.Dropbox) {
this.dropbox = Engine.Dropbox.init(); this.dropbox = Engine.Dropbox.init();
@@ -169,6 +163,12 @@
.appendTo(menu); .appendTo(menu);
} }
$('<span>')
.addClass('menuBtn')
.text(_('app store.'))
.click(function() { window.open('https://itunes.apple.com/us/app/a-dark-room/id736683061'); })
.appendTo(menu);
// Register keypress handlers // Register keypress handlers
$('body').off('keydown').keydown(Engine.keyDown); $('body').off('keydown').keydown(Engine.keyDown);
$('body').off('keyup').keyup(Engine.keyUp); $('body').off('keyup').keyup(Engine.keyUp);