Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(690)

Side by Side Diff: chrome/browser/resources/chromeos/chromevox/common/page_selection.js

Issue 924083004: Shorten Closure template notation from Array.<*> to Array<*> in cvox. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 /** 5 /**
6 * @fileoverview A class representing a DOM selection conveyed through 6 * @fileoverview A class representing a DOM selection conveyed through
7 * CursorSelection idioms. 7 * CursorSelection idioms.
8 * A PageSelection is just a DOM selection. The class itself manages a single 8 * A PageSelection is just a DOM selection. The class itself manages a single
9 * CursorSelection that surrounds a fragment on the page. It also provides an 9 * CursorSelection that surrounds a fragment on the page. It also provides an
10 * extend operation to either grow or shrink the selection given a 10 * extend operation to either grow or shrink the selection given a
(...skipping 19 matching lines...) Expand all
30 }; 30 };
31 31
32 32
33 /** 33 /**
34 * Gets a description for the DOM selection during the course of navigation. 34 * Gets a description for the DOM selection during the course of navigation.
35 * @param {cvox.AbstractShifter} navShifter Used to obtain walker-based 35 * @param {cvox.AbstractShifter} navShifter Used to obtain walker-based
36 * descriptions. 36 * descriptions.
37 * @param {!cvox.CursorSelection} prevSel Previous CursorSelection in 37 * @param {!cvox.CursorSelection} prevSel Previous CursorSelection in
38 * navigation. 38 * navigation.
39 * @param {!cvox.CursorSelection} curSel Current CursorSelection in navigation. 39 * @param {!cvox.CursorSelection} curSel Current CursorSelection in navigation.
40 * @return {Array.<cvox.NavDescription>} The new description. 40 * @return {Array<cvox.NavDescription>} The new description.
41 */ 41 */
42 cvox.PageSelection.prototype.getDescription = 42 cvox.PageSelection.prototype.getDescription =
43 function(navShifter, prevSel, curSel) { 43 function(navShifter, prevSel, curSel) {
44 var desc = []; 44 var desc = [];
45 if (this.sel_.isReversed() != curSel.isReversed()) { 45 if (this.sel_.isReversed() != curSel.isReversed()) {
46 // A shrinking selection. 46 // A shrinking selection.
47 desc = navShifter.getDescription(curSel, prevSel); 47 desc = navShifter.getDescription(curSel, prevSel);
48 desc[0].annotation = cvox.ChromeVox.msgs.getMsg('describe_unselected'); 48 desc[0].annotation = cvox.ChromeVox.msgs.getMsg('describe_unselected');
49 desc[0].pushEarcon(cvox.AbstractEarcons.SELECTION_REVERSE); 49 desc[0].pushEarcon(cvox.AbstractEarcons.SELECTION_REVERSE);
50 } else { 50 } else {
(...skipping 13 matching lines...) Expand all
64 } 64 }
65 return desc; 65 return desc;
66 }; 66 };
67 67
68 68
69 /** 69 /**
70 * Gets a full description for the entire DOM selection. 70 * Gets a full description for the entire DOM selection.
71 * Use this description when you want to describe the entire selection 71 * Use this description when you want to describe the entire selection
72 * represented by this instance. 72 * represented by this instance.
73 * 73 *
74 * @return {Array.<cvox.NavDescription>} The new description. 74 * @return {Array<cvox.NavDescription>} The new description.
75 */ 75 */
76 cvox.PageSelection.prototype.getFullDescription = function() { 76 cvox.PageSelection.prototype.getFullDescription = function() {
77 return [new cvox.NavDescription( 77 return [new cvox.NavDescription(
78 {text: window.getSelection().toString(), 78 {text: window.getSelection().toString(),
79 context: cvox.ChromeVox.msgs.getMsg('selection_is')})]; 79 context: cvox.ChromeVox.msgs.getMsg('selection_is')})];
80 }; 80 };
81 81
82 82
83 /** 83 /**
84 * Extends this selection. 84 * Extends this selection.
(...skipping 13 matching lines...) Expand all
98 // direction or towards one another. In the first case, shrink/extend this 98 // direction or towards one another. In the first case, shrink/extend this
99 // PageSelection to the end of "sel". In the second case, shrink/extend this 99 // PageSelection to the end of "sel". In the second case, shrink/extend this
100 // PageSelection to the start of "sel". 100 // PageSelection to the start of "sel".
101 this.sel_.end = this.sel_.isReversed() == sel.isReversed() ? 101 this.sel_.end = this.sel_.isReversed() == sel.isReversed() ?
102 sel.end.clone() : sel.start.clone(); 102 sel.end.clone() : sel.start.clone();
103 } 103 }
104 this.sel_.select(); 104 this.sel_.select();
105 this.wasBegin_ = false; 105 this.wasBegin_ = false;
106 return !this.sel_.absEquals(sel); 106 return !this.sel_.absEquals(sel);
107 }; 107 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698