summaryrefslogtreecommitdiffstats
path: root/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html
diff options
context:
space:
mode:
authorPaladox none <thomasmulhall410@yahoo.com>2019-02-19 22:07:54 +0000
committerPaladox none <thomasmulhall410@yahoo.com>2019-03-05 08:53:30 +0000
commit7a2280c5dc7042a1a3e4f657d58aa3efc743e22d (patch)
tree44d62682925ffb47dff881240077143b83ef174b /polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html
parent002c7931e2265a54c3890348f9f6ee16d7f67765 (diff)
Re use gr-diff-preferences inside gr-settings-view
Bug: Issue 8678 Change-Id: Ifd950bd4226407252e86610149dd8c6ba94ab967
Diffstat (limited to 'polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html')
-rw-r--r--polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html12
1 files changed, 7 insertions, 5 deletions
diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html
index 4852cb393e..84de48f413 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html
+++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html
@@ -23,8 +23,9 @@ limitations under the License.
<link rel="import" href="../../../styles/shared-styles.html">
<link rel="import" href="../../core/gr-navigation/gr-navigation.html">
<link rel="import" href="../../core/gr-reporting/gr-reporting.html">
-<link rel="import" href="../../diff/gr-diff-host/gr-diff-host.html">
<link rel="import" href="../../diff/gr-diff-cursor/gr-diff-cursor.html">
+<link rel="import" href="../../diff/gr-diff-host/gr-diff-host.html">
+<link rel="import" href="../../diff/gr-diff-preferences-dialog/gr-diff-preferences-dialog.html">
<link rel="import" href="../../edit/gr-edit-file-controls/gr-edit-file-controls.html">
<link rel="import" href="../../shared/gr-button/gr-button.html">
<link rel="import" href="../../shared/gr-cursor-manager/gr-cursor-manager.html">
@@ -465,10 +466,11 @@ limitations under the License.
</gr-button><!--
--></gr-tooltip-content>
</div>
- <gr-diff-preferences
- id="diffPreferences"
- prefs="{{diffPrefs}}"
- local-prefs="{{_localPrefs}}"></gr-diff-preferences>
+ <gr-diff-preferences-dialog
+ id="diffPreferencesDialog"
+ diff-prefs="{{diffPrefs}}"
+ on-reload-diff-preference="_handleReloadingDiffPreference">
+ </gr-diff-preferences-dialog>
<gr-rest-api-interface id="restAPI"></gr-rest-api-interface>
<gr-storage id="storage"></gr-storage>
<gr-diff-cursor id="diffCursor"></gr-diff-cursor>