From 08b0f620ab238da3922e933f78e3f107b3e847d8 Mon Sep 17 00:00:00 2001 From: marcojakob Date: Mon, 4 Nov 2013 11:54:25 +0100 Subject: [PATCH] Remove dependency on loggin_handlers --- example/html5_dnd_example.dart | 18 ++++++++++++++---- lib/src/utils.dart | 2 +- pubspec.yaml | 4 ++-- .../complex_elements_test.dart | 17 ++++++++++++++--- test/multi_lists/multi_groups_test.dart | 17 ++++++++++++++--- .../nested_dropzones_test.dart | 17 ++++++++++++++--- test/svg/svg_test.dart | 17 ++++++++++++++--- 7 files changed, 73 insertions(+), 19 deletions(-) diff --git a/example/html5_dnd_example.dart b/example/html5_dnd_example.dart index 4f773f8..6d19769 100644 --- a/example/html5_dnd_example.dart +++ b/example/html5_dnd_example.dart @@ -2,15 +2,13 @@ library html5_dnd_example; import 'dart:html'; -import 'dart:async'; -import 'package:logging_handlers/logging_handlers_shared.dart'; +import 'package:intl/intl.dart'; import 'package:logging/logging.dart'; import 'package:html5_dnd/html5_dnd.dart'; main() { // Uncomment to enable logging. -// Logger.root.onRecord.listen(new PrintHandler().call); -// Logger.root.level = Level.FINEST; + initLogging(); // Install Drag and Drop examples. sectionDraggableAndDropzone(); @@ -30,6 +28,18 @@ main() { // _installCodeblockTabs(); } +initLogging() { + DateFormat dateFormat = new DateFormat('yyyy.mm.dd HH:mm:ss.SSS'); + + // Print output to console. + Logger.root.onRecord.listen((LogRecord r) { + print('${dateFormat.format(r.time)}\t${r.loggerName}\t[${r.level.name}]:\t${r.message}'); + }); + + // Root logger level. + Logger.root.level = Level.FINEST; +} + sectionDraggableAndDropzone() { // Install draggables (documents). diff --git a/lib/src/utils.dart b/lib/src/utils.dart index a7c5248..0375fa5 100644 --- a/lib/src/utils.dart +++ b/lib/src/utils.dart @@ -69,7 +69,7 @@ bool _svgContains(svg.SvgElement node, Node otherNode) { * Get the offset of [element] relative to the document. */ Point pageOffset(Element element) { - Rect rect = element.getBoundingClientRect(); + Rectangle rect = element.getBoundingClientRect(); return new Point( rect.left + window.pageXOffset - document.documentElement.client.left, rect.top + window.pageYOffset - document.documentElement.client.top); diff --git a/pubspec.yaml b/pubspec.yaml index dedf402..ca0266f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: html5_dnd -version: 0.3.4 +version: 0.3.4+1 author: Marco Jakob description: HTML5 Drag and Drop homepage: https://github.com/marcojakob/dart-html5-dnd @@ -8,4 +8,4 @@ dependencies: logging: '>=0.7.6' dev_dependencies: browser: '>=0.7.6' - logging_handlers: '>=0.5.0' + intl: any diff --git a/test/complex_elements/complex_elements_test.dart b/test/complex_elements/complex_elements_test.dart index 7fa2187..5f48fe9 100644 --- a/test/complex_elements/complex_elements_test.dart +++ b/test/complex_elements/complex_elements_test.dart @@ -5,19 +5,30 @@ library complex_elements_test; import 'dart:html'; -import 'package:logging_handlers/logging_handlers_shared.dart'; +import 'package:intl/intl.dart'; import 'package:logging/logging.dart'; import 'package:html5_dnd/html5_dnd.dart'; final _logger = new Logger("complex_elements_test"); main() { - Logger.root.onRecord.listen(new PrintHandler().call); - Logger.root.level = Level.FINEST; + initLogging(); installDragAndDrop(); } +initLogging() { + DateFormat dateFormat = new DateFormat('yyyy.mm.dd HH:mm:ss.SSS'); + + // Print output to console. + Logger.root.onRecord.listen((LogRecord r) { + print('${dateFormat.format(r.time)}\t${r.loggerName}\t[${r.level.name}]:\t${r.message}'); + }); + + // Root logger level. + Logger.root.level = Level.FINEST; +} + void installDragAndDrop() { SortableGroup sortGroup = new SortableGroup() ..installAll(queryAll('.group')) diff --git a/test/multi_lists/multi_groups_test.dart b/test/multi_lists/multi_groups_test.dart index 1680169..4a1d338 100644 --- a/test/multi_lists/multi_groups_test.dart +++ b/test/multi_lists/multi_groups_test.dart @@ -2,19 +2,30 @@ library multi_groups_test; import 'dart:html'; -import 'package:logging_handlers/logging_handlers_shared.dart'; +import 'package:intl/intl.dart'; import 'package:logging/logging.dart'; import 'package:html5_dnd/html5_dnd.dart'; final _logger = new Logger("multi_groups_test"); main() { - Logger.root.onRecord.listen(new PrintHandler().call); - Logger.root.level = Level.FINEST; + initLogging(); installDragAndDrop(); } +initLogging() { + DateFormat dateFormat = new DateFormat('yyyy.mm.dd HH:mm:ss.SSS'); + + // Print output to console. + Logger.root.onRecord.listen((LogRecord r) { + print('${dateFormat.format(r.time)}\t${r.loggerName}\t[${r.level.name}]:\t${r.message}'); + }); + + // Root logger level. + Logger.root.level = Level.FINEST; +} + void installDragAndDrop() { SortableGroup groupA = new SortableGroup() ..installAll(queryAll('#group-a-sort li')) diff --git a/test/nested_dropzones/nested_dropzones_test.dart b/test/nested_dropzones/nested_dropzones_test.dart index f10e4cf..b8ead24 100644 --- a/test/nested_dropzones/nested_dropzones_test.dart +++ b/test/nested_dropzones/nested_dropzones_test.dart @@ -5,19 +5,30 @@ library nested_dropzones_test; import 'dart:html'; -import 'package:logging_handlers/logging_handlers_shared.dart'; +import 'package:intl/intl.dart'; import 'package:logging/logging.dart'; import 'package:html5_dnd/html5_dnd.dart'; final _logger = new Logger("nested_dropzones_test"); main() { - Logger.root.onRecord.listen(new PrintHandler().call); - Logger.root.level = Level.FINEST; + initLogging(); installDragAndDrop(); } +initLogging() { + DateFormat dateFormat = new DateFormat('yyyy.mm.dd HH:mm:ss.SSS'); + + // Print output to console. + Logger.root.onRecord.listen((LogRecord r) { + print('${dateFormat.format(r.time)}\t${r.loggerName}\t[${r.level.name}]:\t${r.message}'); + }); + + // Root logger level. + Logger.root.level = Level.FINEST; +} + void installDragAndDrop() { // Install draggables. DraggableGroup dragGroup1 = new DraggableGroup() diff --git a/test/svg/svg_test.dart b/test/svg/svg_test.dart index e74b280..780e358 100644 --- a/test/svg/svg_test.dart +++ b/test/svg/svg_test.dart @@ -5,20 +5,31 @@ library svt_test; import 'dart:html'; -import 'package:logging_handlers/logging_handlers_shared.dart'; +import 'package:intl/intl.dart'; import 'package:logging/logging.dart'; import 'package:html5_dnd/html5_dnd.dart'; final _logger = new Logger("complex_elements_test"); main() { - Logger.root.onRecord.listen(new PrintHandler().call); - Logger.root.level = Level.FINEST; + initLogging(); installSvg(); installSvgWithin(); } +initLogging() { + DateFormat dateFormat = new DateFormat('yyyy.mm.dd HH:mm:ss.SSS'); + + // Print output to console. + Logger.root.onRecord.listen((LogRecord r) { + print('${dateFormat.format(r.time)}\t${r.loggerName}\t[${r.level.name}]:\t${r.message}'); + }); + + // Root logger level. + Logger.root.level = Level.FINEST; +} + void installSvg() { var svgDragGroup = new DraggableGroup() ..install(query('#draggable-svg'));