diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-08-08 17:38:35 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-08-08 17:38:35 +0200 |
| commit | 52f6599748ef61219112111dc5db71f3342b076d (patch) | |
| tree | e3627ded64b7e98493ca1ec7bd182aaa1774252e /pyload/web/app | |
| parent | MultiHosters: moved settings to addon plugins. (diff) | |
| download | pyload-52f6599748ef61219112111dc5db71f3342b076d.tar.xz | |
adapted account api to multi user, fixed http referer bug
Diffstat (limited to 'pyload/web/app')
| -rw-r--r-- | pyload/web/app/scripts/collections/AccountList.js | 3 | ||||
| -rw-r--r-- | pyload/web/app/scripts/models/Account.js | 2 | ||||
| -rw-r--r-- | pyload/web/app/scripts/views/accounts/accountModal.js | 2 | ||||
| -rw-r--r-- | pyload/web/app/scripts/views/headerView.js | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/pyload/web/app/scripts/collections/AccountList.js b/pyload/web/app/scripts/collections/AccountList.js index bfc2af5a3..f6a8eda65 100644 --- a/pyload/web/app/scripts/collections/AccountList.js +++ b/pyload/web/app/scripts/collections/AccountList.js @@ -14,8 +14,7 @@ define(['jquery', 'backbone', 'underscore', 'app', 'models/Account'], function($ }, fetch: function(options) { - // TODO: refresh options? - options = App.apiRequest('getAccounts/false', null, options); + options = App.apiRequest('getAccounts', null, options); return Backbone.Collection.prototype.fetch.call(this, options); } diff --git a/pyload/web/app/scripts/models/Account.js b/pyload/web/app/scripts/models/Account.js index a2e24b056..9cfc1c0c1 100644 --- a/pyload/web/app/scripts/models/Account.js +++ b/pyload/web/app/scripts/models/Account.js @@ -18,7 +18,7 @@ define(['jquery', 'backbone', 'underscore', 'app', 'utils/apitypes'], function($ premium: false, activated: false, shared: false, - options: null + config: null }, // Model Constructor diff --git a/pyload/web/app/scripts/views/accounts/accountModal.js b/pyload/web/app/scripts/views/accounts/accountModal.js index 6c2b226df..85db96b2b 100644 --- a/pyload/web/app/scripts/views/accounts/accountModal.js +++ b/pyload/web/app/scripts/views/accounts/accountModal.js @@ -60,7 +60,7 @@ define(['jquery', 'underscore', 'app', 'views/abstract/modalView', 'hbs!tpl/dial self = this; $.ajax(App.apiRequest('updateAccount', { - plugin: plugin, login: login, password: password + plugin: plugin, loginname: login, password: password }, { success: function() { App.vent.trigger('accounts:updated'); self.hide(); diff --git a/pyload/web/app/scripts/views/headerView.js b/pyload/web/app/scripts/views/headerView.js index e6e763b26..3fdfe32ba 100644 --- a/pyload/web/app/scripts/views/headerView.js +++ b/pyload/web/app/scripts/views/headerView.js @@ -67,6 +67,9 @@ define(['jquery', 'underscore', 'backbone', 'app', 'models/ServerStatus', 'colle console.log(error); alert('WebSocket error' + error); }; + ws.onclose = function() { + alert('WebSocket was closed'); + }; this.ws = ws; }, |