Browse Source

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

* commit 'eb378647a547e84aeecd6b1ca78518c983840f47':
  BI-48006 fix: IE下都用gif
es6
guy 5 years ago
parent
commit
f5b7ed040f
  1. 7
      public/css/background.css
  2. 5
      src/base/pane.js
  3. 7
      src/css/base/colorchooser/colorpicker/editor.css
  4. 7
      src/css/base/pane.css
  5. 7
      src/css/resource/background.css
  6. 6
      src/less/base/pane.less
  7. 4
      src/less/resource/background.less
  8. 7
      ui/css/background.css

7
public/css/background.css

@ -210,3 +210,10 @@
.trans-color-disabled-background.hack { .trans-color-disabled-background.hack {
background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/background/trans_disable.png') no-repeat center center; background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/background/trans_disable.png') no-repeat center center;
} }
.wave-loading {
background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/2x/icon/wave_loading.gif') no-repeat center center;
background-size: contain;
}
.wave-loading.hack {
background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/wave_loading.gif') no-repeat center center;
}

5
src/base/pane.js

@ -36,14 +36,15 @@ BI.Pane = BI.inherit(BI.Widget, {
loading: function () { loading: function () {
var self = this, o = this.options; var self = this, o = this.options;
var isIE = BI.isIE();
var loadingAnimation = BI.createWidget({ var loadingAnimation = BI.createWidget({
type: "bi.horizontal", type: "bi.horizontal",
cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""), cls: "bi-loading-widget" + (isIE ? " wave-loading hack" : ""),
height: 30, height: 30,
width: 30, width: 30,
hgap: 5, hgap: 5,
vgap: 2.5, vgap: 2.5,
items: [{ items: isIE ? [] : [{
type: "bi.layout", type: "bi.layout",
cls: "animate-rect rect1", cls: "animate-rect rect1",
height: 25, height: 25,

7
src/css/base/colorchooser/colorpicker/editor.css

@ -210,6 +210,13 @@
.trans-color-disabled-background.hack { .trans-color-disabled-background.hack {
background: url('images/1x/background/trans_disable.png') no-repeat center center; background: url('images/1x/background/trans_disable.png') no-repeat center center;
} }
.wave-loading {
background: url('images/2x/icon/wave_loading.gif') no-repeat center center;
background-size: contain;
}
.wave-loading.hack {
background: url('images/1x/icon/wave_loading.gif') no-repeat center center;
}
.bi-color-picker-editor .color-picker-editor-display { .bi-color-picker-editor .color-picker-editor-display {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;

7
src/css/base/pane.css

@ -122,10 +122,3 @@
transform: scaleY(1); transform: scaleY(1);
} }
} }
.bi-loading-widget.hack {
background: url('images/1x/icon/wave_loading.gif') no-repeat center center;
}
.bi-loading-widget.hack .animate-rect {
background-color: rgba(54, 133, 242, 0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#003685f2,endColorstr=#003685f2);
}

7
src/css/resource/background.css

@ -210,3 +210,10 @@
.trans-color-disabled-background.hack { .trans-color-disabled-background.hack {
background: url('images/1x/background/trans_disable.png') no-repeat center center; background: url('images/1x/background/trans_disable.png') no-repeat center center;
} }
.wave-loading {
background: url('images/2x/icon/wave_loading.gif') no-repeat center center;
background-size: contain;
}
.wave-loading.hack {
background: url('images/1x/icon/wave_loading.gif') no-repeat center center;
}

6
src/less/base/pane.less

@ -33,10 +33,4 @@
.transform (scaleY(1)); .transform (scaleY(1));
} }
}); });
&.hack {
.imagePath(@icon-wave-loading);
& .animate-rect {
.background-color(@background-color-highlight, 0%);
}
}
} }

4
src/less/resource/background.less

@ -307,4 +307,6 @@
&.hack{ &.hack{
.imagePath(@background-trans-color-disabled); .imagePath(@background-trans-color-disabled);
} }
} }
.background(wave-loading, @icon-wave-loading);

7
ui/css/background.css

@ -210,3 +210,10 @@
.trans-color-disabled-background.hack { .trans-color-disabled-background.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/background/trans_disable.png') no-repeat center center; background: url('resources?path=/com/fr/web/ui/images/1x/background/trans_disable.png') no-repeat center center;
} }
.wave-loading {
background: url('resources?path=/com/fr/web/ui/images/2x/icon/wave_loading.gif') no-repeat center center;
background-size: contain;
}
.wave-loading.hack {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/wave_loading.gif') no-repeat center center;
}

Loading…
Cancel
Save