From af87d1dbbffcd74489b838c7925a07504b0c8cda Mon Sep 17 00:00:00 2001 From: Eitan Isaacson Date: Tue, 26 Nov 2013 16:53:45 -0800 Subject: [PATCH] Bug 942991 - Updated virtual cursor navigation sounds. r=marcoz --- accessible/src/jsat/AccessFu.jsm | 7 ++++--- accessible/src/jsat/Presentation.jsm | 7 ++++++- accessible/src/jsat/jar.mn | 3 ++- .../src/jsat/sounds/virtual_cursor_key.ogg | Bin 0 -> 4224 bytes .../src/jsat/sounds/virtual_cursor_move.ogg | Bin 0 -> 5636 bytes accessible/src/jsat/tick.wav | Bin 3652 -> 0 bytes 6 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 accessible/src/jsat/sounds/virtual_cursor_key.ogg create mode 100644 accessible/src/jsat/sounds/virtual_cursor_move.ogg delete mode 100644 accessible/src/jsat/tick.wav diff --git a/accessible/src/jsat/AccessFu.jsm b/accessible/src/jsat/AccessFu.jsm index c82fe3e28fd9..3516babb9e3c 100644 --- a/accessible/src/jsat/AccessFu.jsm +++ b/accessible/src/jsat/AccessFu.jsm @@ -496,7 +496,7 @@ var Output = { }, speechHelper: { - EARCONS: ['chrome://global/content/accessibility/tick.wav'], + EARCONS: ['virtual_cursor_move.ogg', 'virtual_cursor_key.ogg'], earconBuffers: {}, @@ -509,9 +509,10 @@ var Output = { this.webspeechEnabled = !!window.speechSynthesis; for (let earcon of this.EARCONS) { - let earconName = /.*\/(.*)\..*$/.exec(earcon)[1]; + let earconName = /(^.*)\..*$/.exec(earcon)[1]; this.earconBuffers[earconName] = new WeakMap(); - this.earconBuffers[earconName].set(window, new window.Audio(earcon)); + this.earconBuffers[earconName].set( + window, new window.Audio('chrome://global/content/accessibility/' + earcon)); } this.inited = true; diff --git a/accessible/src/jsat/Presentation.jsm b/accessible/src/jsat/Presentation.jsm index f5de7901bedd..a82e32dc68b8 100644 --- a/accessible/src/jsat/Presentation.jsm +++ b/accessible/src/jsat/Presentation.jsm @@ -20,6 +20,8 @@ XPCOMUtils.defineLazyModuleGetter(this, 'UtteranceGenerator', 'resource://gre/modules/accessibility/OutputGenerator.jsm'); XPCOMUtils.defineLazyModuleGetter(this, 'BrailleGenerator', 'resource://gre/modules/accessibility/OutputGenerator.jsm'); +XPCOMUtils.defineLazyModuleGetter(this, 'Roles', + 'resource://gre/modules/accessibility/Constants.jsm'); this.EXPORTED_SYMBOLS = ['Presentation']; @@ -451,7 +453,10 @@ SpeechPresenter.prototype = { type: this.type, details: { actions: [ - {method: 'playEarcon', data: 'tick', options: {}}, + {method: 'playEarcon', + data: aContext.accessible.role === Roles.KEY ? + 'virtual_cursor_key' : 'virtual_cursor_move', + options: {}}, {method: 'speak', data: UtteranceGenerator.genForContext(aContext).output.join(' '), options: {enqueue: true}} diff --git a/accessible/src/jsat/jar.mn b/accessible/src/jsat/jar.mn index e5487fe1c177..b9397786b0f9 100644 --- a/accessible/src/jsat/jar.mn +++ b/accessible/src/jsat/jar.mn @@ -5,4 +5,5 @@ toolkit.jar: content/global/accessibility/AccessFu.css (AccessFu.css) content/global/accessibility/content-script.js (content-script.js) - content/global/accessibility/tick.wav (tick.wav) + content/global/accessibility/virtual_cursor_move.ogg (sounds/virtual_cursor_move.ogg) + content/global/accessibility/virtual_cursor_key.ogg (sounds/virtual_cursor_key.ogg) diff --git a/accessible/src/jsat/sounds/virtual_cursor_key.ogg b/accessible/src/jsat/sounds/virtual_cursor_key.ogg new file mode 100644 index 0000000000000000000000000000000000000000..b29b55b449519d7f489f4a383a13cf77c663a71d GIT binary patch literal 4224 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 TmGR!7FkYF_^lZy2>n`*^U5%F3 literal 0 HcmV?d00001 diff --git a/accessible/src/jsat/sounds/virtual_cursor_move.ogg b/accessible/src/jsat/sounds/virtual_cursor_move.ogg new file mode 100644 index 0000000000000000000000000000000000000000..da97934605c8661999d0ea78e5e4f2bb330b880d GIT binary patch literal 5636 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 CWNgF$ literal 0 HcmV?d00001 diff --git a/accessible/src/jsat/tick.wav b/accessible/src/jsat/tick.wav deleted file mode 100644 index b40a1bbd0e85afe96f869ef38ac21d5a80344e2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3652 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