mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

MDL-56784 theme_boost: Fix escaped markup in filemanager_fileselect

Browse Source 
The markup in the filemanager_fileselect template was being escaped,
causing a help icon not to display.

Additionally, the popover for the help icon was not display since
"loader.js" was not properly delegating the popover calls.
This commit is contained in:
Cameron Ball 2016-11-16 09:47:13 +08:00
parent b4d6669dd0
commit 8712a50ec2
No known key found for this signature in database
GPG Key ID: 305B7F70214D810C
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
theme/boost/amd/build/loader.min.js vendored
View File

@ -1 +1 @@
define(["jquery","./tether"],function(a,b){return window.jQuery=a,window.Tether=b,require(["theme_boost/util","theme_boost/alert","theme_boost/button","theme_boost/carousel","theme_boost/collapse","theme_boost/dropdown","theme_boost/modal","theme_boost/scrollspy","theme_boost/tab","theme_boost/tooltip","theme_boost/popover"],function(){a('[data-toggle="popover"]').popover()}),{}});
define(["jquery","./tether"],function(a,b){return window.jQuery=a,window.Tether=b,require(["theme_boost/util","theme_boost/alert","theme_boost/button","theme_boost/carousel","theme_boost/collapse","theme_boost/dropdown","theme_boost/modal","theme_boost/scrollspy","theme_boost/tab","theme_boost/tooltip","theme_boost/popover"],function(){a("body").popover({selector:'[data-toggle="popover"]',trigger:"focus"})}),{}});

5
theme/boost/amd/src/loader.js
View File

@ -40,7 +40,10 @@ define(['jquery', './tether'], function(jQuery, Tether) {
'theme_boost/tooltip',
'theme_boost/popover'],
function() {
jQuery('[data-toggle="popover"]').popover();
jQuery('body').popover({
selector: '[data-toggle="popover"]',
trigger: 'focus'
});
});
return {};

2
theme/boost/templates/core/filemanager_fileselect.mustache
View File

@ -7,7 +7,7 @@
<button class="fp-file-download btn btn-secondary">{{#str}}download{{/str}}</button>
<button class="fp-file-delete btn btn-secondary">{{#str}}delete{{/str}}</button>
<button class="fp-file-setmain btn btn-secondary">{{#str}}setmainfile, repository{{/str}}</button>
<span class="fp-file-setmain-help btn btn-secondary">{{helpicon}}</span>
<span class="fp-file-setmain-help">{{{helpicon}}}</span>
<button class="fp-file-zip btn btn-secondary">{{#str}}zip, editor{{/str}}</button>
<button class="fp-file-unzip btn btn-secondary">{{#str}}unzip{{/str}}</button>
</div>