Skip to content

Commit

Permalink
release version 1.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@henryyan
henryyan committed Aug 31, 2013
1 parent f1ddeff commit 57b3b5f
Show file tree
Hide file tree
Showing 22 changed files with 52 additions and 40 deletions.
6 changes: 6 additions & 0 deletions README.md
View file
Expand Up @@ -17,6 +17,12 @@ A portlet extend jQuery UI.

## Changelog

### 1.3.1（2013-09-01）

1. 修复内容区域隐藏/显示切换后图标没变动问题
2. 修复单视图模式还原后再次隐藏内容区域只隐藏了内容边框保持不变问题
3. 给DEMO页面添加了几个小图标

### 1.3.0（2013-08-18）

1. 支持动态添加Portlet元素，并且可以指定位置
Expand Down
Binary file added api.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added chat.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions demo/bootstrap.html
View file
Expand Up @@ -7,7 +7,7 @@
<!-- jquery 1.4 and jquery ui 1.8 -->
<link rel="stylesheet" href="../lib/themes/bootstrap/jquery-ui-1.10.0.custom.css" />
<link rel="stylesheet" href="../lib/themes/bootstrap/jquery.ui.1.10.0.ie.css" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.0" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.1" />

<script src="../lib/jquery-1.8.3.min.js" type="text/javascript"></script>
<script src="../lib/jquery-ui-1.10.2.custom.min.js" type="text/javascript"></script>
Expand All @@ -16,7 +16,7 @@
<!--<script src="../lib/jquery-1.8.3.js" type="text/javascript"></script>-->
<!--<script src="../lib/themes/jquery-ui-1.9.1.custom.min.js" type="text/javascript"></script>-->

<script src="../script/jquery.portlet.pack.js?v=1.3.0"></script>
<script src="../script/jquery.portlet.pack.js?v=1.3.1"></script>
<style>
body {font-size: 13px;}
.highlight-content {color: red;}
Expand Down
2 changes: 1 addition & 1 deletion demo/colspan.html
View file
Expand Up @@ -5,7 +5,7 @@
<title>jQuery UI Portlet</title>
<!-- jquery 1.4 and jquery ui 1.8 -->
<link rel="stylesheet" href="../lib/themes/1.10/start/jquery-ui-1.10.2.custom.min.css" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.0" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.1" />

<script src="../lib/jquery-1.8.3.min.js" type="text/javascript"></script>
<script src="../lib/jquery-ui-1.10.2.custom.min.js" type="text/javascript"></script>
Expand Down
4 changes: 2 additions & 2 deletions demo/disable-drag.html
View file
Expand Up @@ -5,7 +5,7 @@
<title>jQuery UI Portlet</title>
<!-- jquery 1.4 and jquery ui 1.8 -->
<link rel="stylesheet" href="../lib/themes/1.10/start/jquery-ui-1.10.2.custom.min.css" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.0" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.1" />

<script src="../lib/jquery-1.8.3.min.js" type="text/javascript"></script>
<script src="../lib/jquery-ui-1.10.2.custom.min.js" type="text/javascript"></script>
Expand All @@ -14,7 +14,7 @@
<!--<script src="../lib/jquery-1.8.3.js" type="text/javascript"></script>-->
<!--<script src="../lib/themes/jquery-ui-1.9.1.custom.min.js" type="text/javascript"></script>-->

<script src="../script/jquery.portlet.pack.js?v=1.3.0"></script>
<script src="../script/jquery.portlet.pack.js?v=1.3.1"></script>
<style>
body {font-size: 13px;}
.highlight-content {color: red;}
Expand Down
4 changes: 2 additions & 2 deletions demo/drag-events.html
View file
Expand Up @@ -5,7 +5,7 @@
<title>jQuery UI Portlet</title>
<!-- jquery 1.4 and jquery ui 1.8 -->
<link rel="stylesheet" href="../lib/themes/1.10/start/jquery-ui-1.10.2.custom.min.css" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.0" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.1" />

<script src="../lib/jquery-1.8.3.min.js" type="text/javascript"></script>
<script src="../lib/jquery-ui-1.10.2.custom.min.js" type="text/javascript"></script>
Expand All @@ -14,7 +14,7 @@
<!--<script src="../lib/jquery-1.8.3.js" type="text/javascript"></script>-->
<!--<script src="../lib/themes/jquery-ui-1.9.1.custom.min.js" type="text/javascript"></script>-->

<script src="../script/jquery.portlet.pack.js?v=1.3.0"></script>
<script src="../script/jquery.portlet.pack.js?v=1.3.1"></script>
<style>
body {font-size: 13px;}
.highlight-content {color: red;}
Expand Down
2 changes: 1 addition & 1 deletion demo/dynamic-add.html
View file
Expand Up @@ -5,7 +5,7 @@
<title>jQuery UI Portlet</title>
<!-- jquery 1.4 and jquery ui 1.8 -->
<link rel="stylesheet" href="../lib/themes/1.10/start/jquery-ui-1.10.2.custom.min.css" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.0" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.1" />

<script src="../lib/jquery-1.8.3.min.js" type="text/javascript"></script>
<script src="../lib/jquery-ui-1.10.2.custom.min.js" type="text/javascript"></script>
Expand Down
4 changes: 2 additions & 2 deletions demo/fixed-height.html
View file
Expand Up @@ -5,7 +5,7 @@
<title>jQuery UI Portlet</title>
<!-- jquery 1.4 and jquery ui 1.8 -->
<link rel="stylesheet" href="../lib/themes/1.10/start/jquery-ui-1.10.2.custom.min.css" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.0" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.1" />

<script src="../lib/jquery-1.8.3.min.js" type="text/javascript"></script>
<script src="../lib/jquery-ui-1.10.2.custom.min.js" type="text/javascript"></script>
Expand All @@ -14,7 +14,7 @@
<!--<script src="../lib/jquery-1.8.3.js" type="text/javascript"></script>-->
<!--<script src="../lib/themes/jquery-ui-1.9.1.custom.min.js" type="text/javascript"></script>-->

<script src="../script/jquery.portlet.pack.js?v=1.3.0"></script>
<script src="../script/jquery.portlet.pack.js?v=1.3.1"></script>
<style>
body {font-size: 13px;}
.highlight-content {color: red;}
Expand Down
4 changes: 2 additions & 2 deletions demo/getindexs.html
View file
Expand Up @@ -5,7 +5,7 @@
<title>jQuery UI Portlet</title>
<!-- jquery 1.4 and jquery ui 1.8 -->
<link rel="stylesheet" href="../lib/themes/1.10/start/jquery-ui-1.10.2.custom.min.css" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.0" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.1" />

<script src="../lib/jquery-1.8.3.min.js" type="text/javascript"></script>
<script src="../lib/jquery-ui-1.10.2.custom.min.js" type="text/javascript"></script>
Expand All @@ -14,7 +14,7 @@
<!--<script src="../lib/jquery-1.8.3.js" type="text/javascript"></script>-->
<!--<script src="../lib/themes/jquery-ui-1.9.1.custom.min.js" type="text/javascript"></script>-->

<script src="../script/jquery.portlet.pack.js?v=1.3.0"></script>
<script src="../script/jquery.portlet.pack.js?v=1.3.1"></script>
<style>
body {font-size: 13px;}
.highlight-content {color: red;}
Expand Down
4 changes: 2 additions & 2 deletions demo/icon.html
View file
Expand Up @@ -5,7 +5,7 @@
<title>jQuery UI Portlet</title>
<!-- jquery 1.4 and jquery ui 1.8 -->
<link rel="stylesheet" href="../lib/themes/1.10/start/jquery-ui-1.10.2.custom.min.css" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.0" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.1" />

<script src="../lib/jquery-1.8.3.min.js" type="text/javascript"></script>
<script src="../lib/jquery-ui-1.10.2.custom.min.js" type="text/javascript"></script>
Expand All @@ -14,7 +14,7 @@
<!--<script src="../lib/jquery-1.8.3.js" type="text/javascript"></script>-->
<!--<script src="../lib/themes/jquery-ui-1.9.1.custom.min.js" type="text/javascript"></script>-->

<script src="../script/jquery.portlet.pack.js?v=1.3.0"></script>
<script src="../script/jquery.portlet.pack.js?v=1.3.1"></script>
<style>
body {font-size: 13px;}
.highlight-content {color: red;}
Expand Down
4 changes: 2 additions & 2 deletions demo/mix.html
View file
Expand Up @@ -5,7 +5,7 @@
<title>jQuery UI Portlet</title>
<!-- jquery 1.4 and jquery ui 1.8 -->
<link rel="stylesheet" href="../lib/themes/1.10/start/jquery-ui-1.10.2.custom.min.css" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.0" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.1" />

<script src="../lib/jquery-1.8.3.min.js" type="text/javascript"></script>
<script src="../lib/jquery-ui-1.10.2.custom.min.js" type="text/javascript"></script>
Expand All @@ -14,7 +14,7 @@
<!--<script src="../lib/jquery-1.8.3.js" type="text/javascript"></script>-->
<!--<script src="../lib/themes/jquery-ui-1.9.1.custom.min.js" type="text/javascript"></script>-->

<script src="../script/jquery.portlet.pack.js?v=1.3.0"></script>
<script src="../script/jquery.portlet.js?v=1.3.1"></script>
<style>
body {font-size: 13px;}
.highlight-content {color: red;}
Expand Down
4 changes: 2 additions & 2 deletions demo/single-view.html
View file
Expand Up @@ -5,7 +5,7 @@
<title>jQuery UI Portlet</title>
<!-- jquery 1.4 and jquery ui 1.8 -->
<link rel="stylesheet" href="../lib/themes/1.10/start/jquery-ui-1.10.2.custom.min.css" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.0" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.1" />

<script src="../lib/jquery-1.8.3.min.js" type="text/javascript"></script>
<script src="../lib/jquery-ui-1.10.2.custom.min.js" type="text/javascript"></script>
Expand All @@ -14,7 +14,7 @@
<!--<script src="../lib/jquery-1.8.3.js" type="text/javascript"></script>-->
<!--<script src="../lib/themes/jquery-ui-1.9.1.custom.min.js" type="text/javascript"></script>-->

<script src="../script/jquery.portlet.pack.js?v=1.3.0"></script>
<script src="../script/jquery.portlet.pack.js?v=1.3.1"></script>
<style>
body {font-size: 13px;}
.highlight-content {color: red;}
Expand Down
4 changes: 2 additions & 2 deletions demo/toggle.html
View file
Expand Up @@ -5,7 +5,7 @@
<title>jQuery UI Portlet</title>
<!-- jquery 1.4 and jquery ui 1.8 -->
<link rel="stylesheet" href="../lib/themes/1.10/start/jquery-ui-1.10.2.custom.min.css" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.0" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.1" />

<script src="../lib/jquery-1.8.3.min.js" type="text/javascript"></script>
<script src="../lib/jquery-ui-1.10.2.custom.min.js" type="text/javascript"></script>
Expand All @@ -14,7 +14,7 @@
<!--<script src="../lib/jquery-1.8.3.js" type="text/javascript"></script>-->
<!--<script src="../lib/themes/jquery-ui-1.9.1.custom.min.js" type="text/javascript"></script>-->

<script src="../script/jquery.portlet.pack.js?v=1.3.0"></script>
<script src="../script/jquery.portlet.pack.js?v=1.3.1"></script>
<style>
body {font-size: 13px;}
.highlight-content {color: red;}
Expand Down
2 changes: 1 addition & 1 deletion demo/v1.3-new-events.html
View file
Expand Up @@ -5,7 +5,7 @@
<title>jQuery UI Portlet</title>
<!-- jquery 1.4 and jquery ui 1.8 -->
<link rel="stylesheet" href="../lib/themes/1.10/start/jquery-ui-1.10.2.custom.min.css" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.0" />
<link rel="stylesheet" href="../css/jquery.portlet.css?v=1.3.1" />

<script src="../lib/jquery-1.8.3.min.js" type="text/javascript"></script>
<script src="../lib/jquery-ui-1.10.2.custom.min.js" type="text/javascript"></script>
Expand Down
Binary file added duoshuo.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added github-small.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 13 additions & 10 deletions index.html
View file
Expand Up @@ -5,10 +5,10 @@
<title>jQuery UI Portlet</title>
<!-- jquery 1.4 and jquery ui 1.8 -->
<link rel="stylesheet" href="lib/themes/1.10/start/jquery-ui-1.10.2.custom.min.css" />
<link rel="stylesheet" href="css/jquery.portlet.css?v=1.3.0" />
<link rel="stylesheet" href="css/jquery.portlet.css?v=1.3.1" />
<style type="text/css">
body {font-size: 10px;}
#menu li {font-size: 14px;}
#menu li {font-size: 13px;}
#LeftPane {
overflow: auto;
}
Expand All @@ -17,12 +17,15 @@
overflow: auto;
}
.ui-layout-resizer div {background-color: red;}
.new {color: red; font-size: 12px; margin-left: 5px; font-weight: bold;}
.new {background-image: url(new.png) !important;background-repeat:no-repeat !important;background-position: right center !important;}
.chat {background-image: url(duoshuo.png) !important;background-repeat:no-repeat !important;background-position: right center !important;}
.api {background-image: url(api.png) !important;background-repeat:no-repeat !important;background-position: right center !important;}
.source-github {background-image: url(github-small.png) !important;background-repeat:no-repeat !important;background-position: right center !important;}
</style>
<script src="lib/jquery-1.8.3.min.js" type="text/javascript"></script>
<script src="lib/jquery-ui-1.10.2.custom.min.js" type="text/javascript"></script>
<script src="lib/jquery.layout-latest.min.js" type="text/javascript"></script>
<script src="script/jquery.portlet.pack.js?v=1.3.0"></script>
<script src="script/jquery.portlet.pack.js?v=1.3.1"></script>
<script>
$(function() {
$('body').layout({
Expand Down Expand Up @@ -54,7 +57,7 @@
<div id="TopPane" class="ui-layout-north ui-widget ui-widget-content ui-state-default" style="text-align:center">
<img src="logo-ui.png" style="float:left" height="68" />
<h1 style='display:inline;margin-top:5em;'>jQuery UI Portlet</h1>
<h4 style='display:inline;margin-left: 1em;'>（Version: 1.3.0） 基于jQuery UI的Portlet插件</h4>
<h4 style='display:inline;margin-left: 1em;'>（Version: 1.3.1） 基于jQuery UI的Portlet插件</h4>
<div stle="padding-top:10em;display:block">
<br/>
<img src="github.png" height="30" alt="" style="vertical-align:middle"/>
Expand All @@ -64,8 +67,8 @@ <h4 style='display:inline;margin-left: 1em;'>（Version: 1.3.0） 基于jQuery U
<div id="LeftPane" class="ui-layout-west ui-widget ui-widget-content">
<ul id="menu">
<li class='ui-state-default'><a href='#' rel="#">==插件文档==</a></li>
<li><a href='#' rel="api.html">插件API</a></li>
<li><a href='#' rel="demo/source-on-github.html">插件源码</a></li>
<li><a href='#' class="api" rel="api.html">插件API</a></li>
<li><a href='#' class="source-github" rel="demo/source-on-github.html">插件源码</a></li>
<li class='ui-state-highlight'><a href='#' rel="#">==插件演示==</a></li>
<li><a href='#' rel="demo/mix.html">综合演示</a></li>
<li><a href='#' rel="demo/fixed-height.html">固定高度</a></li>
Expand All @@ -77,9 +80,9 @@ <h4 style='display:inline;margin-left: 1em;'>（Version: 1.3.0） 基于jQuery U
<li><a href='#' rel="demo/getindexs.html">获取[行/列]</a></li>
<li><a href='#' rel="demo/toggle.html">隐藏/显示切换</a></li>
<li><a href='#' rel="demo/drag-events.html">拖动事件</a></li>
<li><a href='#' rel="demo/dynamic-add.html">动态添加/删除（v1.3）<span class="new">New</span></a></li>
<li><a href='#' rel="demo/v1.3-new-events.html">新事件(v1.3)<span class="new">New</span></a></li>
<li class='ui-state-highlight'><a href='#' rel="talk.html">讨论插件</a></li>
<li><a href='#' class="new" title="动态添加、删除portlet元素" rel="demo/dynamic-add.html">动态增删（v1.3）</a></li>
<li><a href='#' class="new" rel="demo/v1.3-new-events.html">新事件(v1.3)</a></li>
<li class='ui-state-highlight'><a href='#' class="chat" rel="talk.html">讨论插件</a></li>
</ul>
</div>
<div id="RightPane" class="ui-layout-center ui-helper-reset ui-widget-content">
Expand Down
Binary file added new.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 6 additions & 5 deletions script/jquery.portlet.js
View file
@@ -1,5 +1,5 @@
/*
* jquery.portlet 1.3.0
* jquery.portlet 1.3.1
*
* Copyright (c) 2012~2013
* 咖啡兔 (http://www.kafeitu.me)
Expand All @@ -8,6 +8,7 @@
* and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
*
* Demo: http://www.kafeitu.me/demo/jquery-ui-portlet
* Github: https://github.com/henryyan/jquery-ui-portlet
*/
(function($, undefined){
$.widget("ui.portlet", {
Expand Down Expand Up @@ -252,7 +253,7 @@
$(_ele).find('.ui-portlet-item').show();
$item.removeClass('ui-portlet-single-view').animate({
width: $item.data('width'),
height: $item.data('height')
height: 'auto' // important
}).css({
position: 'static'
}).removeData('width').removeData('height');
Expand Down Expand Up @@ -416,13 +417,13 @@
type = type || 'toggle';
if (type == 'toggle') {
ct.slideToggle();
$(_this).toggleClass("ui-icon-minusthick").toggleClass("ui-icon-plusthick");
$(this).toggleClass("ui-icon-minusthick").toggleClass("ui-icon-plusthick");
} else if (type == 'hide') {
ct.slideUp();
$(_this).removeClass("ui-icon-minusthick").addClass("ui-icon-plusthick");
$(this).removeClass("ui-icon-minusthick").addClass("ui-icon-plusthick");
} else if (type == 'show') {
ct.slideDown();
$(_this).removeClass("ui-icon-plusthick").addClass("ui-icon-minusthick");
$(this).removeClass("ui-icon-plusthick").addClass("ui-icon-minusthick");
}
}).dblclick(function(event) {
event.stopPropagation();
Expand Down

0 comments on commit 57b3b5f

Please sign in to comment.