UI Cleanup - Updated Settings subtree.

2026-04-23 22:25:14 -04:00 · 2015-02-14 00:37:11 +01:00
parent b69ea349ce
commit 019525dd9d
72 changed files with 1458 additions and 1039 deletions
@@ -2,7 +2,9 @@ var Marionette = require('marionette');
 var QualityDefinitionItemView = require('./QualityDefinitionItemView');

 module.exports = Marionette.CompositeView.extend({
-    template          : 'Settings/Quality/Definition/QualityDefinitionCollectionTemplate',
+    template : 'Settings/Quality/Definition/QualityDefinitionCollectionTemplate',
+
    itemViewContainer : '.x-rows',
-    itemView          : QualityDefinitionItemView
+
+    itemView : QualityDefinitionItemView
 });
@@ -3,62 +3,87 @@ var AsModelBoundView = require('../../../Mixins/AsModelBoundView');
 var fileSize = require('filesize');
 require('jquery-ui');

-module.exports = (function(){
-    var view = Marionette.ItemView.extend({
-        template    : 'Settings/Quality/Definition/QualityDefinitionItemViewTemplate',
-        className   : 'row',
-        ui          : {
-            sizeSlider          : '.x-slider',
-            thirtyMinuteMinSize : '.x-min-thirty',
-            sixtyMinuteMinSize  : '.x-min-sixty',
-            thirtyMinuteMaxSize : '.x-max-thirty',
-            sixtyMinuteMaxSize  : '.x-max-sixty'
-        },
-        events      : {"slide .x-slider" : '_updateSize'},
-        initialize  : function(options){
-            this.profileCollection = options.profiles;
-            this.filesize = fileSize;
-        },
-        onRender    : function(){
-            if(this.model.get('quality').id === 0) {
-                this.$el.addClass('row advanced-setting');
-            }
-            this.ui.sizeSlider.slider({
-                range  : true,
-                min    : 0,
-                max    : 200,
-                values : [this.model.get('minSize'), this.model.get('maxSize')]
-            });
-            this._changeSize();
-        },
-        _updateSize : function(event, ui){
-            this.model.set('minSize', ui.values[0]);
-            this.model.set('maxSize', ui.values[1]);
-            this._changeSize();
-        },
-        _changeSize : function(){
-            var minSize = this.model.get('minSize');
-            var maxSize = this.model.get('maxSize');
-            {
-                var minBytes = minSize * 1024 * 1024;
-                var minThirty = fileSize(minBytes * 30, 1, false);
-                var minSixty = fileSize(minBytes * 60, 1, false);
-                this.ui.thirtyMinuteMinSize.html(minThirty);
-                this.ui.sixtyMinuteMinSize.html(minSixty);
-            }
-            {
-                if(maxSize === 0) {
-                    this.ui.thirtyMinuteMaxSize.html('Unlimited');
-                    this.ui.sixtyMinuteMaxSize.html('Unlimited');
-                    return;
-                }
-                var maxBytes = maxSize * 1024 * 1024;
-                var maxThirty = fileSize(maxBytes * 30, 1, false);
-                var maxSixty = fileSize(maxBytes * 60, 1, false);
-                this.ui.thirtyMinuteMaxSize.html(maxThirty);
-                this.ui.sixtyMinuteMaxSize.html(maxSixty);
-            }
+var view = Marionette.ItemView.extend({
+    template  : 'Settings/Quality/Definition/QualityDefinitionItemViewTemplate',
+    className : 'row',
+
+    ui : {
+        sizeSlider          : '.x-slider',
+        thirtyMinuteMinSize : '.x-min-thirty',
+        sixtyMinuteMinSize  : '.x-min-sixty',
+        thirtyMinuteMaxSize : '.x-max-thirty',
+        sixtyMinuteMaxSize  : '.x-max-sixty'
+    },
+
+    events : {
+        'slide .x-slider' : '_updateSize'
+    },
+
+    initialize : function(options) {
+        this.profileCollection = options.profiles;
+        this.filesize = fileSize;
+    },
+
+    onRender : function() {
+        if (this.model.get('quality').id === 0) {
+            this.$el.addClass('row advanced-setting');
        }
-    });
-    return AsModelBoundView.call(view);
-}).call(this);
+
+        this.ui.sizeSlider.slider({
+            range  : true,
+            min    : 0,
+            max    : 200,
+            values : [
+                this.model.get('minSize'),
+                this.model.get('maxSize')
+            ]
+        });
+
+        this._changeSize();
+    },
+
+    _updateSize : function(event, ui) {
+        this.model.set('minSize', ui.values[0]);
+        this.model.set('maxSize', ui.values[1]);
+
+        this._changeSize();
+    },
+
+    _changeSize : function() {
+        var minSize = this.model.get('minSize');
+        var maxSize = this.model.get('maxSize');
+
+        {
+            var minBytes = minSize * 1024 * 1024;
+            var minThirty = fileSize(minBytes * 30, 1, false);
+            var minSixty = fileSize(minBytes * 60, 1, false);
+
+            this.ui.thirtyMinuteMinSize.html(minThirty);
+            this.ui.sixtyMinuteMinSize.html(minSixty);
+        }
+
+        {
+            if (maxSize === 0) {
+                this.ui.thirtyMinuteMaxSize.html('Unlimited');
+                this.ui.sixtyMinuteMaxSize.html('Unlimited');
+
+                return;
+            }
+
+            var maxBytes = maxSize * 1024 * 1024;
+            var maxThirty = fileSize(maxBytes * 30, 1, false);
+            var maxSixty = fileSize(maxBytes * 60, 1, false);
+
+            this.ui.thirtyMinuteMaxSize.html(maxThirty);
+            this.ui.sixtyMinuteMaxSize.html(maxSixty);
+        }
+        /*if (parseInt(maxSize, 10) === 0) {
+         thirty = 'No Limit';
+         sixty = 'No Limit';
+         }*/
+    }
+});
+
+view = AsModelBoundView.call(view);
+
+module.exports = view;
@@ -3,14 +3,19 @@ var QualityDefinitionCollection = require('../../Quality/QualityDefinitionCollec
 var QualityDefinitionCollectionView = require('./Definition/QualityDefinitionCollectionView');

 module.exports = Marionette.Layout.extend({
-    template   : 'Settings/Quality/QualityLayoutTemplate',
-    regions    : {qualityDefinition : '#quality-definition'},
-    initialize : function(options){
+    template : 'Settings/Quality/QualityLayoutTemplate',
+
+    regions : {
+        qualityDefinition : '#quality-definition'
+    },
+
+    initialize : function(options) {
        this.settings = options.settings;
        this.qualityDefinitionCollection = new QualityDefinitionCollection();
        this.qualityDefinitionCollection.fetch();
    },
-    onShow     : function(){
-        this.qualityDefinition.show(new QualityDefinitionCollectionView({collection : this.qualityDefinitionCollection}));
+
+    onShow : function() {
+        this.qualityDefinition.show(new QualityDefinitionCollectionView({ collection : this.qualityDefinitionCollection }));
    }
 });