Fixed yii.js to follow jquery-pjax API changes

Fixes yiisoft#14926
Deele · Oct 6, 2017 · 7e681b4 · 7e681b4
1 parent fa1ca13
commit 7e681b4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/framework/assets/yii.js b/framework/assets/yii.js
@@ -163,7 +163,13 @@ window.yii = (function ($) {
                 pjaxOptions = {};
 
             if (usePjax) {
-                pjaxContainer = $e.data('pjax-container') || $e.closest('[data-pjax-container]');
+                debugger;
+                pjaxContainer = $e.data('pjax-container');
+                if (pjaxContainer === undefined || !pjaxContainer.length) {
+                    pjaxContainer = $e.closest('[data-pjax-container]').attr('id')
+                        ? ('#' + $e.closest('[data-pjax-container]').attr('id'))
+                        : '';
+                }
                 if (!pjaxContainer.length) {
                     pjaxContainer = 'body';
                 }

diff --git a/tests/js/tests/yii.test.js b/tests/js/tests/yii.test.js
@@ -326,13 +326,7 @@ describe('yii', function () {
             var pjaxOptions = pjaxClickStub.getCall(0).args[1];
 
             // container needs to be checked separately
-
-            if (typeof pjaxOptions.container === 'string') {
-                assert.equal(pjaxOptions.container, pjaxContainerId || 'body');
-            } else {
-                assert.instanceOf(pjaxOptions.container, $);
-                assert.equal(pjaxOptions.container.attr('id'), pjaxContainerId || 'body');
-            }
+            assert.equal(pjaxOptions.container, pjaxContainerId || 'body');
             delete pjaxOptions.container;
 
             assert.deepEqual(pjaxOptions, {
@@ -500,7 +494,7 @@ describe('yii', function () {
                         'link, data-pjax, outside a container': [
                             '.link-pjax-outside-container', '#pjax-separate-container'
                         ],
-                        'link href, data-pjax, inside a container': ['.link-pjax-inside-container', 'pjax-container-2']
+                        'link href, data-pjax, inside a container': ['.link-pjax-inside-container', '#pjax-container-2']
                     }, function (elementSelector, expectedPjaxContainerId) {
                         it(pageLoadWithPjaxMessage, function () {
                             var event = $.Event('click');