diff --git a/apps/common/main/lib/component/ListView.js b/apps/common/main/lib/component/ListView.js index f420b6101..67b3824ba 100644 --- a/apps/common/main/lib/component/ListView.js +++ b/apps/common/main/lib/component/ListView.js @@ -54,11 +54,12 @@ define([ showLast: true, simpleAddMode: false, keyMoveDirection: 'vertical', - itemTemplate: _.template('
<%= value %>
') + itemTemplate: _.template('
<%= value %>
'), + cls: '' }, template: _.template([ - '
' + '
' ].join('')), onResetItems : function() { diff --git a/apps/common/main/lib/view/SymbolTableDialog.js b/apps/common/main/lib/view/SymbolTableDialog.js index f95f03d1e..6032db74b 100644 --- a/apps/common/main/lib/view/SymbolTableDialog.js +++ b/apps/common/main/lib/view/SymbolTableDialog.js @@ -752,9 +752,9 @@ define([ el: $window.find('#symbol-table-special-list'), store: new Common.UI.DataViewStore(data), simpleAddMode: true, - template: _.template(['
'].join('')), + cls: 'dbl-clickable', itemTemplate: _.template([ - '
', + '
', '
<%= symbol %>
', '
<%= description %>
', '<% if (' + this.showShortcutKey + ') { %>', diff --git a/apps/common/main/resources/less/listview.less b/apps/common/main/resources/less/listview.less index 6aace8386..f14304f4b 100644 --- a/apps/common/main/resources/less/listview.less +++ b/apps/common/main/resources/less/listview.less @@ -79,6 +79,10 @@ opacity: @component-disabled-opacity; } } + + .dbl-clickable& .list-item { + pointer-events: none; + } } .no-borders > .listview .item { diff --git a/apps/documenteditor/main/app/view/BookmarksDialog.js b/apps/documenteditor/main/app/view/BookmarksDialog.js index 8bea73e6d..1e3285f81 100644 --- a/apps/documenteditor/main/app/view/BookmarksDialog.js +++ b/apps/documenteditor/main/app/view/BookmarksDialog.js @@ -174,7 +174,8 @@ define([ el: $('#bookmarks-list', this.$window), store: new Common.UI.DataViewStore(), tabindex: 1, - itemTemplate: _.template('
<%= Common.Utils.String.htmlEncode(value) %>
') + cls: 'dbl-clickable', + itemTemplate: _.template('
<%= Common.Utils.String.htmlEncode(value) %>
') }); this.bookmarksList.store.comparator = function(rec) { return (me.radioName.getValue() ? rec.get("value") : rec.get("location")); diff --git a/apps/documenteditor/main/app/view/CrossReferenceDialog.js b/apps/documenteditor/main/app/view/CrossReferenceDialog.js index e5934cf3b..d235eb341 100644 --- a/apps/documenteditor/main/app/view/CrossReferenceDialog.js +++ b/apps/documenteditor/main/app/view/CrossReferenceDialog.js @@ -183,7 +183,8 @@ define([ this.refList = new Common.UI.ListView({ el: $window.find('#id-dlg-cross-list'), store: new Common.UI.DataViewStore(), - itemTemplate: _.template('
<%= Common.Utils.String.htmlEncode(value) %>
') + cls: 'dbl-clickable', + itemTemplate: _.template('
<%= Common.Utils.String.htmlEncode(value) %>
') }); this.refList.on('entervalue', _.bind(this.onPrimary, this)) .on('item:dblclick', _.bind(this.onPrimary, this)); diff --git a/apps/documenteditor/main/app/view/DateTimeDialog.js b/apps/documenteditor/main/app/view/DateTimeDialog.js index 84c3d78d2..11f8cd997 100644 --- a/apps/documenteditor/main/app/view/DateTimeDialog.js +++ b/apps/documenteditor/main/app/view/DateTimeDialog.js @@ -124,7 +124,8 @@ define([ el: $('#datetime-dlg-format'), store: new Common.UI.DataViewStore(), tabindex: 1, - scrollAlwaysVisible: true + scrollAlwaysVisible: true, + cls: 'dbl-clickable' }); this.listFormats.on('item:select', _.bind(this.onSelectFormat, this)); diff --git a/apps/presentationeditor/main/app/view/DateTimeDialog.js b/apps/presentationeditor/main/app/view/DateTimeDialog.js index dc89df2dd..3b382bec4 100644 --- a/apps/presentationeditor/main/app/view/DateTimeDialog.js +++ b/apps/presentationeditor/main/app/view/DateTimeDialog.js @@ -124,7 +124,8 @@ define([ el: $('#datetime-dlg-format'), store: new Common.UI.DataViewStore(), scrollAlwaysVisible: true, - tabindex: 1 + tabindex: 1, + cls: 'dbl-clickable' }); this.listFormats.on('item:select', _.bind(this.onSelectFormat, this)); diff --git a/apps/spreadsheeteditor/main/app/view/FormulaDialog.js b/apps/spreadsheeteditor/main/app/view/FormulaDialog.js index 51ac8ca62..5afcffd86 100644 --- a/apps/spreadsheeteditor/main/app/view/FormulaDialog.js +++ b/apps/spreadsheeteditor/main/app/view/FormulaDialog.js @@ -271,7 +271,7 @@ define([ el: $('#formula-dlg-combo-functions'), store: this.functions, tabindex: 1, - itemTemplate: _.template('
<%= value %>
') + cls: 'dbl-clickable' }); this.cmbListFunctions.on('item:select', _.bind(this.onSelectFunction, this)); diff --git a/apps/spreadsheeteditor/main/app/view/MacroDialog.js b/apps/spreadsheeteditor/main/app/view/MacroDialog.js index 14cfa2106..8bdfea740 100644 --- a/apps/spreadsheeteditor/main/app/view/MacroDialog.js +++ b/apps/spreadsheeteditor/main/app/view/MacroDialog.js @@ -111,7 +111,8 @@ define([ el: $('#macro-dlg-list', this.$window), store: new Common.UI.DataViewStore(), tabindex: 1, - itemTemplate: _.template('
<%= value %>
') + cls: 'dbl-clickable', + itemTemplate: _.template('
<%= value %>
') }); this.macroList.on('item:dblclick', _.bind(this.onDblClickMacro, this)); this.macroList.on('entervalue', _.bind(this.onPrimary, this)); diff --git a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js index 30c353c5c..bb2cc4d32 100644 --- a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js @@ -119,7 +119,6 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template', store: new Common.UI.DataViewStore(), simpleAddMode: true, emptyText: this.textEmpty, - template: _.template(['
'].join('')), itemTemplate: _.template([ '
', '
">
', diff --git a/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js b/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js index 50fc84325..d3416634b 100644 --- a/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js @@ -90,10 +90,10 @@ define([ el: $('#named-range-paste-list', this.$window), store: new Common.UI.DataViewStore(), simpleAddMode: true, - template: _.template(['
'].join('')), + cls: 'dbl-clickable', itemTemplate: _.template([ '
', - '
', + '
', '
">
', '
<%= Common.Utils.String.htmlEncode(name) %>
', '
', diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index 3ee9d402e..9801ab48f 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -1010,7 +1010,8 @@ define([ this.listNames = new Common.UI.ListView({ el: $('#status-list-names', $window), store: new Common.UI.DataViewStore(pages), - itemTemplate: _.template('
<%= Common.Utils.String.htmlEncode(value) %>
') + cls: 'dbl-clickable', + itemTemplate: _.template('
<%= Common.Utils.String.htmlEncode(value) %>
') }); this.listNames.selectByIndex(0); diff --git a/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js b/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js index b9ba13f3f..1c163b4ca 100644 --- a/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js @@ -115,7 +115,6 @@ define([ store: new Common.UI.DataViewStore(), simpleAddMode: true, emptyText: this.textEmpty, - template: _.template(['
'].join('')), itemTemplate: _.template([ '
', '
<%= Common.Utils.String.htmlEncode(name) %>
',