IntenseWebs/gantry5
3
0
Fork 0
mirror of https://github.com/gantry/gantry5.git synced 2026-08-19 01:15:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Forced rounding all equalized block sizes to 1 decimal digit (fixes #776)

Browse Source
This commit is contained in:
Djamil Legato
2015-09-01 12:35:55 -07:00
parent 6c39c50a80
commit 2e272fbac7
5 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+2 -1
View File
@@ -1,9 +1,10 @@
# 5.1.3
## XX/XX/2015
1. [Common](#common
1. [Common](#common)
3. [](#bugfix)
- Fixed "View on GitHub" button in the Changelog modal that was taking you nowhere
- Equalized blocks sizes are now always rounded to 1 decimal digit and will only be supported this way (fixes #776)
# 5.1.2
## 31/08/2015
engines/common/nucleus/admin/blueprints/layout/block.yaml
+1 -1
View File
@@ -41,7 +41,7 @@ form:
description: Block size in percentages (5-100).
class: 'custom-validation-field'
formnovalidate: true
pattern: '^([5-9]|[1-9][0-9]|8.3{1,}(?:2)?|9.(09(?:1)?|1)|11.1{2,}|12.5|14.28[0-9]{2,}|16.6{2,}(?:7)?|33.3{2,}(?:4)?|100)$'
pattern: '^([5-9]|[1-9][0-9]|8.3|9.1|11.1|12.5|14.3|16.7|33.3|100)$'
min: 5
max: 100
append:
platforms/common/application/lm/blocks/block.js
+4 -1
View File
@@ -17,16 +17,18 @@ var Block = new prime({
constructor: function(options) {
Base.call(this, options);
this.setAttribute('size', precision(options.attributes.size, 1));
this.on('changed', this.hasChanged);
},
getSize: function() {
return this.getAttribute('size');
return precision(this.getAttribute('size'), 1);
},
setSize: function(size, store) {
size = typeof size === 'undefined' ? this.getSize() : Math.max(0, Math.min(100, parseFloat(size)));
size = precision(size, 1);
if (store) {
this.setAttribute('size', size);
}
@@ -42,6 +44,7 @@ var Block = new prime({
setAnimatedSize: function(size, store) {
size = typeof size === 'undefined' ? this.getSize() : Math.max(0, Math.min(100, parseFloat(size)));
size = precision(size, 1);
if (store) {
this.setAttribute('size', size);
}
platforms/common/application/lm/index.js
+3 -2
View File
@@ -12,6 +12,7 @@ var ready = require('elements/domready'),
strReplace = require('mout/string/replace'),
properCase = require('mout/string/properCase'),
forEach = require('mout/collection/forEach'),
precision = require('mout/number/enforcePrecision'),
getAjaxSuffix = require('../utils/get-ajax-suffix'),
parseAjaxURI = require('../utils/get-ajax-url').parse,
@@ -458,8 +459,8 @@ ready(function() {
// logic for limits
if (blockSize && data.size_limits) {
var note = content.elements.content.find('.blocksize-note'),
min = data.size_limits[0],
max = data.size_limits[1];
min = precision(data.size_limits[0], 1),
max = precision(data.size_limits[1], 1);
blockSize.attribute('min', min);
blockSize.attribute('max', max);
platforms/common/js/main.js
Vendored
+8 -4
View File
@@ -1037,16 +1037,18 @@ var Block = new prime({
constructor: function(options) {
Base.call(this, options);
this.setAttribute('size', precision(options.attributes.size, 1));
this.on('changed', this.hasChanged);
},
getSize: function() {
return this.getAttribute('size');
return precision(this.getAttribute('size'), 1);
},
setSize: function(size, store) {
size = typeof size === 'undefined' ? this.getSize() : Math.max(0, Math.min(100, parseFloat(size)));
size = precision(size, 1);
if (store) {
this.setAttribute('size', size);
}
@@ -1062,6 +1064,7 @@ var Block = new prime({
setAnimatedSize: function(size, store) {
size = typeof size === 'undefined' ? this.getSize() : Math.max(0, Math.min(100, parseFloat(size)));
size = precision(size, 1);
if (store) {
this.setAttribute('size', size);
}
@@ -2094,6 +2097,7 @@ var ready = require('elements/domready'),
strReplace = require('mout/string/replace'),
properCase = require('mout/string/properCase'),
forEach = require('mout/collection/forEach'),
precision = require('mout/number/enforcePrecision'),
getAjaxSuffix = require('../utils/get-ajax-suffix'),
parseAjaxURI = require('../utils/get-ajax-url').parse,
@@ -2540,8 +2544,8 @@ ready(function() {
// logic for limits
if (blockSize && data.size_limits) {
var note = content.elements.content.find('.blocksize-note'),
min = data.size_limits[0],
max = data.size_limits[1];
min = precision(data.size_limits[0], 1),
max = precision(data.size_limits[1], 1);
blockSize.attribute('min', min);
blockSize.attribute('max', max);
@@ -2683,7 +2687,7 @@ module.exports = {
savestate: savestate
};
},{"../ui":46,"../ui/popover":48,"../utils/field-validation":58,"../utils/flags-state":59,"../utils/get-ajax-suffix":60,"../utils/get-ajax-url":61,"../utils/history":64,"../utils/save-state":66,"./builder":21,"./history":23,"./layoutmanager":25,"./particles-sidebar":26,"agent":67,"elements/attributes":93,"elements/domready":96,"elements/zen":101,"mout/array/contains":131,"mout/collection/forEach":152,"mout/collection/size":154,"mout/string/properCase":225,"mout/string/replace":228,"mout/string/trim":233}],25:[function(require,module,exports){
},{"../ui":46,"../ui/popover":48,"../utils/field-validation":58,"../utils/flags-state":59,"../utils/get-ajax-suffix":60,"../utils/get-ajax-url":61,"../utils/history":64,"../utils/save-state":66,"./builder":21,"./history":23,"./layoutmanager":25,"./particles-sidebar":26,"agent":67,"elements/attributes":93,"elements/domready":96,"elements/zen":101,"mout/array/contains":131,"mout/collection/forEach":152,"mout/collection/size":154,"mout/number/enforcePrecision":186,"mout/string/properCase":225,"mout/string/replace":228,"mout/string/trim":233}],25:[function(require,module,exports){
"use strict";
var prime = require('prime'),
$ = require('../utils/elements.utils'),