You no longer need to call annyang.init() manually (but you can). You…

… can now simply start() and addCommands() as often as you like, and let annyang worry about initialization. Bumped version to 1.1.0 - Fully backwards compatible with 1.0.0

README.md

@@ -11,18 +11,18 @@ Demo
 
 Usage
 -----
-It's as easy as adding [one javascript file](//cdnjs.cloudflare.com/ajax/libs/annyang/1.0.0/annyang.min.js) to your document, and defining the commands you want.
+It's as easy as adding [one javascript file](//cdnjs.cloudflare.com/ajax/libs/annyang/1.1.0/annyang.min.js) to your document, and defining the commands you want.
 ````html
-<script src="//cdnjs.cloudflare.com/ajax/libs/annyang/1.0.0/annyang.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/annyang/1.1.0/annyang.min.js"></script>
 <script>
 if (annyang) {
  // Let's define a command.
  var commands = {
  'show tps report': function() { $('#tpsreport').show(); }
  };
 
- // Initialize annyang with our commands
- annyang.init(commands);
+ // Add our commands to annyang
+ annyang.addCommands(commands);
 
  // Start listening.
  annyang.start();

annyang.js

@@ -1,5 +1,5 @@
 //! annyang
-//! version : 1.0.0
+//! version : 1.1.0
 //! author : Tal Ater @TalAter
 //! license : MIT
 //! https://www.TalAter.com/annyang/
@@ -23,9 +23,8 @@
  return undefined;
  }
 
- var commandsList;
+ var commandsList = [];
  var recognition;
- var lang = 'en-US';
  var callbacks = { start: [], error: [], end: [], result: [], resultMatch: [], resultNoMatch: [], errorNetwork: [], errorPermissionBlocked: [], errorPermissionDenied: [] };
  var autoRestart;
  var lastStartedAt = 0;
@@ -56,11 +55,24 @@
  });
  };
 
+ var initIfNeeded = function() {
+ if (recognition === undefined) {
+ root.annyang.init({}, false);
+ }
+ };
+
  root.annyang = {
  // Initialize annyang with a list of commands to recognize.
  // e.g. annyang.init({'hello :name': helloFunction})
  // annyang understands commands with named variables, splats, and optional words.
- init: function(commands) {
+ init: function(commands, resetCommands) {
+
+ // resetCommands defaults to true
+ if (resetCommands === undefined) {
+ resetCommands = true;
+ } else {
+ resetCommands = !!resetCommands;
+ }
 
  // Abort previous instances of recognition already running
  if (recognition && recognition.abort) {
@@ -74,7 +86,7 @@
  recognition.maxAlternatives = 5;
  recognition.continuous = true;
  // Sets the language to the default 'en-US'. This can be changed with annyang.setLanguage()
- recognition.lang = lang;
+ recognition.lang = 'en-US';
 
  recognition.onstart = function() { invokeCallbacks(callbacks.start); };
 
@@ -147,15 +159,20 @@
  };
 
  // build commands list
- commandsList = [];
- this.addCommands(commands);
+ if (resetCommands) {
+ commandsList = [];
+ }
+ if (commands.length) {
+ this.addCommands(commands);
+ }
  },
 
  // Start listening (asking for permission first, if needed).
  // Call this after you've initialized annyang with commands.
  // Receives an optional options object:
  // { autoRestart: true }
  start: function(options) {
+ initIfNeeded();
  options = options || {};
  if (options.autoRestart !== undefined) {
  autoRestart = !!options.autoRestart;
@@ -168,6 +185,7 @@
 
  // abort the listening session (aka stop)
  abort: function() {
+ initIfNeeded();
  autoRestart = false;
  recognition.abort();
  },
@@ -184,16 +202,17 @@
  // Set the language the user will speak in. If not called, defaults to 'en-US'.
  // e.g. 'fr-FR' (French-France), 'es-CR' (Español-Costa Rica)
  setLanguage: function(language) {
- lang = language;
- if (recognition && recognition.abort) {
- recognition.lang = language;
- }
+ initIfNeeded();
+ recognition.lang = language;
  },
 
  // Add additional commands that annyang will respond to. Similar in syntax to annyang.init()
  addCommands: function(commands) {
  var cb,
  command;
+
+ initIfNeeded();
+
  for (var phrase in commands) {
  if (commands.hasOwnProperty(phrase)) {
  cb = root[commands[phrase]] || commands[phrase];

bower.json

@@ -1,6 +1,6 @@
 {
  "name": "annyang",
- "version": "1.0.0",
+ "version": "1.1.0",
  "description": "A javascript library for adding voice commands to your site, using speech recognition",
  "main": "annyang.js",
  "keywords": [

demo/index.html

@@ -8,7 +8,7 @@
  <meta property="og:title" content="annyang! Easily add speech recognition to your site"/>
  <meta property="og:url" content="https://www.talater.com/annyang/"/>
  <meta property="og:site_name" content="annyang"/>
- <script src="//cdnjs.cloudflare.com/ajax/libs/annyang/1.0.0/annyang.min.js"></script>
+ <script src="//cdnjs.cloudflare.com/ajax/libs/annyang/1.1.0/annyang.min.js"></script>
  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
  <script>
  "use strict";
@@ -74,8 +74,8 @@
  // OPTIONAL: activate debug mode for detailed logging in the console
  annyang.debug();
 
- // Initialize annyang
- annyang.init(commands);
+ // Add voice commands to respond to
+ annyang.addCommands(commands);
 
  // OPTIONAL: Set a language for speech recognition (defaults to English)
  annyang.setLanguage('en');
@@ -126,7 +126,7 @@ <h2>annyang supports multiple languages, has no dependencies, weighs just 2kb an
  <section id="section_code_sample_1">
  <p><em>How did you do that?</em></p>
  <p>Simple. Here is all the code needed to achieve that:</p>
- <pre><code>&lt;script src="<a href="//cdnjs.cloudflare.com/ajax/libs/annyang/1.0.0/annyang.min.js">//cdnjs.cloudflare.com/ajax/libs/annyang/1.0.0/annyang.min.js</a>"&gt;&lt;/script&gt;
+ <pre><code>&lt;script src="<a href="//cdnjs.cloudflare.com/ajax/libs/annyang/1.1.0/annyang.min.js">//cdnjs.cloudflare.com/ajax/libs/annyang/1.1.0/annyang.min.js</a>"&gt;&lt;/script&gt;
 &lt;script&gt;
 if (annyang) {
  // Let's define our first command. First the text we expect, and then the function it should call
@@ -136,8 +136,8 @@ <h2>annyang supports multiple languages, has no dependencies, weighs just 2kb an
  }
  };
 
- // Initialize annyang with our commands
- annyang.init(commands);
+ // Add our commands to annyang
+ annyang.addCommands(commands);
 
  // Start listening. You can call this here, or attach this call to an event, button, etc.
  annyang.start();

package.json

@@ -1,6 +1,6 @@
 {
  "name": "annyang",
- "version": "1.0.0",
+ "version": "1.1.0",
  "description": "A javascript library for adding voice commands to your site, using speech recognition",
  "homepage": "https://www.talater.com/annyang/",
  "main": "annyang.js",

sites/facebook.js

@@ -82,7 +82,7 @@
  }
  };
 
- annyang.init({
+ annyang.addCommands({
  'back': goBack,
  'go back': goBack,
  'go home': stream,

sites/geektime.js

@@ -70,7 +70,7 @@
  return false;
  };
 
- annyang.init({
+ annyang.addCommands({
  '(דף) (ה)בית': gotoHome,
  '(דף) הבא': nextPage,
  '(דף) (ה)קודם': prevPage,