Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
1605905f
Commit
1605905f
authored
Nov 11, 2014
by
Klimov Paul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed CCS for `yii\authclient\widgets\AuthChoice` does not loaded if `popupMode` disabled
parent
255cf947
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
5 deletions
+32
-5
CHANGELOG.md
extensions/authclient/CHANGELOG.md
+1
-1
AuthChoice.php
extensions/authclient/widgets/AuthChoice.php
+3
-1
AuthChoiceAsset.php
extensions/authclient/widgets/AuthChoiceAsset.php
+3
-3
AuthChoiceStyleAsset.php
extensions/authclient/widgets/AuthChoiceStyleAsset.php
+25
-0
No files found.
extensions/authclient/CHANGELOG.md
View file @
1605905f
...
@@ -4,7 +4,7 @@ Yii Framework 2 authclient extension Change Log
...
@@ -4,7 +4,7 @@ Yii Framework 2 authclient extension Change Log
2.
0.1 under development
2.
0.1 under development
-----------------------
-----------------------
-
no changes in this release.
-
Bug #6000: Fixed CCS for
`yii\authclient\widgets\AuthChoice`
does not loaded if
`popupMode`
disabled (klimov-paul)
2.0.0 October 12, 2014
2.0.0 October 12, 2014
...
...
extensions/authclient/widgets/AuthChoice.php
View file @
1605905f
...
@@ -225,10 +225,12 @@ class AuthChoice extends Widget
...
@@ -225,10 +225,12 @@ class AuthChoice extends Widget
*/
*/
public
function
init
()
public
function
init
()
{
{
if
(
$this
->
popupMode
)
{
$view
=
Yii
::
$app
->
getView
();
$view
=
Yii
::
$app
->
getView
();
if
(
$this
->
popupMode
)
{
AuthChoiceAsset
::
register
(
$view
);
AuthChoiceAsset
::
register
(
$view
);
$view
->
registerJs
(
"
\$
('#"
.
$this
->
getId
()
.
"').authchoice();"
);
$view
->
registerJs
(
"
\$
('#"
.
$this
->
getId
()
.
"').authchoice();"
);
}
else
{
AuthChoiceStyleAsset
::
register
(
$view
);
}
}
$this
->
options
[
'id'
]
=
$this
->
getId
();
$this
->
options
[
'id'
]
=
$this
->
getId
();
echo
Html
::
beginTag
(
'div'
,
$this
->
options
);
echo
Html
::
beginTag
(
'div'
,
$this
->
options
);
...
...
extensions/authclient/widgets/AuthChoiceAsset.php
View file @
1605905f
...
@@ -12,6 +12,8 @@ use yii\web\AssetBundle;
...
@@ -12,6 +12,8 @@ use yii\web\AssetBundle;
/**
/**
* AuthChoiceAsset is an asset bundle for [[AuthChoice]] widget.
* AuthChoiceAsset is an asset bundle for [[AuthChoice]] widget.
*
*
* @see AuthChoiceStyleAsset
*
* @author Paul Klimov <klimov.paul@gmail.com>
* @author Paul Klimov <klimov.paul@gmail.com>
* @since 2.0
* @since 2.0
*/
*/
...
@@ -21,10 +23,8 @@ class AuthChoiceAsset extends AssetBundle
...
@@ -21,10 +23,8 @@ class AuthChoiceAsset extends AssetBundle
public
$js
=
[
public
$js
=
[
'authchoice.js'
,
'authchoice.js'
,
];
];
public
$css
=
[
'authchoice.css'
,
];
public
$depends
=
[
public
$depends
=
[
'yii\authclient\widgets\AuthChoiceStyleAsset'
,
'yii\web\YiiAsset'
,
'yii\web\YiiAsset'
,
];
];
}
}
extensions/authclient/widgets/AuthChoiceStyleAsset.php
0 → 100644
View file @
1605905f
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
*/
namespace
yii\authclient\widgets
;
use
yii\web\AssetBundle
;
/**
* AuthChoiceAsset is an asset bundle for [[AuthChoice]] widget.
*
* @author Paul Klimov <klimov.paul@gmail.com>
* @since 2.0
*/
class
AuthChoiceStyleAsset
extends
AssetBundle
{
public
$sourcePath
=
'@yii/authclient/assets'
;
public
$css
=
[
'authchoice.css'
,
];
}
\ No newline at end of file
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