Skip to content

Commit 1e77234

Browse files
authored
Merge pull request #881 from radiolips/master
More housekeeping / fix tests
2 parents 436b60d + 34ac400 commit 1e77234

File tree

4 files changed

+765
-274
lines changed

4 files changed

+765
-274
lines changed

bower.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"version": "1.0.0-dev",
44
"homepage": "https://github.com/troolee/gridstack.js",
55
"authors": [
6-
"Pavel Reznikov <pashka.reznikov@gmail.com>"
6+
"Pavel Reznikov <pashka.reznikov@gmail.com>",
7+
"Dylan Weiss <dylan.weiss@gmail.com> (https://dylandreams.com)"
78
],
89
"description": "gridstack.js is a jQuery plugin for widget layout",
910
"main": [

karma.conf.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,14 @@ module.exports = function(config) {
7676

7777
// Concurrency level
7878
// how many browser should be started simultaneous
79-
concurrency: Infinity
79+
concurrency: Infinity,
80+
81+
random: false,
82+
83+
client: {
84+
jasmine: {
85+
random: false
86+
}
87+
}
8088
});
81-
}
89+
};

0 commit comments

Comments
 (0)