Rename the 'or' function in the chromevox next output language to 'if'.

chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview Provides output services for ChromeVox.
  */
 
 goog.provide('Output');
 goog.provide('Output.EventType');
@@ skipping 76 matching lines @@
       braille: ''
     },
     alert: {
       speak: '!doNotInterrupt ' +
           '@aria_role_alert $name $earcon(ALERT_NONMODAL) $descendants'
     },
     button: {
       speak: '$name $earcon(BUTTON, @tag_button)'
     },
     checkBox: {
-      speak: '$or($checked, @describe_checkbox_checked($name), ' +
+      speak: '$if($checked, @describe_checkbox_checked($name), ' +
           '@describe_checkbox_unchecked($name)) ' +
-          '$or($checked, ' +
+          '$if($checked, ' +
               '$earcon(CHECK_ON, @input_type_checkbox), ' +
               '$earcon(CHECK_OFF, @input_type_checkbox))'
     },
     dialog: {
       enter: '$name $role'
     },
     heading: {
       enter: '@aria_role_heading',
       speak: '@aria_role_heading $name='
     },
     inlineTextBox: {
       speak: '$value='
     },
     link: {
       enter: '$name= $visited $earcon(LINK, @tag_link)=',
       stay: '$name= $visited @tag_link',
       speak: '$name= $visited $earcon(LINK, @tag_link)='
     },
     list: {
       enter: '$role'
     },
     listItem: {
       enter: '$role'
     },
     menuItem: {
-      speak: '$or($haspopup, @describe_menu_item_with_submenu($name), ' +
+      speak: '$if($haspopup, @describe_menu_item_with_submenu($name), ' +
           '@describe_menu_item($name)) ' +
           '@describe_index($indexInParent, $parentChildCount)'
     },
     menuListOption: {
       speak: '$name $value @aria_role_menuitem ' +
           '@describe_index($indexInParent, $parentChildCount)'
     },
     paragraph: {
       speak: '$value'
     },
     popUpButton: {
       speak: '$value $name @tag_button @aria_has_popup $earcon(LISTBOX) ' +
-          '$or($collapsed, @aria_expanded_false, @aria_expanded_true)'
+          '$if($collapsed, @aria_expanded_false, @aria_expanded_true)'
     },
     radioButton: {
-      speak: '$or($checked, @describe_radio_selected($name), ' +
+      speak: '$if($checked, @describe_radio_selected($name), ' +
           '@describe_radio_unselected($name)) ' +
-          '$or($checked, ' +
+          '$if($checked, ' +
               '$earcon(CHECK_ON, @input_type_radio), ' +
               '$earcon(CHECK_OFF, @input_type_radio))'
     },
     slider: {
       speak: '@describe_slider($value, $name)'
     },
     staticText: {
       speak: '$value'
     },
     textBox: {
@@ skipping 348 matching lines @@
           var subrange = new cursors.Range(
               new cursors.Cursor(leftmost, 0),
               new cursors.Cursor(rightmost, 0));
           this.range_(subrange, null, 'navigate', buff);
         } else if (node.attributes[token]) {
           this.addToSpannable_(buff, node.attributes[token], options);
         } else if (node.state[token]) {
           this.addToSpannable_(buff, token, options);
         } else if (tree.firstChild) {
           // Custom functions.
-          if (token == 'or') {
+          if (token == 'if') {
             var cond = tree.firstChild;
             var attrib = cond.value.slice(1);
             if (node.attributes[attrib] || node.state[attrib])
               this.format_(node, cond.nextSibling, buff);
             else
               this.format_(node, cond.nextSibling.nextSibling, buff);
           } else if (token == 'earcon') {
             var contentBuff = new cvox.Spannable();
             if (tree.firstChild.nextSibling)
               this.format_(node, tree.firstChild.nextSibling, contentBuff);
@@ skipping 231 matching lines @@
     }
 
     if (currentNode != root)
       throw 'Unbalanced parenthesis.';
 
     return root;
   }
 };
 
 });  // goog.scope