diff --git a/.gitignore b/.gitignore index 6d7bd3d..887fc56 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ obj/ *.pdf *.png *.gif +indexTest.html indexTest2.html GraphicEqualizer.csproj GraphicEqualizer.csproj.user diff --git a/Analyzer.js b/Analyzer.js index 7b03dfc..1331662 100644 --- a/Analyzer.js +++ b/Analyzer.js @@ -1,7 +1,7 @@ // // GraphicalFilterEditor is distributed under the FreeBSD License // -// Copyright (c) 2013, Carlos Rafael Gimenes das Neves +// Copyright (c) 2012-2014, Carlos Rafael Gimenes das Neves // All rights reserved. // // Redistribution and use in source and binary forms, with or without diff --git a/AnalyzerWL.js b/AnalyzerWL.js index bc08add..4c686b8 100644 --- a/AnalyzerWL.js +++ b/AnalyzerWL.js @@ -1,7 +1,7 @@ // // GraphicalFilterEditor is distributed under the FreeBSD License // -// Copyright (c) 2013, Carlos Rafael Gimenes das Neves +// Copyright (c) 2012-2014, Carlos Rafael Gimenes das Neves // All rights reserved. // // Redistribution and use in source and binary forms, with or without diff --git a/Common.js b/Common.js index 02753d5..bea1b6b 100644 --- a/Common.js +++ b/Common.js @@ -1,7 +1,7 @@ // // GraphicalFilterEditor is distributed under the FreeBSD License // -// Copyright (c) 2013, Carlos Rafael Gimenes das Neves +// Copyright (c) 2012-2014, Carlos Rafael Gimenes das Neves // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -46,10 +46,12 @@ function $(e) { return document.getElementById(e); } function cancelEvent(e) { - if (e.stopPropagation) - e.stopPropagation(); + if (e.isCancelled !== undefined) + e.isCancelled = true; if (e.preventDefault) e.preventDefault(); + if (e.stopPropagation) + e.stopPropagation(); return false; } function leftTop(element) { @@ -71,18 +73,9 @@ function leftTop(element) { } window.touchMouse = (_isTouch ? { _cloneEvent: function (e, cx, cy, px, py) { - var c = { button: 0, target: e.target, eventPhase: e.eventPhase, clientX: cx, clientY: cy, pageX: px, pageY: py }; - if (e.stopPropagation) c.stopPropagation = function () { return e.stopPropagation(); }; + var c = { button: 0, target: e.target, eventPhase: e.eventPhase, clientX: cx, clientY: cy, pageX: px, pageY: py, isCancelled: false }; if (e.preventDefault) c.preventDefault = function () { return e.preventDefault(); }; - if (e.cancelBubble !== undefined) c.cancelBubble = e.cancelBubble; - if (e.cancel !== undefined) c.cancel = e.cancel; - if (e.returnValue !== undefined) c.returnValue = e.returnValue; - return c; - }, - _terminateEvent: function (e, c) { - if (c.cancelBubble) e.cancelBubble = c.cancelBubble; - if (c.cancel) e.cancel = c.cancel; - if (e.returnValue !== undefined) e.returnValue = c.returnValue; + if (e.stopPropagation) c.stopPropagation = function () { return e.stopPropagation(); }; return c; }, _touchstartc: function (e) { @@ -106,7 +99,7 @@ window.touchMouse = (_isTouch ? { for (i = l.length - 1; i >= 0; i--) l[i].call(t, c); } - touchMouse._terminateEvent(e, c); + return !c.isCancelled; }, _touchmovec: function (e) { return touchMouse.touchmove(this, "_tc", e); @@ -121,7 +114,7 @@ window.touchMouse = (_isTouch ? { for (i = l.length - 1; i >= 0; i--) l[i].call(t, c); } - touchMouse._terminateEvent(e, c); + return !c.isCancelled; }, _touchendc: function (e) { return touchMouse.touchend(this, "_tc", e); @@ -142,7 +135,7 @@ window.touchMouse = (_isTouch ? { for (i = l.length - 1; i >= 0; i--) l[i].call(t, c); } - touchMouse._terminateEvent(e, c); + return !c.isCancelled; } } : undefined); window.attachMouse = (_isTouch ? function (observable, eventName, targetFunction, capturePhase) { diff --git a/FFTNR.js b/FFTNR.js index 68e4b27..f171a5c 100644 --- a/FFTNR.js +++ b/FFTNR.js @@ -1,7 +1,7 @@ // // GraphicalFilterEditor is distributed under the FreeBSD License // -// Copyright (c) 2013, Carlos Rafael Gimenes das Neves +// Copyright (c) 2012-2014, Carlos Rafael Gimenes das Neves // All rights reserved. // // Redistribution and use in source and binary forms, with or without diff --git a/GraphicalFilterEditor.js b/GraphicalFilterEditor.js index ec40ea7..89d9dc3 100644 --- a/GraphicalFilterEditor.js +++ b/GraphicalFilterEditor.js @@ -1,7 +1,7 @@ // // GraphicalFilterEditor is distributed under the FreeBSD License // -// Copyright (c) 2013, Carlos Rafael Gimenes das Neves +// Copyright (c) 2012-2014, Carlos Rafael Gimenes das Neves // All rights reserved. // // Redistribution and use in source and binary forms, with or without diff --git a/GraphicalFilterEditorControl.js b/GraphicalFilterEditorControl.js index b5e4ef0..12b1190 100644 --- a/GraphicalFilterEditorControl.js +++ b/GraphicalFilterEditorControl.js @@ -1,7 +1,7 @@ // // GraphicalFilterEditor is distributed under the FreeBSD License // -// Copyright (c) 2013, Carlos Rafael Gimenes das Neves +// Copyright (c) 2012-2014, Carlos Rafael Gimenes das Neves // All rights reserved. // // Redistribution and use in source and binary forms, with or without diff --git a/WaveExporterWorker.js b/WaveExporterWorker.js index 311d1c2..d9a26c0 100644 --- a/WaveExporterWorker.js +++ b/WaveExporterWorker.js @@ -1,7 +1,7 @@ // // GraphicalFilterEditor is distributed under the FreeBSD License // -// Copyright (c) 2013, Carlos Rafael Gimenes das Neves +// Copyright (c) 2012-2014, Carlos Rafael Gimenes das Neves // All rights reserved. // // Redistribution and use in source and binary forms, with or without diff --git a/index.html b/index.html index aa8785f..2941b32 100644 --- a/index.html +++ b/index.html @@ -1,8 +1,10 @@ - - + + Graphical Filter Editor (Test)