Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fineui

# Conflicts:
#	dist/bundle.js
#	dist/bundle.min.js
#	dist/fineui.js
#	dist/fineui.min.js
#	dist/utils.min.js
#	dist/widget.js

dist/core.js

@@ -18554,6 +18554,7 @@ BI.ShowListener = BI.inherit(BI.OB, {
     _init: function () {
         BI.ShowListener.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
+        if (o.eventObj) {
             o.eventObj.on(BI.Controller.EVENT_CHANGE, function (type, v, ob) {
                 if (type === BI.Events.CLICK) {
                     v = v || o.eventObj.getValue();
@@ -18575,6 +18576,7 @@ BI.ShowListener = BI.inherit(BI.OB, {
                 }
             });
         }
+    }
 });
 BI.ShowListener.EVENT_CHANGE = "ShowListener.EVENT_CHANGE";/**
  * style加载管理器

dist/fineui_without_jquery_polyfill.js

@@ -18300,6 +18300,7 @@ BI.ShowListener = BI.inherit(BI.OB, {
     _init: function () {
         BI.ShowListener.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
+        if (o.eventObj) {
             o.eventObj.on(BI.Controller.EVENT_CHANGE, function (type, v, ob) {
                 if (type === BI.Events.CLICK) {
                     v = v || o.eventObj.getValue();
@@ -18321,6 +18322,7 @@ BI.ShowListener = BI.inherit(BI.OB, {
                 }
             });
         }
+    }
 });
 BI.ShowListener.EVENT_CHANGE = "ShowListener.EVENT_CHANGE";/**
  * style加载管理器

dist/utils.js

@@ -15906,7 +15906,8 @@ BI.Date._OFFSET = [0, -1, -2, -3, -4, -5, -6];BI.i18n = {
     "BI-Basic_Minute": "分",
     "BI-Basic_Wan": "万",
     "BI-Basic_Million": "百万",
-    "BI-Basic_Billion": "亿"
+    "BI-Basic_Billion": "亿",
+    "BI-Basic_Quarter": "季度"
 };/**
  * 缓冲池
  * @type {{Buffer: {}}}

public/js/fineui.i18n.js

@@ -183,5 +183,6 @@ BI.i18n = {
     "BI-Basic_Minute": "分",
     "BI-Basic_Wan": "万",
     "BI-Basic_Million": "百万",
-    "BI-Basic_Billion": "亿"
+    "BI-Basic_Billion": "亿",
+    "BI-Basic_Quarter": "季度"
 };

src/core/listener/listener.show.js

@@ -22,6 +22,7 @@ BI.ShowListener = BI.inherit(BI.OB, {
     _init: function () {
         BI.ShowListener.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
+        if (o.eventObj) {
             o.eventObj.on(BI.Controller.EVENT_CHANGE, function (type, v, ob) {
                 if (type === BI.Events.CLICK) {
                     v = v || o.eventObj.getValue();
@@ -43,5 +44,6 @@ BI.ShowListener = BI.inherit(BI.OB, {
                 }
             });
         }
+    }
 });
 BI.ShowListener.EVENT_CHANGE = "ShowListener.EVENT_CHANGE";