Commit c9b65d30 by Qiang Xue

Renamed core asset bundles.

parent f83eaecd
......@@ -12,7 +12,7 @@ return array(
),
'depends' => array(
'yii',
'twitter/bootstrap-responsive',
'yii/bootstrap-responsive',
),
),
);
<?php
return array(
'jquery' => array(
'yii' => array(
'sourcePath' => __DIR__ . '/assets',
'js' => array(
'jquery.min.js',
'yii.js',
),
'depends' => array('yii/jquery'),
),
'yii' => array(
'yii/jquery' => array(
'sourcePath' => __DIR__ . '/assets',
'js' => array(
'yii.js',
'jquery.min.js',
),
'depends' => array('jquery'),
),
'yii/validation' => array(
'sourcePath' => __DIR__ . '/assets',
......@@ -42,7 +42,7 @@ return array(
),
'depends' => array('yii'),
),
'twitter/bootstrap' => array(
'yii/bootstrap' => array(
'sourcePath' => __DIR__ . '/assets',
'css' => array(
'bootstrap/css/bootstrap.css',
......@@ -50,16 +50,16 @@ return array(
'js' => array(
'bootstrap/js/bootstrap.js',
),
'depends' => array('jquery'),
'depends' => array('yii/jquery'),
),
'twitter/bootstrap-responsive' => array(
'yii/bootstrap-responsive' => array(
'sourcePath' => __DIR__ . '/assets',
'css' => array(
'bootstrap/css/bootstrap-responsive.css',
),
'depends' => array('twitter/bootstrap'),
'depends' => array('yii/bootstrap'),
),
'punycode' => array(
'yii/punycode' => array(
'sourcePath' => __DIR__ . '/vendor/bestiejs/punycode.js',
'js' => array(
'punycode.min.js',
......
......@@ -135,7 +135,7 @@ class EmailValidator extends Validator
$view->registerAssetBundle('yii/validation');
if ($this->enableIDN) {
$view->registerAssetBundle('punycode');
$view->registerAssetBundle('yii/punycode');
}
return 'yii.validation.email(value, messages, ' . Json::encode($options) . ');';
}
......
......@@ -140,7 +140,7 @@ class UrlValidator extends Validator
$view->registerAssetBundle('yii/validation');
if ($this->enableIDN) {
$view->registerAssetBundle('punycode');
$view->registerAssetBundle('yii/punycode');
}
return 'yii.validation.url(value, messages, ' . Json::encode($options) . ');';
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment