Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 4 <link rel="import" href="chrome://md-settings/people_page/change_picture_private _api.html"> | 4 <link rel="import" href="chrome://md-settings/people_page/change_picture_private _api.html"> |
| 5 | 5 |
| 6 <dom-module id="settings-change-picture"> | 6 <dom-module id="settings-change-picture"> |
| 7 <link rel="import" type="css" | 7 <link rel="import" type="css" |
| 8 href="chrome://md-settings/settings_shared.css"> | 8 href="chrome://md-settings/settings_shared.css"> |
| 9 <link rel="import" type="css" href="change_picture.css"> | 9 <link rel="import" type="css" href="change_picture.css"> |
| 10 <template> | 10 <template> |
| 11 <div class="settings-box"> | 11 <div class="settings-box"> |
| 12 <div class="split"> | 12 <div class="split"> |
| 13 <div id="availableIcons"> | 13 <div id="available-icons" class="start"> |
| 14 <paper-button id="camera-image" toggles active="[[cameraActive_]]" | |
| 15 on-tap="onCameraImageTap_"> | |
| 16 <img class="user-image" src="[[cameraImageUrl_]]" | |
| 17 alt="[[cameraImageTitle_]]"> | |
| 18 </paper-button> | |
| 14 <paper-button id="profile-image" toggles | 19 <paper-button id="profile-image" toggles |
| 15 active="{{isActiveImage_(profileImageUrl_, selectedImageUrl_)}}" | 20 active="{{isActiveImage_(cameraActive_, profileImageUrl_, selected ImageUrl_)}}" |
|
dpapad
2016/01/21 18:55:47
Nit: cameraActive_ is passed in all calls to isAct
tommycli
2016/01/21 19:08:03
Following Polymer #3 on style guide here: https://
| |
| 16 on-tap="onProfileImageTap_"> | 21 on-tap="onProfileImageTap_"> |
| 17 <img class="user-image" src="[[profileImageUrl_]]" | 22 <img class="user-image" src="[[profileImageUrl_]]" |
| 18 alt="[[i18n('profilePhotoLoading')]]"> | 23 alt="[[i18n('profilePhotoLoading')]]"> |
| 19 </paper-button> | 24 </paper-button> |
| 20 <template is="dom-if" if="[[oldImageUrl_]]"> | 25 <template is="dom-if" if="[[oldImageUrl_]]"> |
| 21 <paper-button id="old-image" toggles | 26 <paper-button id="old-image" toggles |
| 22 active="{{isActiveImage_(oldImageUrl_, selectedImageUrl_)}}" | 27 active="{{isActiveImage_(cameraActive_, oldImageUrl_, selectedIm ageUrl_)}}" |
| 23 on-tap="onOldImageTap_"> | 28 on-tap="onOldImageTap_"> |
| 24 <img class="user-image" src="[[oldImageUrl_]]"> | 29 <img class="user-image" src="[[oldImageUrl_]]"> |
| 25 </paper-button> | 30 </paper-button> |
| 26 </template> | 31 </template> |
| 27 <template is="dom-repeat" items="[[defaultImages_]]"> | 32 <template is="dom-repeat" items="[[defaultImages_]]"> |
| 28 <paper-button class="default-image" toggles | 33 <paper-button class="default-image" toggles |
| 29 active="{{isActiveImage_(item.url, selectedImageUrl_)}}" | 34 active="{{isActiveImage_(cameraActive_, item.url, selectedImageU rl_)}}" |
| 30 on-tap="onDefaultImageTap_" data-image-url$="[[item.url]]"> | 35 on-tap="onDefaultImageTap_" data-image-url$="[[item.url]]"> |
| 31 <img class="user-image" src="[[item.url]]" alt="[[item.title]]"> | 36 <img class="user-image" src="[[item.url]]" alt="[[item.title]]"> |
| 32 </paper-button> | 37 </paper-button> |
| 33 </template> | 38 </template> |
| 34 </div> | 39 </div> |
| 40 <div id="preview-pane"> | |
| 41 <img id="previewImage" src="[[selectedImageUrl_]]" | |
|
dpapad
2016/01/21 18:55:47
Nit: s/previewImage/preview-image
tommycli
2016/01/21 19:08:03
Since we use foo.$.previewImage in the test, we ma
| |
| 42 hidden="[[cameraActive_]]"> | |
| 43 </div> | |
| 35 </div> | 44 </div> |
| 36 </div> | 45 </div> |
| 37 </template> | 46 </template> |
| 38 <script src="change_picture.js"></script> | 47 <script src="change_picture.js"></script> |
| 39 </dom-module> | 48 </dom-module> |
| OLD | NEW |