Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
project
drupal
Commits
e8322e4f
Commit
e8322e4f
authored
May 02, 2016
by
alexpott
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#2647916
by Lendude, dawehner: Views ajax modals stop working in certain scenarios
parent
82f9f8c5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
70 additions
and
1 deletion
+70
-1
core/lib/Drupal/Core/Asset/AssetResolver.php
core/lib/Drupal/Core/Asset/AssetResolver.php
+1
-1
core/modules/views_ui/tests/src/FunctionalJavascript/LibraryCachingTest.php
..._ui/tests/src/FunctionalJavascript/LibraryCachingTest.php
+69
-0
No files found.
core/lib/Drupal/Core/Asset/AssetResolver.php
View file @
e8322e4f
...
...
@@ -214,7 +214,7 @@ public function getJsAssets(AttachedAssetsInterface $assets, $optimize) {
// hook_library_info_alter(). Additionally add the current language to
// support translation of JavaScript files via hook_js_alter().
$libraries_to_load
=
$this
->
getLibrariesToLoad
(
$assets
);
$cid
=
'js:'
.
$theme_info
->
getName
()
.
':'
.
$this
->
languageManager
->
getCurrentLanguage
()
->
getId
()
.
':'
.
Crypt
::
hashBase64
(
serialize
(
$libraries_to_load
))
.
(
int
)
(
count
(
$assets
->
getSettings
())
>
0
)
.
(
int
)
$optimize
;
$cid
=
'js:'
.
$theme_info
->
getName
()
.
':'
.
$this
->
languageManager
->
getCurrentLanguage
()
->
getId
()
.
':'
.
Crypt
::
hashBase64
(
serialize
(
$libraries_to_load
)
.
serialize
(
$assets
->
getLibraries
())
)
.
(
int
)
(
count
(
$assets
->
getSettings
())
>
0
)
.
(
int
)
$optimize
;
if
(
$cached
=
$this
->
cache
->
get
(
$cid
))
{
list
(
$js_assets_header
,
$js_assets_footer
,
$settings
,
$settings_in_header
)
=
$cached
->
data
;
...
...
core/modules/views_ui/tests/src/FunctionalJavascript/LibraryCachingTest.php
0 → 100644
View file @
e8322e4f
<?php
namespace
Drupal\Tests\views_ui\FunctionalJavascript
;
use
Drupal\FunctionalJavascriptTests\JavascriptTestBase
;
/**
* Tests the JavaScript library caching on consecutive requests.
*
* @group views_ui
*/
class
LibraryCachingTest
extends
JavascriptTestBase
{
/**
* {@inheritdoc}
*/
public
static
$modules
=
[
'node'
,
'views'
,
'views_ui'
];
/**
* Tests if the Views UI dialogs open on consecutive requests.
*/
public
function
testConsecutiveDialogRequests
()
{
$admin_user
=
$this
->
drupalCreateUser
([
'administer site configuration'
,
'administer views'
,
'administer nodes'
,
'access content overview'
,
]);
// Disable automatic live preview to make the sequence of calls clearer.
\
Drupal
::
configFactory
()
->
getEditable
(
'views.settings'
)
->
set
(
'ui.always_live_preview'
,
FALSE
)
->
save
();
$this
->
drupalLogin
(
$admin_user
);
$this
->
drupalGet
(
'admin/structure/views/view/content'
);
$page
=
$this
->
getSession
()
->
getPage
();
// Use the 'Add' link for fields to open a dialog. This will load the proper
// dialog libraries.
$add_link
=
$page
->
findById
(
'views-add-field'
);
$this
->
assertTrue
(
$add_link
->
isVisible
(),
'Add fields button found.'
);
$add_link
->
click
();
$this
->
getSession
()
->
wait
(
5000
,
"jQuery('.ui-dialog-titlebar').length > 0"
);
// Close the dialog and open it again. No no libraries will be loaded, but a
// cache entry will be made for not loading any libraries.
$page
->
pressButton
(
'Close'
);
$add_link
->
click
();
$this
->
getSession
()
->
wait
(
5000
,
"jQuery('.ui-dialog-titlebar').length > 0"
);
$page
->
pressButton
(
'Close'
);
// Reload the page.
$this
->
drupalGet
(
'admin/structure/views/view/content'
);
$page
=
$this
->
getSession
()
->
getPage
();
// Now use the 'Update preview' button to load libraries.
$preview
=
$page
->
findById
(
'preview-submit'
);
// The first click will load all the libraries.
$preview
->
click
();
$this
->
getSession
()
->
wait
(
5000
,
"jQuery('.ajax-progress').length === 0"
);
// The second click will not load any new libraries.
$preview
->
click
();
$this
->
getSession
()
->
wait
(
5000
,
"jQuery('.ajax-progress').length === 0"
);
// Check to see if the dialogs still open.
$add_link
=
$page
->
findById
(
'views-add-field'
);
$add_link
->
click
();
$this
->
getSession
()
->
wait
(
5000
,
"jQuery('.ui-dialog-titlebar').length > 0"
);
$page
->
pressButton
(
'Close'
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment