diff options
| author | 2013-07-17 11:50:15 +0200 | |
|---|---|---|
| committer | 2013-07-17 11:50:15 +0200 | |
| commit | a3dfd09a8d560f6e6591de2e1de95e82ed2ddce3 (patch) | |
| tree | c3ebfd206a532a91300e69ac04c6229abf615ba5 /pyload/web | |
| parent | fixed last commit (diff) | |
| download | pyload-a3dfd09a8d560f6e6591de2e1de95e82ed2ddce3.tar.xz | |
improved inputTypes, config api
Diffstat (limited to 'pyload/web')
| -rw-r--r-- | pyload/web/app/scripts/utils/apitypes.js | 2 | ||||
| -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 | 
4 files changed, 5 insertions, 5 deletions
| diff --git a/pyload/web/app/scripts/utils/apitypes.js b/pyload/web/app/scripts/utils/apitypes.js index cbbc9064f..d3b984923 100644 --- a/pyload/web/app/scripts/utils/apitypes.js +++ b/pyload/web/app/scripts/utils/apitypes.js @@ -6,7 +6,7 @@ define([], function() {  		DownloadState: {'Failed': 3, 'All': 0, 'Unmanaged': 4, 'Finished': 1, 'Unfinished': 2},  		DownloadStatus: {'Downloading': 10, 'NA': 0, 'Processing': 14, 'Waiting': 9, 'Decrypting': 13, 'Paused': 4, 'Failed': 7, 'Finished': 5, 'Skipped': 6, 'Unknown': 16, 'Aborted': 12, 'Online': 2, 'TempOffline': 11, 'Offline': 1, 'Custom': 15, 'Starting': 8, 'Queued': 3},  		FileStatus: {'Remote': 2, 'Ok': 0, 'Missing': 1}, -		InputType: {'Multiple': 10, 'Int': 2, 'NA': 0, 'List': 11, 'Bool': 7, 'File': 3, 'Text': 1, 'Table': 12, 'Folder': 4, 'Password': 6, 'Click': 8, 'Select': 9, 'Textbox': 5}, +		InputType: {'Multiple': 11, 'Int': 2, 'NA': 0, 'Time': 7, 'List': 12, 'Bool': 8, 'File': 3, 'Text': 1, 'Table': 13, 'Folder': 4, 'Password': 6, 'Click': 9, 'Select': 10, 'Textbox': 5},  		Interaction: {'Captcha': 2, 'All': 0, 'Query': 4, 'Notification': 1},  		MediaType: {'All': 0, 'Audio': 2, 'Image': 4, 'Other': 1, 'Video': 8, 'Document': 16, 'Archive': 32},  		PackageStatus: {'Paused': 1, 'Remote': 3, 'Folder': 2, 'Ok': 0}, 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);              }, | 
