| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 507 */ | 507 */ |
| 508 _convertIntoScreenSpace: function(event) | 508 _convertIntoScreenSpace: function(event) |
| 509 { | 509 { |
| 510 var position = this._zoomIntoScreenSpace(event); | 510 var position = this._zoomIntoScreenSpace(event); |
| 511 position.y = Math.round(position.y - this._screenOffsetTop); | 511 position.y = Math.round(position.y - this._screenOffsetTop); |
| 512 return position; | 512 return position; |
| 513 }, | 513 }, |
| 514 | 514 |
| 515 /** | 515 /** |
| 516 * @param {!Event} event | 516 * @param {!Event} event |
| 517 * @return number | 517 * @return {number} |
| 518 */ | 518 */ |
| 519 _modifiersForEvent: function(event) | 519 _modifiersForEvent: function(event) |
| 520 { | 520 { |
| 521 var modifiers = 0; | 521 var modifiers = 0; |
| 522 if (event.altKey) | 522 if (event.altKey) |
| 523 modifiers = 1; | 523 modifiers = 1; |
| 524 if (event.ctrlKey) | 524 if (event.ctrlKey) |
| 525 modifiers += 2; | 525 modifiers += 2; |
| 526 if (event.metaKey) | 526 if (event.metaKey) |
| 527 modifiers += 4; | 527 modifiers += 4; |
| (...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1014 return; | 1014 return; |
| 1015 this._maxDisplayedProgress = progress; | 1015 this._maxDisplayedProgress = progress; |
| 1016 this._displayProgress(progress); | 1016 this._displayProgress(progress); |
| 1017 }, | 1017 }, |
| 1018 | 1018 |
| 1019 _displayProgress: function(progress) | 1019 _displayProgress: function(progress) |
| 1020 { | 1020 { |
| 1021 this._element.style.width = (100 * progress) + "%"; | 1021 this._element.style.width = (100 * progress) + "%"; |
| 1022 } | 1022 } |
| 1023 }; | 1023 }; |
| OLD | NEW |