From 2d3a3a0677eb2ca1463c8fc5389e1f409f20bb7f Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Thu, 19 Jan 2017 17:40:25 +0100 Subject: [PATCH] Update sizing information in settings tab. --- .../QualityDefinitionCollectionTemplate.hbs | 28 ++-- .../Definition/QualityDefinitionItemView.js | 146 +++++++++--------- .../QualityDefinitionItemViewTemplate.hbs | 62 ++++---- 3 files changed, 118 insertions(+), 118 deletions(-) diff --git a/src/UI/Settings/Quality/Definition/QualityDefinitionCollectionTemplate.hbs b/src/UI/Settings/Quality/Definition/QualityDefinitionCollectionTemplate.hbs index ac514ba90..5c1321cff 100644 --- a/src/UI/Settings/Quality/Definition/QualityDefinitionCollectionTemplate.hbs +++ b/src/UI/Settings/Quality/Definition/QualityDefinitionCollectionTemplate.hbs @@ -1,16 +1,16 @@
- Quality Definitions -
-
- -
-
-
-
+ Quality Definitions +
+
+ +
+
+
+
diff --git a/src/UI/Settings/Quality/Definition/QualityDefinitionItemView.js b/src/UI/Settings/Quality/Definition/QualityDefinitionItemView.js index b663cf310..f65595792 100644 --- a/src/UI/Settings/Quality/Definition/QualityDefinitionItemView.js +++ b/src/UI/Settings/Quality/Definition/QualityDefinitionItemView.js @@ -4,92 +4,92 @@ require('jquery-ui'); var FormatHelpers = require('../../../Shared/FormatHelpers'); var view = Marionette.ItemView.extend({ - template : 'Settings/Quality/Definition/QualityDefinitionItemViewTemplate', - className : 'row', - - slider : { - min : 0, - max : 200, - step : 0.1 - }, + 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' - }, + slider : { + min : 0, + max : 200, + step : 0.1 + }, - events : { - 'slide .x-slider' : '_updateSize' - }, + ui : { + sizeSlider : '.x-slider', + thirtyMinuteMinSize : '.x-min-thirty', + sixtyMinuteMinSize : '.x-min-sixty', + thirtyMinuteMaxSize : '.x-max-thirty', + sixtyMinuteMaxSize : '.x-max-sixty' + }, - initialize : function(options) { - this.profileCollection = options.profiles; - }, + events : { + 'slide .x-slider' : '_updateSize' + }, - onRender : function() { - if (this.model.get('quality').id === 0) { - this.$el.addClass('row advanced-setting'); - } + initialize : function(options) { + this.profileCollection = options.profiles; + }, - this.ui.sizeSlider.slider({ - range : true, - min : this.slider.min, - max : this.slider.max, - step : this.slider.step, - values : [ - this.model.get('minSize') || this.slider.min, - this.model.get('maxSize') || this.slider.max - ] - }); + onRender : function() { + if (this.model.get('quality').id === 0) { + this.$el.addClass('row advanced-setting'); + } - this._changeSize(); - }, + this.ui.sizeSlider.slider({ + range : true, + min : this.slider.min, + max : this.slider.max, + step : this.slider.step, + values : [ + this.model.get('minSize') || this.slider.min, + this.model.get('maxSize') || this.slider.max + ] + }); - _updateSize : function(event, ui) { - var minSize = ui.values[0]; - var maxSize = ui.values[1]; - - if (maxSize === this.slider.max) { - maxSize = null; - } - - this.model.set('minSize', minSize); - this.model.set('maxSize', maxSize); + this._changeSize(); + }, - this._changeSize(); - }, + _updateSize : function(event, ui) { + var minSize = ui.values[0]; + var maxSize = ui.values[1]; - _changeSize : function() { - var minSize = this.model.get('minSize') || this.slider.min; - var maxSize = this.model.get('maxSize') || null; - { - var minBytes = minSize * 1024 * 1024; - var minThirty = FormatHelpers.bytes(minBytes * 30, 2); - var minSixty = FormatHelpers.bytes(minBytes * 60, 2); + if (maxSize === this.slider.max) { + maxSize = null; + } - this.ui.thirtyMinuteMinSize.html(minThirty); - this.ui.sixtyMinuteMinSize.html(minSixty); - } + this.model.set('minSize', minSize); + this.model.set('maxSize', maxSize); - { - if (maxSize === 0 || maxSize === null) { - this.ui.thirtyMinuteMaxSize.html('Unlimited'); - this.ui.sixtyMinuteMaxSize.html('Unlimited'); - } else { - var maxBytes = maxSize * 1024 * 1024; - var maxThirty = FormatHelpers.bytes(maxBytes * 30, 2); - var maxSixty = FormatHelpers.bytes(maxBytes * 60, 2); + this._changeSize(); + }, - this.ui.thirtyMinuteMaxSize.html(maxThirty); - this.ui.sixtyMinuteMaxSize.html(maxSixty); - } - } - } + _changeSize : function() { + var minSize = this.model.get('minSize') || this.slider.min; + var maxSize = this.model.get('maxSize') || null; + { + var minBytes = minSize * 1024 * 1024; + var minThirty = FormatHelpers.bytes(minBytes * 90, 2); + var minSixty = FormatHelpers.bytes(minBytes * 140, 2); + + this.ui.thirtyMinuteMinSize.html(minThirty); + this.ui.sixtyMinuteMinSize.html(minSixty); + } + + { + if (maxSize === 0 || maxSize === null) { + this.ui.thirtyMinuteMaxSize.html('Unlimited'); + this.ui.sixtyMinuteMaxSize.html('Unlimited'); + } else { + var maxBytes = maxSize * 1024 * 1024; + var maxThirty = FormatHelpers.bytes(maxBytes * 90, 2); + var maxSixty = FormatHelpers.bytes(maxBytes * 140, 2); + + this.ui.thirtyMinuteMaxSize.html(maxThirty); + this.ui.sixtyMinuteMaxSize.html(maxSixty); + } + } + } }); view = AsModelBoundView.call(view); -module.exports = view; \ No newline at end of file +module.exports = view; diff --git a/src/UI/Settings/Quality/Definition/QualityDefinitionItemViewTemplate.hbs b/src/UI/Settings/Quality/Definition/QualityDefinitionItemViewTemplate.hbs index 39b94b650..91b44067c 100644 --- a/src/UI/Settings/Quality/Definition/QualityDefinitionItemViewTemplate.hbs +++ b/src/UI/Settings/Quality/Definition/QualityDefinitionItemViewTemplate.hbs @@ -1,31 +1,31 @@ - - {{quality.name}} - - - - - -
-
-
- - - - -
-
- - - - -
-
- \ No newline at end of file + + {{quality.name}} + + + + + +
+
+
+ + + + +
+
+ + + + +
+
+