Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-01-29 06:27:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update qunit to 2.0.0.

Browse Source
This commit is contained in:
John-David Dalton
2016-06-17 21:34:54 -07:00
parent 6c673cd19b
commit c8ff2b4612
5 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -44,8 +44,8 @@
"lodash": "4.11.2", "lodash": "4.11.2",
"markdown-doctest": "^0.8.0", "markdown-doctest": "^0.8.0",
"platform": "^1.3.1", "platform": "^1.3.1",
"qunit-extras": "^2.0.0", "qunit-extras": "^2.0.1",
"qunitjs": "~1.23.1", "qunitjs": "^2.0.0",
"request": "^2.69.0", "request": "^2.69.0",
"requirejs": "^2.2.0", "requirejs": "^2.2.0",
"sauce-tunnel": "^2.5.0", "sauce-tunnel": "^2.5.0",

15
perf/index.html
View File

@@ -10,16 +10,27 @@
height: 100%; height: 100%;
} }
#FirebugUI { #FirebugUI {
top: 2em; top: 2.5em;
} }
#perf-toolbar { #perf-toolbar {
background-color: #EEE; background-color: #EEE;
color: #5E740B; color: #5E740B;
font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif; font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
font-size: small; font-size: small;
padding: 0.5em 0 0.5em 2em; padding: 0.5em 1em 0.5em 1em;
overflow: hidden; overflow: hidden;
} }
#perf-toolbar label {
display: inline-block;
margin-right: 0.5em;
}
#perf-toolbar span {
display: inline-block;
float: right;
line-height: 2.1em;
margin-left: 1em;
margin-top: 0;
}
</style> </style>
</head> </head>
<body> <body>

12
test/asset/test-ui.js
View File

@@ -59,8 +59,8 @@
setTimeout(init, 15); setTimeout(init, 15);
return; return;
} }
toolbar.appendChild(span1); toolbar.insertBefore(span2, toolbar.lastChild);
toolbar.appendChild(span2); toolbar.insertBefore(span1, span2);
buildList.selectedIndex = (function() { buildList.selectedIndex = (function() {
switch (build) { switch (build) {
@@ -89,7 +89,6 @@
} }
var span1 = document.createElement('span'); var span1 = document.createElement('span');
span1.style.cssText = 'float:right';
span1.innerHTML = span1.innerHTML =
'<label for="qunit-build">Build: </label>' + '<label for="qunit-build">Build: </label>' +
'<select id="qunit-build">' + '<select id="qunit-build">' +
@@ -100,7 +99,6 @@
'</select>'; '</select>';
var span2 = document.createElement('span'); var span2 = document.createElement('span');
span2.style.cssText = 'float:right';
span2.innerHTML = span2.innerHTML =
'<label for="qunit-loader">Loader: </label>' + '<label for="qunit-loader">Loader: </label>' +
'<select id="qunit-loader">' + '<select id="qunit-loader">' +
@@ -110,6 +108,12 @@
'<option value="requirejs">RequireJS</option>' + '<option value="requirejs">RequireJS</option>' +
'</select>'; '</select>';
span1.style.cssText =
span2.style.cssText = 'display:inline-block;float:right;line-height:2.1em;margin-left:1em;margin-top:0;';
span1.firstChild.style.cssText =
span2.firstChild.style.cssText = 'display:inline-block;margin-right:.5em;';
var buildList = span1.lastChild, var buildList = span1.lastChild,
loaderList = span2.lastChild; loaderList = span2.lastChild;

1
test/test-fp.js
View File

@@ -2268,5 +2268,6 @@
if (!document) { if (!document) {
QUnit.config.noglobals = true; QUnit.config.noglobals = true;
QUnit.load(); QUnit.load();
QUnit.start();
} }
}.call(this)); }.call(this));

1
test/test.js
View File

@@ -26785,5 +26785,6 @@
if (!document) { if (!document) {
QUnit.config.noglobals = true; QUnit.config.noglobals = true;
QUnit.load(); QUnit.load();
QUnit.start();
} }
}.call(this)); }.call(this));