Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 cr.define('options', function() { | 5 cr.define('options', function() { |
| 6 /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel; | 6 /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel; |
| 7 /** @const */ var DeletableItem = options.DeletableItem; | 7 /** @const */ var DeletableItem = options.DeletableItem; |
| 8 /** @const */ var DeletableItemList = options.DeletableItemList; | 8 /** @const */ var DeletableItemList = options.DeletableItemList; |
| 9 /** @const */ var List = cr.ui.List; | 9 /** @const */ var List = cr.ui.List; |
| 10 /** @const */ var ListItem = cr.ui.ListItem; | 10 /** @const */ var ListItem = cr.ui.ListItem; |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 381 languageCodesInCsv.split(',')); | 381 languageCodesInCsv.split(',')); |
| 382 this.load_(languageCodes); | 382 this.load_(languageCodes); |
| 383 }, | 383 }, |
| 384 | 384 |
| 385 /** | 385 /** |
| 386 * Loads given language list. | 386 * Loads given language list. |
| 387 * @param {!Array} languageCodes List of language codes. | 387 * @param {!Array} languageCodes List of language codes. |
| 388 * @private | 388 * @private |
| 389 */ | 389 */ |
| 390 load_: function(languageCodes) { | 390 load_: function(languageCodes) { |
| 391 if (!this.selectionModel) | |
|
Kevin Bailey
2016/01/26 15:00:40
Sorry, it was unclear to me what you preferred. So
Dan Beam
2016/01/26 19:38:53
I would prefer load_ only get called after being d
Kevin Bailey
2016/01/26 22:21:46
Done.
| |
| 392 return; | |
| 391 // Preserve the original selected index. See comments below. | 393 // Preserve the original selected index. See comments below. |
| 392 var originalSelectedIndex = (this.selectionModel ? | 394 var originalSelectedIndex = this.selectionModel.selectedIndex; |
| 393 this.selectionModel.selectedIndex : -1); | |
| 394 this.dataModel = new ArrayDataModel(languageCodes); | 395 this.dataModel = new ArrayDataModel(languageCodes); |
|
Dan Beam
2016/01/26 19:38:53
doing
this.dataModel = ...;
triggers an ES5 se
| |
| 395 if (originalSelectedIndex >= 0 && | 396 if (originalSelectedIndex >= 0 && |
| 396 originalSelectedIndex < this.dataModel.length) { | 397 originalSelectedIndex < this.dataModel.length) { |
| 397 // Restore the original selected index if the selected index is | 398 // Restore the original selected index if the selected index is |
| 398 // valid after the data model is loaded. This is neeeded to keep | 399 // valid after the data model is loaded. This is needed to keep |
| 399 // the selected language after the languge is added or removed. | 400 // the selected language after the languge is added or removed. |
| 400 this.selectionModel.selectedIndex = originalSelectedIndex; | 401 this.selectionModel.selectedIndex = originalSelectedIndex; |
| 401 // The lead index should be updated too. | 402 // The lead index should be updated too. |
| 402 this.selectionModel.leadIndex = originalSelectedIndex; | 403 this.selectionModel.leadIndex = originalSelectedIndex; |
| 403 } else if (this.dataModel.length > 0) { | |
| 404 // Otherwise, select the first item if it's not empty. | |
| 405 // Note that ListSingleSelectionModel won't select an item | |
| 406 // automatically, hence we manually select the first item here. | |
| 407 this.selectionModel.selectedIndex = 0; | |
|
Dan Beam
2016/01/26 19:38:53
revert this now
| |
| 408 } | 404 } |
| 409 }, | 405 }, |
| 410 | 406 |
| 411 /** | 407 /** |
| 412 * Saves the preference. | 408 * Saves the preference. |
| 413 */ | 409 */ |
| 414 savePreference_: function() { | 410 savePreference_: function() { |
| 415 chrome.send('updateLanguageList', [this.dataModel.slice()]); | 411 chrome.send('updateLanguageList', [this.dataModel.slice()]); |
| 416 cr.dispatchSimpleEvent(this, 'save'); | 412 cr.dispatchSimpleEvent(this, 'save'); |
| 417 }, | 413 }, |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 436 } | 432 } |
| 437 return filteredLanguageCodes; | 433 return filteredLanguageCodes; |
| 438 }, | 434 }, |
| 439 }; | 435 }; |
| 440 | 436 |
| 441 return { | 437 return { |
| 442 LanguageList: LanguageList, | 438 LanguageList: LanguageList, |
| 443 LanguageListItem: LanguageListItem | 439 LanguageListItem: LanguageListItem |
| 444 }; | 440 }; |
| 445 }); | 441 }); |
| OLD | NEW |