Skip to content

Commit

Permalink
Fixes yiisoft#1548: Upgraded jQueryUI to 1.9.2
Browse files Browse the repository at this point in the history
  • Loading branch information
samdark committed Dec 1, 2012
1 parent bbb6454 commit 036f6f2
Show file tree
Hide file tree
Showing 23 changed files with 86 additions and 85 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ Version 1.1.13 work in progress
- Enh: CModule::setComponents() now can reconfigure already loaded components (creocoder)
- Enh: CLocale::getWeekDayName() weekday-number argument is now more compatible with date() function, allowing 0 and 7 for sunday (Yiivgeny, cebe)
- Chg #1373: Upgraded jquery star rating to 3.14 (samdark)
- Chg #1548: Upgraded jQueryUI to 1.9.2 (samdark)
- Chg #1563: Updated CTestCase for PHPUnit 3.7.7+ (tanakahisateru, samdark)
- Chg #1746: CDbCriteria::mergeWith() is now more consistent with all other class methods (hyzhakus, samdark)
- Chg: MSSQL unit tests updated and actualized, added SQLSRV driver support (resurtm)
Expand Down
3 changes: 3 additions & 0 deletions UPGRADE
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ General upgrade instructions

Upgrading from v1.1.12
----------------------
- Both jQuery and jQueryUI were updated. Check [jQuery UI upgrade guide](http://jqueryui.com/upgrade-guide/1.9/)
and [jQuery release notes](http://blog.jquery.com/2012/08/09/jquery-1-8-released/).

- We completed the behavior of CFormatter::sizeFormat() which has been introduced in Yii 1.1.11. If you are using it with your own translation file
you have to move your translations to the `yii` category in `yii.php` file which is handled by the application component `coreMessages`.
We also fixed the default translation strings to be correct English and apply to choice format, so you have to adjust your translation file keys.
Expand Down
2 changes: 1 addition & 1 deletion framework/vendors/README.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h1>Third-Party Library List</h1>
<td>most JavaScript-related functionalities</td>
</tr>
<tr>
<td><a href="http://www.jqueryui.com">jQuery UI 1.8.22</a></td>
<td><a href="http://www.jqueryui.com">jQuery UI 1.9.2</a></td>
<td><a href="jqueryui/MIT-LICENSE.txt">MIT</a></td>
<td>the widgets under zii/widgets/jui</td>
</tr>
Expand Down
5 changes: 3 additions & 2 deletions framework/vendors/jqueryui/MIT-LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Copyright (c) 2012 Paul Bakaus, http://jqueryui.com/
Copyright 2012 jQuery Foundation and other contributors,
http://jqueryui.com/

This software consists of voluntary contributions made by many
individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
Expand All @@ -22,4 +23,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
25 changes: 0 additions & 25 deletions framework/web/js/source/jui/MIT-LICENSE.txt

This file was deleted.

15 changes: 10 additions & 5 deletions framework/web/js/source/jui/css/base/jquery-ui.css

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions framework/web/js/source/jui/css/base/jquery.ui.accordion.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*! jQuery UI - v1.8.22 - 2012-07-24
* https://github.com/jquery/jquery-ui
/*! jQuery UI - v1.9.2 - 2012-11-23
* http://jqueryui.com
* Includes: jquery.ui.autocomplete.css
* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
.ui-autocomplete{position:absolute;cursor:default}* html .ui-autocomplete{width:1px}.ui-menu{list-style:none;padding:2px;margin:0;display:block;float:left}.ui-menu .ui-menu{margin-top:-3px}.ui-menu .ui-menu-item{margin:0;padding:0;zoom:1;float:left;clear:left;width:100%}.ui-menu .ui-menu-item a{text-decoration:none;display:block;padding:.2em .4em;line-height:1.5;zoom:1}.ui-menu .ui-menu-item a.ui-state-hover,.ui-menu .ui-menu-item a.ui-state-active{font-weight:normal;margin:-1px}
* Copyright 2012 jQuery Foundation and other contributors; Licensed MIT */
.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}* html .ui-autocomplete{width:1px}
8 changes: 4 additions & 4 deletions framework/web/js/source/jui/css/base/jquery.ui.button.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions framework/web/js/source/jui/css/base/jquery.ui.core.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions framework/web/js/source/jui/css/base/jquery.ui.datepicker.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions framework/web/js/source/jui/css/base/jquery.ui.dialog.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions framework/web/js/source/jui/css/base/jquery.ui.menu.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*! jQuery UI - v1.8.22 - 2012-07-24
* https://github.com/jquery/jquery-ui
/*! jQuery UI - v1.9.2 - 2012-11-23
* http://jqueryui.com
* Includes: jquery.ui.progressbar.css
* Copyright (c) 2012 AUTHORS.txt; Licensed MIT, GPL */
* Copyright 2012 jQuery Foundation and other contributors; Licensed MIT */
.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}
Loading

0 comments on commit 036f6f2

Please sign in to comment.