Permalink
Browse files

merge from uploader to pull

  • Loading branch information...
1 parent 6d086f7 commit eeb19654a0e8c36124e7df92582c98d8441cc86d @zengyue zengyue committed Dec 15, 2013
Showing with 1,815 additions and 649 deletions.
  1. +2 −1 .gitignore
  2. +1 −1 assets/css/bui-min.css
  3. +55 −96 assets/css/bui.css
  4. +1 −1 assets/css/layout-min.css
  5. +7 −0 assets/css/layout.css
  6. +5 −0 assets/css/less/bui/layout.less
  7. +241 −164 assets/css/less/bui/uploader.less
  8. +2 −0 src/common/component/loader.js
  9. +16 −4 src/data/treestore.js
  10. +85 −10 src/form/field/uploader.js
  11. +0 −1 src/form/remote.js
  12. +53 −0 src/layout/absolute.js
  13. +2 −2 src/layout/abstract.js
  14. +38 −1 src/layout/accordion.js
  15. +37 −0 src/layout/anchor.js
  16. +2 −2 src/layout/base.js
  17. +89 −2 src/layout/border.js
  18. +53 −0 src/layout/columns.js
  19. +43 −0 src/layout/flow.js
  20. +10 −5 src/layout/item/absolute.js
  21. +5 −1 src/layout/item/base.js
  22. +82 −0 src/layout/table.js
  23. +65 −3 src/layout/viewport.js
  24. +1 −1 src/menu/menuitem.js
  25. +39 −23 src/module/module.js
  26. +4 −2 src/swf/src/swf.js
  27. +1 −1 src/tab/tabpanelitem.js
  28. +1 −0 src/tree/build.xml
  29. +55 −0 src/tree/selection.js
  30. +4 −3 src/tree/treelist.js
  31. +5 −3 src/tree/treemenu.js
  32. +3 −0 src/uploader/build.xml
  33. +4 −4 src/uploader/button/ajbridge.js
  34. +35 −106 src/uploader/button/base.js
  35. +93 −0 src/uploader/button/filter.js
  36. +22 −11 src/uploader/button/htmlButton.js
  37. +43 −9 src/uploader/button/swfButton.js
  38. +32 −13 src/uploader/demo/simple.html
  39. +6 −3 src/uploader/factory.js
  40. +37 −7 src/uploader/queue.js
  41. +17 −6 src/uploader/theme.js
  42. +1 −1 src/uploader/type/ajax.js
  43. +1 −1 src/uploader/type/base.js
  44. +1 −1 src/uploader/type/flash.js
  45. +75 −67 src/uploader/type/iframe.js
  46. +123 −38 src/uploader/uploader.js
  47. +85 −0 src/uploader/validator.js
  48. +2 −1 test/form-field.php
  49. +123 −38 test/index.php
  50. +13 −0 test/specs/form-field-spec.js
  51. +2 −2 test/specs/layout-border-spec.js
  52. +43 −6 test/specs/uploader-spec.js
  53. +1 −1 test/specs/viewport-spec.js
  54. +34 −0 test/tree-select.php
  55. +1 −0 test/tree.php
  56. +1 −0 test/treemenu.php
  57. +10 −5 test/uploader.php
  58. +3 −2 tools/jsduck/config.json
View
@@ -16,4 +16,5 @@ Thumbs.db
out/
node_modules/
tmp/
-reports/
+reports/
+docs/
Oops, something went wrong.
View
@@ -2057,151 +2057,110 @@ input.x-datepicker-time {
.tips-notice[class*=" x-align-bottom"] .x-align-arrow-inner {
border-bottom-color: #ffffe5;
}
-/**按钮样式**/
-.defaultTheme-button .bui-uploader-button-wrap {
- border: 1px solid #C4DAED;
- font-size: 12px;
- text-align: center;
+/**默认定义的样式**/
+.defaultTheme .bui-uploader-button-wrap {
+ display: inline-block;
+ padding: 0 5px;
height: 24px;
+ overflow: hidden;
line-height: 24px;
- display: block;
position: relative;
- width: 110px;
z-index: 500;
margin-right: 10px;
text-decoration: none;
+ border: 1px solid #C4DAED;
+ font-size: 12px;
+ text-align: center;
/*渐变*/
background: -webkit-gradient(linear, left top, left bottom, from(#fdfefe), to(#dfe7ef));
background: -moz-linear-gradient(top, #fdfefe, #dfe7ef);
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#FDFEFE', endColorstr='#DFE7EF');
}
-.defaultTheme-button .bui-uploader-button-wrap:link,
-.defaultTheme-button .bui-uploader-button-wrap:visited {
+.defaultTheme .bui-uploader-button-wrap:link,
+.defaultTheme .bui-uploader-button-wrap:visited {
color: #404040;
}
-.defaultTheme-button .bui-uploader-button-wrap-hover,
-.defaultTheme-button .bui-uploader-button-wrap:hover {
+.defaultTheme .bui-uploader-button-wrap:hover {
text-decoration: none;
color: black;
background: -webkit-gradient(linear, left top, left bottom, from(#dfe7ef), to(#fdfefe));
background: -moz-linear-gradient(top, #dfe7ef, #fdfefe);
filter: progid:dximagetransform.microsoft.gradient(startColorstr='#DFE7EF', endColorstr='#FDFEFE');
}
-.defaultTheme-button .bui-uploader-button-wrap:active {
+.defaultTheme .bui-uploader-button-wrap:active {
background: #DFE7EF;
filter: none;
}
-.defaultTheme-button .uploader-button-disabled,
-.defaultTheme-button .uploader-button-disabled:hover {
- border: 1px solid #BFBFBF;
- color: #404040;
- background: -webkit-gradient(linear, left top, left bottom, from(#fafafa), to(#e5e5e5));
- background: -moz-linear-gradient(top, #fafafa, #e5e5e5);
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#FAFAFA', endColorstr='#E5E5E5');
-}
-.defaultTheme-button .uploader-button-disabled .file-input-wrapper .file-input {
- display: none;
+.defaultTheme .bui-uploader-button-wrap .file-input-wrapper {
+ display: block;
+ width: 200px;
+ height: 26px;
+ position: absolute;
+ left: 0;
+ top: 0;
+ overflow: hidden;
+ z-index: 300;
}
-.defaultTheme-button .bui-uploader-button-wrap .file-input-wrapper .file-input {
+.defaultTheme .bui-uploader-button-wrap .file-input-wrapper .file-input {
background: none repeat scroll 0 0 transparent;
border: medium none;
cursor: pointer;
height: 200px;
- width: 110px;
+ width: 200px;
top: -50px;
opacity: 0;
position: absolute;
font-size: 100px;
left: 0;
}
-.defaultTheme-button .bui-uploader-button-wrap .file-input-wrapper {
+.defaultTheme .bui-uploader-button-wrap .uploader-button-swf {
display: block;
+ width: 200px;
height: 26px;
- width: 110px;
position: absolute;
left: 0;
top: 0;
- margin: 0;
overflow: hidden;
- padding: 0;
z-index: 300;
}
-.defaultTheme-button .bui-uploader-button .uploader-button-swf {
- display: block;
- width: 110px;
- height: 26px;
+.defaultTheme .bui-uploader-button-wrap .uploader-button-swf .file-input {
+ background: none repeat scroll 0 0 transparent;
+ border: medium none;
+ cursor: pointer;
+ height: 200px;
+ width: 200px;
+ top: -50px;
+ opacity: 0;
position: absolute;
- top: 0px;
- left: 0px;
- z-index: 2000;
- overflow: hidden;
-}
-/**按钮样式end**/
-.defaultTheme-queue a {
- color: #3366CC;
- text-decoration: none;
-}
-.defaultTheme-queue a:hover {
- color: #FF6600;
- text-decoration: underline;
-}
-.defaultTheme-queue {
- color: #404040;
- width: 400px;
- margin: 0;
- padding: 0;
- margin-top: 10px;
- font-size: 12px;
-}
-.defaultTheme-queue li {
- margin-top: 5px;
- list-style: none;
- line-height: 18px;
- color: #404040;
-}
-.defaultTheme-queue .file-icon {
- width: 12px;
- height: 16px;
- margin-right: 5px;
- background: url("http://img04.taobaocdn.com/tps/i4/T1HCGNXexjXXXXXXXX-12-16.png") 0 0 no-repeat;
-}
-.defaultTheme-queue .loading {
- background: url("http://img01.taobaocdn.com/tps/i1/T1F5tVXjRfXXXXXXXX-16-16.gif") no-repeat scroll 0 1px transparent;
- width: 16px;
- height: 16px;
-}
-.defaultTheme-queue .status-wrapper {
- margin-left: 5px;
-}
-.status-wrapper .status {
- display: none;
+ font-size: 100px;
+ left: 0;
}
-.defaultTheme-queue .status-wrapper .uploader-progress {
- margin-right: 5px;
- margin-top: 1px;
- width: 16px;
+.defaultTheme .bui-queue-item {
+ position: relative;
}
-.file-input-wrapper .valid-under {
- display: none !important;
+.defaultTheme .bui-queue-item .default,
+.defaultTheme .bui-queue-item .success,
+.defaultTheme .bui-queue-item .progress,
+.defaultTheme .bui-queue-item .error {
+ margin-right: 40px;
}
-.defaultTheme-queue .upload-error {
- color: #FD7316;
+.defaultTheme .bui-queue-item .error .uploader-error {
+ color: #fd7316;
}
-.uploader-auth-msg .estate {
- margin: 0;
+.defaultTheme .bui-queue-item .action {
+ display: block;
+ position: absolute;
+ padding-left: 10px;
+ width: 30px;
+ top: 0px;
+ right: 0px;
}
-/**-----进度条------**/
-.defaultTheme-queue .ks-progress-bar {
- border: 1px solid #FA9515;
- height: 10px;
- background-color: #fff;
- width: 80px;
+.defaultTheme .bui-queue-item .action .bui-queue-item-del {
+ cursor: pointer;
}
-.defaultTheme-queue .ks-progress-bar .ks-progress-bar-value {
- width: 0;
- height: 100%;
- background-color: #FA9515;
+.defaultTheme .bui-queue-item .action .bui-queue-item-del:hover {
+ color: #fd7316;
}
.bui-slider {
border: 1px solid #c3c3d6;
@@ -1 +1 @@
-.clearfix{*zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}.clearfix:after{clear:both;}.hide-text{overflow:hidden;text-indent:100%;white-space:nowrap;}.input-block-level{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;}.bui-inline-block{display:inline-block;*display:inline;*zoom:1;}.ext-border-layout .x-border-north,.ext-border-layout .x-border-east,.ext-border-layout .x-border-west,.ext-border-layout .x-border-south,.ext-border-layout .x-border-center{border:1px solid #3892d3;}.ext-border-layout .x-border-east,.ext-border-layout .x-border-west,.ext-border-layout .x-border-center{height:100%;}.ext-border-layout .x-collapsed .x-border-title-east,.ext-border-layout .x-collapsed .x-border-title-west{height:100%;padding:25px 5px 0;width:18px;}.ext-border-layout .x-border-east{float:right;}.ext-border-layout .x-border-west{float:left;}.ext-border-layout .x-layout-border{height:100%;}.ext-border-layout .x-layout-item-border{position:relative;}.ext-border-layout .x-border-title{font-weight:bold;font-size:14px;padding:5px 10px;background-color:#157fcc;color:white;}.ext-border-layout .x-border-middle{overflow:hidden;}.ext-border-layout .x-collapsed-btn{background:url('../img/tool-sprites.png') no-repeat 0 -192px transparent;display:block;width:16px;height:16px;position:absolute;right:7px;top:5px;}.ext-border-layout .x-border-north .x-collapsed-btn{background-position:0 -224px;}.ext-border-layout .x-border-south .x-collapsed-btn,.ext-border-layout .x-collapsed .x-collapsed-north{background-position:0 -208px;}.ext-border-layout .x-collapsed .x-collapsed-south{background-position:0 -224px;}.ext-border-layout .x-border-east .x-collapsed-btn{background-position:0 -176px;}.ext-border-layout .x-border-west .x-collapsed-btn,.ext-border-layout .x-collapsed .x-collapsed-east{background-position:0 -192px;}.ext-border-layout .x-collapsed .x-collapsed-west{background-position:0 -176px;}.ext-border-layout .x-collapsed .x-border-body{display:none;}.ext-border-layout .x-layout-item-border{background-color:#fff;}
+.clearfix{*zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}.clearfix:after{clear:both;}.hide-text{overflow:hidden;text-indent:100%;white-space:nowrap;}.input-block-level{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;}.bui-inline-block{display:inline-block;*display:inline;*zoom:1;}.x-viewport-container{overflow:hidden;}.ext-border-layout{padding:10px;background-color:#3892d3;}.ext-border-layout .x-border-north,.ext-border-layout .x-border-east,.ext-border-layout .x-border-west,.ext-border-layout .x-border-south,.ext-border-layout .x-border-center{border:1px solid #3892d3;}.ext-border-layout .x-border-east,.ext-border-layout .x-border-west,.ext-border-layout .x-border-center{height:100%;}.ext-border-layout .x-collapsed .x-border-title-east,.ext-border-layout .x-collapsed .x-border-title-west{height:100%;padding:25px 5px 0;width:18px;}.ext-border-layout .x-border-east{float:right;}.ext-border-layout .x-border-west{float:left;}.ext-border-layout .x-layout-border{height:100%;}.ext-border-layout .x-layout-item-border{position:relative;}.ext-border-layout .x-border-title{font-weight:bold;font-size:14px;padding:5px 10px;background-color:#157fcc;color:white;}.ext-border-layout .x-border-middle{overflow:hidden;}.ext-border-layout .x-collapsed-btn{background:url('../img/tool-sprites.png') no-repeat 0 -192px transparent;display:block;width:16px;height:16px;position:absolute;right:7px;top:5px;}.ext-border-layout .x-border-north .x-collapsed-btn{background-position:0 -224px;}.ext-border-layout .x-border-south .x-collapsed-btn,.ext-border-layout .x-collapsed .x-collapsed-north{background-position:0 -208px;}.ext-border-layout .x-collapsed .x-collapsed-south{background-position:0 -224px;}.ext-border-layout .x-border-east .x-collapsed-btn{background-position:0 -176px;}.ext-border-layout .x-border-west .x-collapsed-btn,.ext-border-layout .x-collapsed .x-collapsed-east{background-position:0 -192px;}.ext-border-layout .x-collapsed .x-collapsed-west{background-position:0 -176px;}.ext-border-layout .x-collapsed .x-border-body{display:none;}.ext-border-layout .x-layout-item-border{background-color:#fff;}
@@ -33,6 +33,13 @@
*display: inline;
*zoom: 1;
}
+.x-viewport-container {
+ overflow: hidden;
+}
+.ext-border-layout {
+ padding: 10px;
+ background-color: #3892d3;
+}
.ext-border-layout .x-border-north,
.ext-border-layout .x-border-east,
.ext-border-layout .x-border-west,
@@ -1,4 +1,9 @@
+.x-viewport-container{
+ overflow: hidden;
+}
.ext-border-layout{
+ padding: 10px;
+ background-color: #3892d3;
.x-border-north,.x-border-east,.x-border-west,.x-border-south,.x-border-center{
border : 1px solid #3892d3;
}
Oops, something went wrong.

0 comments on commit eeb1965

Please sign in to comment.