caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #1055 in VISUAL/fineui from ~WINDY/fineui:master to master 

* commit 'f9c81b248e2b67a16742b2f45fa00e63a64fa1d4':
  去掉thumb的宽高试试
es6
windy 5 years ago
parent
56c53e6446 f9c81b248e
commit
590d25b25f
17 changed files with 111 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      dist/2.0/fineui.css
  2. 17
      dist/2.0/fineui.ie.js
  3. 17
      dist/2.0/fineui.js
  4. 4
      dist/bundle.css
  5. 17
      dist/bundle.ie.js
  6. 17
      dist/bundle.js
  7. 15
      dist/case.js
  8. 2
      dist/core.js
  9. 4
      dist/fineui.css
  10. 17
      dist/fineui.ie.js
  11. 17
      dist/fineui.js
  12. 15
      dist/fineui_without_jquery_polyfill.js
  13. 4
      dist/resource.css
  14. 4
      public/css/app.css
  15. 4
      src/css/resource/app.css
  16. 4
      src/less/resource/app.less
  17. 4
      ui/css/app.css

4
dist/2.0/fineui.css vendored
Unescape View File

@ -4669,8 +4669,6 @@ textarea::-webkit-scrollbar {
}
div::-webkit-scrollbar-track,
textarea::-webkit-scrollbar-track {
width: 10px;
height: 10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
@ -4684,8 +4682,6 @@ textarea::-webkit-scrollbar-track:hover {
}
div::-webkit-scrollbar-thumb,
textarea::-webkit-scrollbar-thumb {
width: 6px;
height: 6px;
border: 2px solid transparent;
background-clip: padding-box;
-webkit-border-radius: 10px;

17
dist/2.0/fineui.ie.js vendored
Unescape View File

@ -21696,7 +21696,7 @@ BI.prepares.push(function () {
var addResizeListener = function (element, fn) {
if (attachEvent) {
element.attachEvent("onresize", fn);
fn();
BI.nextTick(fn);
} else {
if (!element.__resizeTriggers__) {
if (getComputedStyle(element).position === "static") element.style.position = "relative";
@ -56859,10 +56859,16 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
ref: function () {
self.editor = this;
},
text: this._digest(o.value, o.items),
text: this._getText(),
value: o.value,
height: o.height,
tipText: ""
tipText: "",
listeners: [{
eventName: BI.Events.MOUNT,
action: function () {
self.editor.setState(self._digest(o.value, o.items));
}
}]
},
popup: {
type: "bi.search_text_value_combo_popup",
@ -56897,6 +56903,11 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
this.editor.setState(v);
},
_getText: function () {
var o = this.options;
return (BI.isKey(o.value) && o.text === this._digest(o.value, o.items)) ? "" : o.text;
},
_digest: function(vals, items){
var o = this.options;
vals = BI.isArray(vals) ? vals : [vals];

17
dist/2.0/fineui.js vendored
Unescape View File

@ -21696,7 +21696,7 @@ BI.prepares.push(function () {
var addResizeListener = function (element, fn) {
if (attachEvent) {
element.attachEvent("onresize", fn);
fn();
BI.nextTick(fn);
} else {
if (!element.__resizeTriggers__) {
if (getComputedStyle(element).position === "static") element.style.position = "relative";
@ -57263,10 +57263,16 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
ref: function () {
self.editor = this;
},
text: this._digest(o.value, o.items),
text: this._getText(),
value: o.value,
height: o.height,
tipText: ""
tipText: "",
listeners: [{
eventName: BI.Events.MOUNT,
action: function () {
self.editor.setState(self._digest(o.value, o.items));
}
}]
},
popup: {
type: "bi.search_text_value_combo_popup",
@ -57301,6 +57307,11 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
this.editor.setState(v);
},
_getText: function () {
var o = this.options;
return (BI.isKey(o.value) && o.text === this._digest(o.value, o.items)) ? "" : o.text;
},
_digest: function(vals, items){
var o = this.options;
vals = BI.isArray(vals) ? vals : [vals];

4
dist/bundle.css vendored
Unescape View File

@ -4669,8 +4669,6 @@ textarea::-webkit-scrollbar {
}
div::-webkit-scrollbar-track,
textarea::-webkit-scrollbar-track {
width: 10px;
height: 10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
@ -4684,8 +4682,6 @@ textarea::-webkit-scrollbar-track:hover {
}
div::-webkit-scrollbar-thumb,
textarea::-webkit-scrollbar-thumb {
width: 6px;
height: 6px;
border: 2px solid transparent;
background-clip: padding-box;
-webkit-border-radius: 10px;

17
dist/bundle.ie.js vendored
Unescape View File

@ -21696,7 +21696,7 @@ BI.prepares.push(function () {
var addResizeListener = function (element, fn) {
if (attachEvent) {
element.attachEvent("onresize", fn);
fn();
BI.nextTick(fn);
} else {
if (!element.__resizeTriggers__) {
if (getComputedStyle(element).position === "static") element.style.position = "relative";
@ -56859,10 +56859,16 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
ref: function () {
self.editor = this;
},
text: this._digest(o.value, o.items),
text: this._getText(),
value: o.value,
height: o.height,
tipText: ""
tipText: "",
listeners: [{
eventName: BI.Events.MOUNT,
action: function () {
self.editor.setState(self._digest(o.value, o.items));
}
}]
},
popup: {
type: "bi.search_text_value_combo_popup",
@ -56897,6 +56903,11 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
this.editor.setState(v);
},
_getText: function () {
var o = this.options;
return (BI.isKey(o.value) && o.text === this._digest(o.value, o.items)) ? "" : o.text;
},
_digest: function(vals, items){
var o = this.options;
vals = BI.isArray(vals) ? vals : [vals];

17
dist/bundle.js vendored
Unescape View File

@ -21696,7 +21696,7 @@ BI.prepares.push(function () {
var addResizeListener = function (element, fn) {
if (attachEvent) {
element.attachEvent("onresize", fn);
fn();
BI.nextTick(fn);
} else {
if (!element.__resizeTriggers__) {
if (getComputedStyle(element).position === "static") element.style.position = "relative";
@ -57263,10 +57263,16 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
ref: function () {
self.editor = this;
},
text: this._digest(o.value, o.items),
text: this._getText(),
value: o.value,
height: o.height,
tipText: ""
tipText: "",
listeners: [{
eventName: BI.Events.MOUNT,
action: function () {
self.editor.setState(self._digest(o.value, o.items));
}
}]
},
popup: {
type: "bi.search_text_value_combo_popup",
@ -57301,6 +57307,11 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
this.editor.setState(v);
},
_getText: function () {
var o = this.options;
return (BI.isKey(o.value) && o.text === this._digest(o.value, o.items)) ? "" : o.text;
},
_digest: function(vals, items){
var o = this.options;
vals = BI.isArray(vals) ? vals : [vals];

15
dist/case.js vendored
Unescape View File

@ -4839,10 +4839,16 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
ref: function () {
self.editor = this;
},
text: this._digest(o.value, o.items),
text: this._getText(),
value: o.value,
height: o.height,
tipText: ""
tipText: "",
listeners: [{
eventName: BI.Events.MOUNT,
action: function () {
self.editor.setState(self._digest(o.value, o.items));
}
}]
},
popup: {
type: "bi.search_text_value_combo_popup",
@ -4877,6 +4883,11 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
this.editor.setState(v);
},
_getText: function () {
var o = this.options;
return (BI.isKey(o.value) && o.text === this._digest(o.value, o.items)) ? "" : o.text;
},
_digest: function(vals, items){
var o = this.options;
vals = BI.isArray(vals) ? vals : [vals];

2
dist/core.js vendored
Unescape View File

@ -21696,7 +21696,7 @@ BI.prepares.push(function () {
var addResizeListener = function (element, fn) {
if (attachEvent) {
element.attachEvent("onresize", fn);
fn();
BI.nextTick(fn);
} else {
if (!element.__resizeTriggers__) {
if (getComputedStyle(element).position === "static") element.style.position = "relative";

4
dist/fineui.css vendored
Unescape View File

@ -4669,8 +4669,6 @@ textarea::-webkit-scrollbar {
}
div::-webkit-scrollbar-track,
textarea::-webkit-scrollbar-track {
width: 10px;
height: 10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
@ -4684,8 +4682,6 @@ textarea::-webkit-scrollbar-track:hover {
}
div::-webkit-scrollbar-thumb,
textarea::-webkit-scrollbar-thumb {
width: 6px;
height: 6px;
border: 2px solid transparent;
background-clip: padding-box;
-webkit-border-radius: 10px;

17
dist/fineui.ie.js vendored
Unescape View File

@ -21941,7 +21941,7 @@ BI.prepares.push(function () {
var addResizeListener = function (element, fn) {
if (attachEvent) {
element.attachEvent("onresize", fn);
fn();
BI.nextTick(fn);
} else {
if (!element.__resizeTriggers__) {
if (getComputedStyle(element).position === "static") element.style.position = "relative";
@ -57104,10 +57104,16 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
ref: function () {
self.editor = this;
},
text: this._digest(o.value, o.items),
text: this._getText(),
value: o.value,
height: o.height,
tipText: ""
tipText: "",
listeners: [{
eventName: BI.Events.MOUNT,
action: function () {
self.editor.setState(self._digest(o.value, o.items));
}
}]
},
popup: {
type: "bi.search_text_value_combo_popup",
@ -57142,6 +57148,11 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
this.editor.setState(v);
},
_getText: function () {
var o = this.options;
return (BI.isKey(o.value) && o.text === this._digest(o.value, o.items)) ? "" : o.text;
},
_digest: function(vals, items){
var o = this.options;
vals = BI.isArray(vals) ? vals : [vals];

17
dist/fineui.js vendored
Unescape View File

@ -21941,7 +21941,7 @@ BI.prepares.push(function () {
var addResizeListener = function (element, fn) {
if (attachEvent) {
element.attachEvent("onresize", fn);
fn();
BI.nextTick(fn);
} else {
if (!element.__resizeTriggers__) {
if (getComputedStyle(element).position === "static") element.style.position = "relative";
@ -57508,10 +57508,16 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
ref: function () {
self.editor = this;
},
text: this._digest(o.value, o.items),
text: this._getText(),
value: o.value,
height: o.height,
tipText: ""
tipText: "",
listeners: [{
eventName: BI.Events.MOUNT,
action: function () {
self.editor.setState(self._digest(o.value, o.items));
}
}]
},
popup: {
type: "bi.search_text_value_combo_popup",
@ -57546,6 +57552,11 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
this.editor.setState(v);
},
_getText: function () {
var o = this.options;
return (BI.isKey(o.value) && o.text === this._digest(o.value, o.items)) ? "" : o.text;
},
_digest: function(vals, items){
var o = this.options;
vals = BI.isArray(vals) ? vals : [vals];

15
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -40390,10 +40390,16 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
ref: function () {
self.editor = this;
},
text: this._digest(o.value, o.items),
text: this._getText(),
value: o.value,
height: o.height,
tipText: ""
tipText: "",
listeners: [{
eventName: BI.Events.MOUNT,
action: function () {
self.editor.setState(self._digest(o.value, o.items));
}
}]
},
popup: {
type: "bi.search_text_value_combo_popup",
@ -40428,6 +40434,11 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
this.editor.setState(v);
},
_getText: function () {
var o = this.options;
return (BI.isKey(o.value) && o.text === this._digest(o.value, o.items)) ? "" : o.text;
},
_digest: function(vals, items){
var o = this.options;
vals = BI.isArray(vals) ? vals : [vals];

4
dist/resource.css vendored
Unescape View File

@ -35,8 +35,6 @@ textarea::-webkit-scrollbar {
}
div::-webkit-scrollbar-track,
textarea::-webkit-scrollbar-track {
width: 10px;
height: 10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
@ -50,8 +48,6 @@ textarea::-webkit-scrollbar-track:hover {
}
div::-webkit-scrollbar-thumb,
textarea::-webkit-scrollbar-thumb {
width: 6px;
height: 6px;
border: 2px solid transparent;
background-clip: padding-box;
-webkit-border-radius: 10px;

4
public/css/app.css
Unescape View File

@ -35,8 +35,6 @@ textarea::-webkit-scrollbar {
}
div::-webkit-scrollbar-track,
textarea::-webkit-scrollbar-track {
width: 10px;
height: 10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
@ -50,8 +48,6 @@ textarea::-webkit-scrollbar-track:hover {
}
div::-webkit-scrollbar-thumb,
textarea::-webkit-scrollbar-thumb {
width: 6px;
height: 6px;
border: 2px solid transparent;
background-clip: padding-box;
-webkit-border-radius: 10px;

4
src/css/resource/app.css
Unescape View File

@ -35,8 +35,6 @@ textarea::-webkit-scrollbar {
}
div::-webkit-scrollbar-track,
textarea::-webkit-scrollbar-track {
width: 10px;
height: 10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
@ -50,8 +48,6 @@ textarea::-webkit-scrollbar-track:hover {
}
div::-webkit-scrollbar-thumb,
textarea::-webkit-scrollbar-thumb {
width: 6px;
height: 6px;
border: 2px solid transparent;
background-clip: padding-box;
-webkit-border-radius: 10px;

4
src/less/resource/app.less
Unescape View File

@ -33,8 +33,6 @@ div, textarea {
height: 10px;
}
&::-webkit-scrollbar-track {
width: 10px;
height: 10px;
.border-radius(5px);
.background-color(@scroll-color, 5%);
&:hover {
@ -42,8 +40,6 @@ div, textarea {
}
}
&::-webkit-scrollbar-thumb {
width: 6px;
height: 6px;
border: 2px solid transparent;
background-clip: padding-box;
.border-radius(10px);

4
ui/css/app.css
Unescape View File

@ -35,8 +35,6 @@ textarea::-webkit-scrollbar {
}
div::-webkit-scrollbar-track,
textarea::-webkit-scrollbar-track {
width: 10px;
height: 10px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
@ -50,8 +48,6 @@ textarea::-webkit-scrollbar-track:hover {
}
div::-webkit-scrollbar-thumb,
textarea::-webkit-scrollbar-thumb {
width: 6px;
height: 6px;
border: 2px solid transparent;
background-clip: padding-box;
-webkit-border-radius: 10px;

Write Preview
Loading…
Cancel
Save