diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 34de318d0e..6aaab84e82 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -2030,6 +2030,7 @@ define([ me._texturearray.push({ imageUrl: item.get_image(), name : me.textureNames[item.get_id()], + tip : me.textureNames[item.get_id()], type : item.get_id(), // allowSelected : false, selected: false @@ -2065,6 +2066,7 @@ define([ restoreHeight: 174, parentMenu: menu, showLast: false, + delayRenderTips: true, store: new Common.UI.DataViewStore(me._texturearray || []), itemTemplate: _.template('
') }); diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index d905b91c53..566a34bd90 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -2945,7 +2945,7 @@ "DE.Views.ShapeSettings.txtDarkFabric": "Dark fabric", "DE.Views.ShapeSettings.txtGrain": "Grain", "DE.Views.ShapeSettings.txtGranite": "Granite", - "DE.Views.ShapeSettings.txtGreyPaper": "Gray Paper", + "DE.Views.ShapeSettings.txtGreyPaper": "Gray paper", "DE.Views.ShapeSettings.txtInFront": "In front of Text", "DE.Views.ShapeSettings.txtInline": "In line with text", "DE.Views.ShapeSettings.txtKnit": "Knit", diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index 238bdeaa7f..60eb0c5fbb 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -1893,6 +1893,7 @@ define([ me._texturearray.push({ imageUrl: item.get_image(), name : me.textureNames[item.get_id()], + tip : me.textureNames[item.get_id()], type : item.get_id(), // allowSelected : false, selected: false @@ -1928,6 +1929,7 @@ define([ restoreHeight: 174, parentMenu: menu, showLast: false, + delayRenderTips: true, store: new Common.UI.DataViewStore(me._texturearray || []), itemTemplate: _.template('') }); diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js index 591bad531a..af640fa383 100644 --- a/apps/presentationeditor/main/app/view/SlideSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSettings.js @@ -1036,6 +1036,7 @@ define([ me._texturearray.push({ imageUrl: item.get_image(), name : me.textureNames[item.get_id()], + tip : me.textureNames[item.get_id()], type : item.get_id(), // allowSelected : false, selected: false @@ -1071,6 +1072,7 @@ define([ restoreHeight: 174, parentMenu: menu, showLast: false, + delayRenderTips: true, store: new Common.UI.DataViewStore(me._texturearray || []), itemTemplate: _.template('') }); diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js index 86e5062533..5ebae663a3 100644 --- a/apps/presentationeditor/main/app/view/TextArtSettings.js +++ b/apps/presentationeditor/main/app/view/TextArtSettings.js @@ -1607,6 +1607,7 @@ define([ me._texturearray.push({ imageUrl: item.get_image(), name : me.textureNames[item.get_id()], + tip : me.textureNames[item.get_id()], type : item.get_id(), // allowSelected : false, selected: false @@ -1642,6 +1643,7 @@ define([ restoreHeight: 174, parentMenu: menu, showLast: false, + delayRenderTips: true, store: new Common.UI.DataViewStore(me._texturearray || []), itemTemplate: _.template('') }); diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index 88eee6f9a5..ac9d1a6692 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -1908,6 +1908,7 @@ define([ me._texturearray.push({ imageUrl: item.asc_getImage(), name : me.textureNames[item.asc_getId()], + tip : me.textureNames[item.asc_getId()], type : item.asc_getId(), // allowSelected : false, selected: false @@ -1943,6 +1944,7 @@ define([ restoreHeight: 174, parentMenu: menu, showLast: false, + delayRenderTips: true, store: new Common.UI.DataViewStore(me._texturearray || []), itemTemplate: _.template('') }); diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js index f560247383..112c2f8b01 100644 --- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js @@ -1601,6 +1601,7 @@ define([ me._texturearray.push({ imageUrl: item.get_image(), name : me.textureNames[item.get_id()], + tip : me.textureNames[item.get_id()], type : item.get_id(), // allowSelected : false, selected: false @@ -1636,6 +1637,7 @@ define([ restoreHeight: 174, parentMenu: menu, showLast: false, + delayRenderTips: true, store: new Common.UI.DataViewStore(me._texturearray || []), itemTemplate: _.template('') });