diff options
Diffstat (limited to 'module/web/app/scripts/models')
-rw-r--r-- | module/web/app/scripts/models/Account.js | 1 | ||||
-rw-r--r-- | module/web/app/scripts/models/ConfigHolder.js | 7 | ||||
-rw-r--r-- | module/web/app/scripts/models/ConfigItem.js | 7 | ||||
-rw-r--r-- | module/web/app/scripts/models/File.js | 3 | ||||
-rw-r--r-- | module/web/app/scripts/models/InteractionTask.js | 9 | ||||
-rw-r--r-- | module/web/app/scripts/models/Package.js | 9 | ||||
-rw-r--r-- | module/web/app/scripts/models/Progress.js | 1 | ||||
-rw-r--r-- | module/web/app/scripts/models/ServerStatus.js | 3 | ||||
-rw-r--r-- | module/web/app/scripts/models/TreeCollection.js | 95 |
9 files changed, 72 insertions, 63 deletions
diff --git a/module/web/app/scripts/models/Account.js b/module/web/app/scripts/models/Account.js index c6e023578..a2e24b056 100644 --- a/module/web/app/scripts/models/Account.js +++ b/module/web/app/scripts/models/Account.js @@ -1,4 +1,5 @@ define(['jquery', 'backbone', 'underscore', 'app', 'utils/apitypes'], function($, Backbone, _, App, Api) { + 'use strict'; return Backbone.Model.extend({ diff --git a/module/web/app/scripts/models/ConfigHolder.js b/module/web/app/scripts/models/ConfigHolder.js index b05b1e14b..40efbc7c0 100644 --- a/module/web/app/scripts/models/ConfigHolder.js +++ b/module/web/app/scripts/models/ConfigHolder.js @@ -1,12 +1,13 @@ define(['jquery', 'backbone', 'underscore', 'app', './ConfigItem'], function($, Backbone, _, App, ConfigItem) { + 'use strict'; return Backbone.Model.extend({ defaults: { - name: "", - label: "", - description: "", + name: '', + label: '', + description: '', long_description: null, // simple list but no collection items: null, diff --git a/module/web/app/scripts/models/ConfigItem.js b/module/web/app/scripts/models/ConfigItem.js index 01a85c6cc..2d325c2a2 100644 --- a/module/web/app/scripts/models/ConfigItem.js +++ b/module/web/app/scripts/models/ConfigItem.js @@ -1,12 +1,13 @@ define(['jquery', 'backbone', 'underscore', 'app', 'utils/apitypes'], function($, Backbone, _, App, Api) { + 'use strict'; return Backbone.Model.extend({ defaults: { - name: "", - label: "", - description: "", + name: '', + label: '', + description: '', input: null, default_value: null, value: null, diff --git a/module/web/app/scripts/models/File.js b/module/web/app/scripts/models/File.js index 524637cb4..3beb7f270 100644 --- a/module/web/app/scripts/models/File.js +++ b/module/web/app/scripts/models/File.js @@ -1,4 +1,5 @@ define(['jquery', 'backbone', 'underscore', 'app', 'utils/apitypes'], function($, Backbone, _, App, Api) { + 'use strict'; var Finished = [Api.DownloadStatus.Finished, Api.DownloadStatus.Skipped]; var Failed = [Api.DownloadStatus.Failed, Api.DownloadStatus.Aborted, Api.DownloadStatus.TempOffline, Api.DownloadStatus.Offline]; @@ -46,7 +47,7 @@ define(['jquery', 'backbone', 'underscore', 'app', 'utils/apitypes'], function($ options = App.apiRequest( 'deleteFiles/[' + this.get('fid') + ']', null, options); - options.method = "post"; + options.method = 'post'; return Backbone.Model.prototype.destroy.call(this, options); }, diff --git a/module/web/app/scripts/models/InteractionTask.js b/module/web/app/scripts/models/InteractionTask.js index 56fdbf8bf..54c739d4b 100644 --- a/module/web/app/scripts/models/InteractionTask.js +++ b/module/web/app/scripts/models/InteractionTask.js @@ -1,5 +1,6 @@ define(['jquery', 'backbone', 'underscore', 'app', 'utils/apitypes'], function($, Backbone, _, App, Api) { + 'use strict'; return Backbone.Model.extend({ @@ -10,11 +11,11 @@ define(['jquery', 'backbone', 'underscore', 'app', 'utils/apitypes'], type: null, input: null, default_value: null, - title: "", - description: "", - plugin: "", + title: '', + description: '', + plugin: '', // additional attributes - result: "" + result: '' }, // Model Constructor diff --git a/module/web/app/scripts/models/Package.js b/module/web/app/scripts/models/Package.js index 3435265fe..a34ec1c69 100644 --- a/module/web/app/scripts/models/Package.js +++ b/module/web/app/scripts/models/Package.js @@ -1,5 +1,6 @@ define(['jquery', 'backbone', 'underscore', 'app', 'collections/FileList', 'require'], function($, Backbone, _, App, FileList, require) { + 'use strict'; return Backbone.Model.extend({ @@ -8,12 +9,12 @@ define(['jquery', 'backbone', 'underscore', 'app', 'collections/FileList', 'requ defaults: { pid: -1, name: null, - folder: "", + folder: '', root: -1, owner: -1, - site: "", - comment: "", - password: "", + site: '', + comment: '', + password: '', added: -1, tags: null, status: -1, diff --git a/module/web/app/scripts/models/Progress.js b/module/web/app/scripts/models/Progress.js index 96beb0198..b0bbb684d 100644 --- a/module/web/app/scripts/models/Progress.js +++ b/module/web/app/scripts/models/Progress.js @@ -1,4 +1,5 @@ define(['jquery', 'backbone', 'underscore', 'utils/apitypes'], function($, Backbone, _, Api) { + 'use strict'; return Backbone.Model.extend({ diff --git a/module/web/app/scripts/models/ServerStatus.js b/module/web/app/scripts/models/ServerStatus.js index 9242bdf95..59739b41e 100644 --- a/module/web/app/scripts/models/ServerStatus.js +++ b/module/web/app/scripts/models/ServerStatus.js @@ -1,5 +1,6 @@ define(['jquery', 'backbone', 'underscore'], function($, Backbone, _) { + 'use strict'; return Backbone.Model.extend({ @@ -20,7 +21,7 @@ define(['jquery', 'backbone', 'underscore'], }, - fetch: function() { + fetch: function(options) { options || (options = {}); options.url = 'api/getServerStatus'; diff --git a/module/web/app/scripts/models/TreeCollection.js b/module/web/app/scripts/models/TreeCollection.js index a528854b5..2f761e6cc 100644 --- a/module/web/app/scripts/models/TreeCollection.js +++ b/module/web/app/scripts/models/TreeCollection.js @@ -1,49 +1,50 @@ define(['jquery', 'backbone', 'underscore', 'app', 'models/Package', 'collections/FileList', 'collections/PackageList'], function($, Backbone, _, App, Package, FileList, PackageList) { - - // TreeCollection - // A Model and not a collection, aggregates other collections - return Backbone.Model.extend({ - - defaults : { - root: null, - packages: null, - files: null - }, - - initialize: function() { - - }, - - fetch: function(options) { - options || (options = {}); - var pid = options.pid || -1; - - options = App.apiRequest( - 'getFileTree/' + pid, - {full: false}, - options); - - console.log('Fetching package tree ' + pid); - return Backbone.Model.prototype.fetch.call(this, options); - }, - - // Parse the response and updates the collections - parse: function(resp) { - var ret = {}; - if (!this.has('packages')) - ret.packages = new PackageList(_.values(resp.packages)); - else - this.get('packages').set(_.values(resp.packages)); - - if (!this.has('files')) - ret.files = new FileList(_.values(resp.files)); - else - this.get('files').set(_.values(resp.files)); - - ret.root = new Package(resp.root); - return ret; - } - - }); -});
\ No newline at end of file + 'use strict'; + + // TreeCollection + // A Model and not a collection, aggregates other collections + return Backbone.Model.extend({ + + defaults: { + root: null, + packages: null, + files: null + }, + + initialize: function() { + + }, + + fetch: function(options) { + options || (options = {}); + var pid = options.pid || -1; + + options = App.apiRequest( + 'getFileTree/' + pid, + {full: false}, + options); + + console.log('Fetching package tree ' + pid); + return Backbone.Model.prototype.fetch.call(this, options); + }, + + // Parse the response and updates the collections + parse: function(resp) { + var ret = {}; + if (!this.has('packages')) + ret.packages = new PackageList(_.values(resp.packages)); + else + this.get('packages').set(_.values(resp.packages)); + + if (!this.has('files')) + ret.files = new FileList(_.values(resp.files)); + else + this.get('files').set(_.values(resp.files)); + + ret.root = new Package(resp.root); + return ret; + } + + }); + });
\ No newline at end of file |