mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'sogawa/gridster.js/strict-sort'

Browse Source 
* sogawa/gridster.js/strict-sort:
  Convert to integer type of property value when sorting.
  add element "#qunit-testresult"
  rename test files.
This commit is contained in:
David Morse
2015-04-07 19:56:44 -06:00
parent acd80b4039 0ad0b3bd92
commit 72007139cb
7 changed files with 193 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/jquery.gridster.js
Vendored
+30
View File
@@ -1014,6 +1014,28 @@
Gridster.defaults = defaults;
Gridster.generated_stylesheets = [];
/**
* Convert properties to Integer
*
* @param {Object}
* @return {Objct} Returns the converted object.
*/
function convInt(obj) {
var props = ['col', 'row', 'size_x', 'size_y'];
var tmp = {};
for (var i=0, len=props.length; i<len; i++) {
var prop = props[i];
if (!(prop in obj)) {
throw new Error('Not exists property `'+ prop +'`');
}
var val = obj[prop];
if (!val || isNaN(val)) {
throw new Error('Invalid value of `'+ prop +'` property');
}
tmp[prop] = +val;
}
return tmp;
}
/**
* Sorts an Array of grid coords objects (representing the grid coords of
@@ -1030,6 +1052,8 @@
b = $(b).coords().grid;
}
a = convInt(a);
b = convInt(b);
if (a.row > b.row) {
return 1;
}
@@ -1050,6 +1074,8 @@
*/
Gridster.sort_by_row_and_col_asc = function(widgets) {
widgets = widgets.sort(function(a, b) {
a = convInt(a);
b = convInt(b);
if (a.row > b.row || a.row === b.row && a.col > b.col) {
return 1;
}
@@ -1070,6 +1096,8 @@
*/
Gridster.sort_by_col_asc = function(widgets) {
widgets = widgets.sort(function(a, b) {
a = convInt(a);
b = convInt(b);
if (a.col > b.col) {
return 1;
}
@@ -1090,6 +1118,8 @@
*/
Gridster.sort_by_row_desc = function(widgets) {
widgets = widgets.sort(function(a, b) {
a = convInt(a);
b = convInt(b);
if (a.row + a.size_y < b.row + b.size_y) {
return 1;
}
dist/jquery.gridster.min.js
Vendored
+2 -3
View File
File diff suppressed because one or more lines are too long
dist/jquery.gridster.with-extras.js
Vendored
+30
View File
@@ -1014,6 +1014,28 @@
Gridster.defaults = defaults;
Gridster.generated_stylesheets = [];
/**
* Convert properties to Integer
*
* @param {Object}
* @return {Objct} Returns the converted object.
*/
function convInt(obj) {
var props = ['col', 'row', 'size_x', 'size_y'];
var tmp = {};
for (var i=0, len=props.length; i<len; i++) {
var prop = props[i];
if (!(prop in obj)) {
throw new Error('Not exists property `'+ prop +'`');
}
var val = obj[prop];
if (!val || isNaN(val)) {
throw new Error('Invalid value of `'+ prop +'` property');
}
tmp[prop] = +val;
}
return tmp;
}
/**
* Sorts an Array of grid coords objects (representing the grid coords of
@@ -1030,6 +1052,8 @@
b = $(b).coords().grid;
}
a = convInt(a);
b = convInt(b);
if (a.row > b.row) {
return 1;
}
@@ -1050,6 +1074,8 @@
*/
Gridster.sort_by_row_and_col_asc = function(widgets) {
widgets = widgets.sort(function(a, b) {
a = convInt(a);
b = convInt(b);
if (a.row > b.row || a.row === b.row && a.col > b.col) {
return 1;
}
@@ -1070,6 +1096,8 @@
*/
Gridster.sort_by_col_asc = function(widgets) {
widgets = widgets.sort(function(a, b) {
a = convInt(a);
b = convInt(b);
if (a.col > b.col) {
return 1;
}
@@ -1090,6 +1118,8 @@
*/
Gridster.sort_by_row_desc = function(widgets) {
widgets = widgets.sort(function(a, b) {
a = convInt(a);
b = convInt(b);
if (a.row + a.size_y < b.row + b.size_y) {
return 1;
}
dist/jquery.gridster.with-extras.min.js
Vendored
+2 -3
View File
File diff suppressed because one or more lines are too long
src/jquery.gridster.js
+30
View File
@@ -160,6 +160,28 @@
Gridster.defaults = defaults;
Gridster.generated_stylesheets = [];
/**
* Convert properties to Integer
*
* @param {Object}
* @return {Objct} Returns the converted object.
*/
function convInt(obj) {
var props = ['col', 'row', 'size_x', 'size_y'];
var tmp = {};
for (var i=0, len=props.length; i<len; i++) {
var prop = props[i];
if (!(prop in obj)) {
throw new Error('Not exists property `'+ prop +'`');
}
var val = obj[prop];
if (!val || isNaN(val)) {
throw new Error('Invalid value of `'+ prop +'` property');
}
tmp[prop] = +val;
}
return tmp;
}
/**
* Sorts an Array of grid coords objects (representing the grid coords of
@@ -176,6 +198,8 @@
b = $(b).coords().grid;
}
a = convInt(a);
b = convInt(b);
if (a.row > b.row) {
return 1;
}
@@ -196,6 +220,8 @@
*/
Gridster.sort_by_row_and_col_asc = function(widgets) {
widgets = widgets.sort(function(a, b) {
a = convInt(a);
b = convInt(b);
if (a.row > b.row || a.row === b.row && a.col > b.col) {
return 1;
}
@@ -216,6 +242,8 @@
*/
Gridster.sort_by_col_asc = function(widgets) {
widgets = widgets.sort(function(a, b) {
a = convInt(a);
b = convInt(b);
if (a.col > b.col) {
return 1;
}
@@ -236,6 +264,8 @@
*/
Gridster.sort_by_row_desc = function(widgets) {
widgets = widgets.sort(function(a, b) {
a = convInt(a);
b = convInt(b);
if (a.row + a.size_y < b.row + b.size_y) {
return 1;
}
test/jquery.gridster.html
+1 -1
View File
@@ -56,7 +56,7 @@
</ul>
</div>
</div>
<div id="qunit-testresult"></div>
</body>
</html>
test/jquery.gridster_test.js
+98 -8
View File
@@ -23,16 +23,106 @@
*/
module('jQuery#gridster', {
setup: function() {
setup: function() {
this.el = $('#qunit-fixture').find(".wrapper ul");
this.el = $('#qunit-fixture').find(".wrapper ul");
}
this.serialization = [
{ name: "A", col: "1", row: "1", size_x: "2", size_y: "2" },
{ name: "B", col: "4", row: "1", size_x: "1", size_y: "2" },
{ name: "C", col: "10", row: "10", size_x: "10", size_y: "10" },
{ name: "D", col: "3", row: "1", size_x: "1", size_y: "1" },
{ name: "E", col: "2", row: "3", size_x: "3", size_y: "1" }
];
}
});
test('is chainable', 1, function() {
// Not a bad test to run on collection methods.
strictEqual(this.el, this.el.gridster(), 'should be chaninable');
});
test('is chainable', function() {
// Not a bad test to run on collection methods.
strictEqual(this.el, this.el.gridster(), 'should be chaninable');
});
test('Gridster.sort_by_row_asc', function(assert) {
var sorted = Gridster.sort_by_row_asc(this.serialization);
}(jQuery));
var result = pickup(sorted, 'name').join(',');
var expected = 'A,B,D,E,C';
assert.equal(result, expected);
});
test('Gridster.sort_by_row_and_col_asc', function(assert) {
var sorted = Gridster.sort_by_row_and_col_asc(this.serialization);
var result = pickup(sorted, 'name').join(',');
var expected = 'A,D,B,E,C';
assert.equal(result, expected);
});
test('Gridster.sort_by_col_asc', function(assert) {
var sorted = Gridster.sort_by_col_asc(this.serialization);
var result = pickup(sorted, 'name').join(',');
var expected = 'A,E,D,B,C';
assert.equal(result, expected);
});
test('Gridster.sort_by_row_desc', function(assert) {
var sorted = Gridster.sort_by_row_desc(this.serialization);
var result = pickup(sorted, 'name').join(',');
var expected = 'C,E,A,B,D';
assert.equal(result, expected);
});
// erros
test('Throws not exists property', function(assert) {
assert.throws(function() {
var data = [{row:1, size_x:1, size_y:1},{col:2,row:1,size_x:1,size_y:1}];
Gridster.sort_by_row_asc(data);
},
Error,
'raise error not exists required property'
);
});
test('Throws invalid type of value', function(assert) {
// inconvertible types
assert.throws(function() {
Gridster.sort_by_row_asc([{col:"AAA", row:1, size_x:1, size_y:1},{col:2,row:1,size_x:1,size_y:1}]);
},
Error,
'raise error inconvertible types'
);
// null
assert.throws(function() {
Gridster.sort_by_row_asc([{col:null, row:1, size_x:1, size_y:1},{col:2,row:1,size_x:1,size_y:1}]);
},
Error,
'raise error value is null'
);
// array
assert.throws(function() {
Gridster.sort_by_row_asc([{col:[1,2,3], row:1, size_x:1, size_y:1},{col:2,row:1,size_x:1,size_y:1}]);
},
Error,
'raise error value is array'
);
// object
assert.throws(function() {
Gridster.sort_by_row_asc([{col:{k:1}, row:1, size_x:1, size_y:1},{col:2,row:1,size_x:1,size_y:1}]);
},
Error,
'raise error value is object'
);
});
// helper
function pickup(data, prop) {
return data.map(function(elm) {
return elm[prop];
});
}
}(jQuery));