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-54687 core_message: removed loading template

Browse Source
This commit is contained in:
Mark Nelson 2016-07-19 15:36:14 +08:00
parent e48a092a40
commit b8a6beec40
7 changed files with 6 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
message/amd/src/contacts.js
View File

@ -141,7 +141,7 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification'],
*/
Contacts.prototype._loadContactArea = function(webservice) {
// Show loading template.
templates.render('core_message/loading', {}).done(function(html, js) {
templates.render('core/loading', {}).done(function(html, js) {
templates.replaceNodeContents("[data-region='contacts']", html, js);
});

2
message/amd/src/messages.js
View File

@ -63,7 +63,7 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification'],
*/
Messages.prototype._loadMessages = function(event, userid) {
// Show loading template.
templates.render('core_message/loading', {}).done(function(html, js) {
templates.render('core/loading', {}).done(function(html, js) {
templates.replaceNodeContents("[data-region='messages-area']", html, js);
});

2
message/amd/src/profile.js
View File

@ -62,7 +62,7 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
*/
Profile.prototype._viewProfile = function(event, userid) {
// Show loading template.
templates.render('core_message/loading', {}).done(function(html, js) {
templates.render('core/loading', {}).done(function(html, js) {
templates.replaceNodeContents("[data-region='messages-area']", html, js);
});

34
message/templates/loading.mustache
View File

@ -1,34 +0,0 @@
{{!
This file is part of Moodle - http://moodle.org/
Moodle is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Moodle is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Moodle. If not, see <http://www.gnu.org/licenses/>.
}}
{{!
@template core_message/loading
Loading spinner shown while waiting for an ajax request
Classes required for JS:
* None
Data attibutes required for JS:
* None
Context variables required for this template:
* None
Example context (json):
{ }
}}
{{#pix}}y/loading, core, {{#str}}loading, core_message{{/str}}{{/pix}}

2
message/templates/message_popover.mustache
View File

@ -54,7 +54,7 @@
data-original-title="{{#str}} markallread {{/str}}"
aria-role="button">
<span class="normal-icon">{{#pix}} t/markasread, core, {{#str}} markallread {{/str}} {{/pix}}</span>
<span class="loading-icon">{{#pix}} y/loading, core, {{#str}} loading, mod_assign {{/str}} {{/pix}}</span>
{{> core/loading }}
</a>
<a href="{{{urls.preferences}}}"
data-toggle="tooltip"

2
message/templates/notification_content_item.mustache
View File

@ -70,7 +70,7 @@
data-preference-loggedin="{{loggedin}}"
data-preference-loggedoff="{{loggedoff}}">
<div class="block-icon">{{#pix}} t/block {{/pix}}</div>
<div class="loading-icon">{{> message/loading }}</div>
{{> core/loading }}
</span>
{{/preference}}
{{/preferenceenabled}}

2
message/templates/notification_popover.mustache
View File

@ -59,7 +59,7 @@
data-original-title="{{#str}} markallread {{/str}}"
aria-role="button">
<span class="normal-icon">{{#pix}} t/markasread, core, {{#str}} markallread {{/str}} {{/pix}}</span>
<span class="loading-icon">{{#pix}} y/loading, core, {{#str}} loading, mod_assign {{/str}} {{/pix}}</span>
{{> core/loading }}
</a>
<a href="{{{urls.preferences}}}"
data-toggle="tooltip"