Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ajax_loader
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
ajax_loader
Commits
1313dc35
Commit
1313dc35
authored
6 years ago
by
Ryan Hartman
Committed by
Robin Ingelbrecht
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Issue
#2962191
by devkinetic: Javascript is not being removed on non ajax pages
parent
b5227781
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
ajax_loader.module
+3
-2
3 additions, 2 deletions
ajax_loader.module
with
3 additions
and
2 deletions
ajax_loader.module
+
3
−
2
View file @
1313dc35
...
@@ -100,7 +100,8 @@ function ajax_loader_page_build(&$page) {
...
@@ -100,7 +100,8 @@ function ajax_loader_page_build(&$page) {
*/
*/
function
ajax_loader_js_alter
(
&
$javascript
)
{
function
ajax_loader_js_alter
(
&
$javascript
)
{
// Only add throbber js file if ajax.js is included.
// Only add throbber js file if ajax.js is included.
if
(
!
isset
(
$javascript
[
'misc/ajax.js'
])
&&
isset
(
$javascript
[
'sites/all/modules/custom/ajax_loader/js/ajax-loader.js'
]))
{
$path
=
drupal_get_path
(
'module'
,
'ajax_loader'
)
.
"/js/ajax-loader.js"
;
unset
(
$javascript
[
'sites/all/modules/custom/ajax_loader/js/ajax-loader.js'
]);
if
(
!
isset
(
$javascript
[
'misc/ajax.js'
])
&&
isset
(
$javascript
[
$path
]))
{
unset
(
$javascript
[
$path
]);
}
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment