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

MDL-40759 fontawesome: Minor cleanups

Browse Source 
Remove eslint hints that are not required and revert changes to the
behat test for recycle bin that are not needed.
This commit is contained in:
Damyon Wiese 2017-03-17 15:25:56 +08:00
parent 07171e831e
commit 42d4689c65
3 changed files with 2 additions and 4 deletions

2
admin/tool/recyclebin/tests/behat/basic_functionality.feature

@ -23,7 +23,6 @@ Feature: Basic recycle bin functionality
| categorybinexpiry | 1209600 | tool_recyclebin |
| autohide | 0 | tool_recyclebin |
@javascript
Scenario: Restore a deleted assignment
Given I log in as "teacher1"
And I follow "Course 1"
@ -32,7 +31,6 @@ Feature: Basic recycle bin functionality
| Assignment name | Test assign |
| Description | Test |
And I delete "Test assign" activity
And I run all adhoc tasks
When I navigate to "Recycle bin" node in "Course administration"
Then I should see "Test assign"
And I should see "Contents will be permanently deleted after 7 days"

2
lib/amd/src/icon_system_fontawesome.js

@ -83,7 +83,7 @@ define(['core/icon_system', 'jquery', 'core/ajax', 'core/mustache', 'core/locals
* @return {String}
* @method renderIcon
*/
IconSystemFontawesome.prototype.renderIcon = function(key, component, title, template) { // eslint-disable-line no-unused-vars
IconSystemFontawesome.prototype.renderIcon = function(key, component, title, template) {
var mappedIcon = staticMap[component + '/' + key];
if (typeof mappedIcon === "undefined") {
mappedIcon = component + '/' + key;

2
lib/amd/src/icon_system_standard.js

@ -42,7 +42,7 @@ define(['core/icon_system', 'core/url', 'core/mustache'],
* @return {String}
* @method renderIcon
*/
IconSystemStandard.prototype.renderIcon = function(key, component, title, template) { // eslint-disable-line no-unused-vars
IconSystemStandard.prototype.renderIcon = function(key, component, title, template) {
var url = CoreUrl.imageUrl(key, component);
var templatecontext = {