Fix QUnit.log and references to it to reflect the currently included QUnit implementation; add missing files (test1.html is still failing even after the fixes, though it was not one of the tests included with all_tests.html)

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2762 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Brett Zamir 2014-04-07 05:33:44 +00:00
parent 0c9308dd98
commit 160c7303ca
14 changed files with 34 additions and 31 deletions

View File

@ -14,9 +14,9 @@
<script> <script>
$(function() { $(function() {
// log function // log function
QUnit.log = function(result, message) { QUnit.log = function(details) {
if (window.console && window.console.log) { if (window.console && window.console.log) {
window.console.log(result +' :: '+ message); window.console.log(details.result +' :: '+ details.message);
} }
}; };

View File

@ -16,9 +16,9 @@
<script> <script>
$(function() { $(function() {
// log function // log function
QUnit.log = function(result, message) { QUnit.log = function(details) {
if (window.console && window.console.log) { if (window.console && window.console.log) {
window.console.log(result +' :: '+ message); window.console.log(details.result +' :: '+ details.message);
} }
}; };

View File

@ -13,9 +13,9 @@
<script> <script>
$(function() { $(function() {
// log function // log function
QUnit.log = function(result, message) { QUnit.log = function(details) {
if (window.console && window.console.log) { if (window.console && window.console.log) {
window.console.log(result +' :: '+ message); window.console.log(details.result +' :: '+ details.message);
} }
}; };
var NS = svgedit.NS; var NS = svgedit.NS;
@ -457,7 +457,7 @@
drawing.setLayerOpacity(LAYER3, -1.4); drawing.setLayerOpacity(LAYER3, -1.4);
ok(drawing.getLayerOpacity(LAYER1) == 0.4); ok(drawing.getLayerOpacity(LAYER1) == 0.4);
QUnit.log('layer2 opacity', drawing.getLayerOpacity(LAYER2)); QUnit.log({result: 'layer2 opacity', message: drawing.getLayerOpacity(LAYER2)});
ok(drawing.getLayerOpacity(LAYER2) == 1.0); ok(drawing.getLayerOpacity(LAYER2) == 1.0);
ok(drawing.getLayerOpacity(LAYER3) == 1.0); ok(drawing.getLayerOpacity(LAYER3) == 1.0);

View File

@ -21,9 +21,9 @@
svgedit.utilities.getRotationAngle = function(elem) { return 0; }; svgedit.utilities.getRotationAngle = function(elem) { return 0; };
// log function // log function
QUnit.log = function(result, message) { QUnit.log = function(details) {
if (window.console && window.console.log) { if (window.console && window.console.log) {
window.console.log(result +' :: '+ message); window.console.log(details.result +' :: '+ details.message);
} }
}; };

View File

@ -9,9 +9,9 @@
<script> <script>
$(function() { $(function() {
// log function // log function
QUnit.log = function(result, message) { QUnit.log = function(details) {
if (window.console && window.console.log) { if (window.console && window.console.log) {
window.console.log(result +' :: '+ message); window.console.log(details.result +' :: '+ details.message);
} }
}; };

View File

@ -11,9 +11,9 @@
<script> <script>
$(function() { $(function() {
// log function // log function
QUnit.log = function(result, message) { QUnit.log = function(details) {
if (window.console && window.console.log) { if (window.console && window.console.log) {
window.console.log(result +' :: '+ message); window.console.log(details.result +' :: '+ details.message);
} }
}; };

View File

@ -11,9 +11,9 @@
<script> <script>
$(function() { $(function() {
// log function // log function
QUnit.log = function(result, message) { QUnit.log = function(details) {
if (window.console && window.console.log) { if (window.console && window.console.log) {
window.console.log(result +' :: '+ message); window.console.log(details.result +' :: '+ details.message);
} }
}; };
}); });

View File

@ -19,9 +19,9 @@
<script> <script>
$(function() { $(function() {
// log function // log function
QUnit.log = function(result, message) { QUnit.log = function(details) {
if (window.console && window.console.log) { if (window.console && window.console.log) {
window.console.log(result +' :: '+ message); window.console.log(details.result +' :: '+ details.message);
} }
}; };

View File

@ -13,9 +13,9 @@
<script> <script>
$(function() { $(function() {
// log function // log function
QUnit.log = function(result, message) { QUnit.log = function(details) {
if (window.console && window.console.log) { if (window.console && window.console.log) {
window.console.log(result +' :: '+ message); window.console.log(details.result +' :: '+ details.message);
} }
}; };

View File

@ -14,9 +14,9 @@
<script> <script>
$(function() { $(function() {
// log function // log function
QUnit.log = function(result, message) { QUnit.log = function(details) {
if (window.console && window.console.log) { if (window.console && window.console.log) {
window.console.log(result +' :: '+ message); window.console.log(details.result +' :: '+ details.message);
} }
}; };

View File

@ -16,9 +16,9 @@
<script> <script>
$(function() { $(function() {
// log function // log function
QUnit.log = function(result, message) { QUnit.log = function(details) {
if (window.console && window.console.log) { if (window.console && window.console.log) {
window.console.log(result +' :: '+ message); window.console.log(details.result +' :: '+ details.message);
} }
}; };
var NS = svgedit.NS; var NS = svgedit.NS;

View File

@ -14,9 +14,9 @@
<script> <script>
$(function() { $(function() {
// log function // log function
QUnit.log = function(result, message) { QUnit.log = function(details) {
if (window.console && window.console.log) { if (window.console && window.console.log) {
window.console.log(result +' :: '+ message); window.console.log(details.result +' :: '+ details.message);
} }
}; };

View File

@ -7,6 +7,7 @@
<script src="../editor/jquery.js"></script> <script src="../editor/jquery.js"></script>
<script src="../editor/jquerybbq/jquery.bbq.min.js"></script> <script src="../editor/jquerybbq/jquery.bbq.min.js"></script>
<script src="../editor/jquery-ui/jquery-ui-1.8.custom.min.js"></script> <script src="../editor/jquery-ui/jquery-ui-1.8.custom.min.js"></script>
<script src="../editor/svgedit.js"></script>
<script src="../editor/svgicons/jquery.svgicons.js"></script> <script src="../editor/svgicons/jquery.svgicons.js"></script>
<script src="../editor/browser.js"></script> <script src="../editor/browser.js"></script>
<script src="../editor/svgtransformlist.js"></script> <script src="../editor/svgtransformlist.js"></script>
@ -15,6 +16,8 @@
<script src="../editor/svgutils.js"></script> <script src="../editor/svgutils.js"></script>
<script src="../editor/sanitize.js"></script> <script src="../editor/sanitize.js"></script>
<script src="../editor/history.js"></script> <script src="../editor/history.js"></script>
<script src='../editor/coords.js'></script>
<script src="../editor/recalculate.js"></script>
<script src="../editor/select.js"></script> <script src="../editor/select.js"></script>
<script src="../editor/draw.js"></script> <script src="../editor/draw.js"></script>
<script src="../editor/path.js"></script> <script src="../editor/path.js"></script>
@ -25,9 +28,9 @@
<script> <script>
$(function() { $(function() {
// log function // log function
QUnit.log = function(result, message) { QUnit.log = function(details) {
if (window.console && window.console.log) { if (window.console && window.console.log) {
window.console.log(result +' :: '+ message); window.console.log(details.result +' :: '+ details.message);
} }
}; };
@ -111,9 +114,9 @@
// TODO: see why this isn't working in SVG-edit // TODO: see why this isn't working in SVG-edit
d = convert(p2, true); d = convert(p2, true);
QUnit.log(d); QUnit.log({result: d});
d = convert(p2, false); d = convert(p2, false);
QUnit.log(d); QUnit.log({result: d});
}); });
module("Import Module"); module("Import Module");

View File

@ -11,9 +11,9 @@
<script> <script>
$(function() { $(function() {
// log function // log function
QUnit.log = function(result, message) { QUnit.log = function(details) {
if (window.console && window.console.log) { if (window.console && window.console.log) {
window.console.log(result +' :: '+ message); window.console.log(details.result +' :: '+ details.message);
} }
}; };