diff options
author | RaNaN <Mast3rRaNaN@hotmail.de> | 2013-07-17 11:50:15 +0200 |
---|---|---|
committer | RaNaN <Mast3rRaNaN@hotmail.de> | 2013-07-17 11:50:15 +0200 |
commit | a3dfd09a8d560f6e6591de2e1de95e82ed2ddce3 (patch) | |
tree | c3ebfd206a532a91300e69ac04c6229abf615ba5 /pyload/web/app/scripts/views | |
parent | fixed last commit (diff) | |
download | pyload-a3dfd09a8d560f6e6591de2e1de95e82ed2ddce3.tar.xz |
improved inputTypes, config api
Diffstat (limited to 'pyload/web/app/scripts/views')
-rw-r--r-- | pyload/web/app/scripts/views/input/inputLoader.js | 2 | ||||
-rw-r--r-- | pyload/web/app/scripts/views/input/inputView.js | 4 | ||||
-rw-r--r-- | pyload/web/app/scripts/views/queryModal.js | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pyload/web/app/scripts/views/input/inputLoader.js b/pyload/web/app/scripts/views/input/inputLoader.js index 11665abb4..04d591d30 100644 --- a/pyload/web/app/scripts/views/input/inputLoader.js +++ b/pyload/web/app/scripts/views/input/inputLoader.js @@ -2,7 +2,7 @@ define(['./textInput'], function(textInput) { 'use strict'; // selects appropriate input element - return function(input, value, default_value, description) { + return function(input) { return textInput; }; });
\ No newline at end of file diff --git a/pyload/web/app/scripts/views/input/inputView.js b/pyload/web/app/scripts/views/input/inputView.js index 1fbe5042d..1860fcaf1 100644 --- a/pyload/web/app/scripts/views/input/inputView.js +++ b/pyload/web/app/scripts/views/input/inputView.js @@ -8,16 +8,16 @@ define(['jquery', 'backbone', 'underscore'], function($, Backbone, _) { input: null, value: null, - default_value: null, description: null, + default_value: null, // enables tooltips tooltip: true, initialize: function(options) { this.input = options.input; + this.default_value = this.input.default_value; this.value = options.value; - this.default_value = options.default_value; this.description = options.description; }, diff --git a/pyload/web/app/scripts/views/queryModal.js b/pyload/web/app/scripts/views/queryModal.js index c748e1657..ce624814a 100644 --- a/pyload/web/app/scripts/views/queryModal.js +++ b/pyload/web/app/scripts/views/queryModal.js @@ -39,7 +39,7 @@ define(['jquery', 'underscore', 'app', 'views/abstract/modalView', './input/inpu // instantiate the input var input = this.model.get('input'); var InputView = load_input(input); - this.input = new InputView(input); + this.input = new InputView({input: input}); // only renders after wards this.$('#inputField').append(this.input.render().el); }, |