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

* commit '41179de20faf0c13878b28ca13b8824472608bf4':
  无JIRA任务 container
  update
  update
  无JIRA任务 container
  无JIRA任务 container
  BI-28479 combo的container少了

demo/js/base/button/demo.button.js

@@ -17,8 +17,7 @@ Demo.Button = BI.inherit(BI.Widget, {
                 level: "success",
                 height: 30
             }
-        },
+        }, {
-            {
             el: {
                 type: "bi.button",
                 text: "表示警告状态的按钮",
@@ -79,8 +78,7 @@ Demo.Button = BI.inherit(BI.Widget, {
                 level: "success",
                 height: 30
             }
-            },
+        }, {
-            {
             el: {
                 type: "bi.button",
                 text: "表示警告状态的按钮",
@@ -139,8 +137,7 @@ Demo.Button = BI.inherit(BI.Widget, {
                 level: "success",
                 height: 30
             }
-            },
+        }, {
-            {
             el: {
                 type: "bi.button",
                 text: "表示警告状态的按钮",
@@ -216,8 +213,7 @@ Demo.Button = BI.inherit(BI.Widget, {
                 },
                 height: 30
             }
-            }
+        }];
-        ];
         // BI.each(items, function (i, item) {
         //     item.el.handler = function () {
         //         BI.Msg.alert("按钮", this.options.text);

dist/demo.js

@@ -39,8 +39,7 @@ $(function () {
                 level: "success",
                 height: 30
             }
-        },
+        }, {
-            {
             el: {
                 type: "bi.button",
                 text: "表示警告状态的按钮",
@@ -101,8 +100,7 @@ $(function () {
                 level: "success",
                 height: 30
             }
-            },
+        }, {
-            {
             el: {
                 type: "bi.button",
                 text: "表示警告状态的按钮",
@@ -161,8 +159,7 @@ $(function () {
                 level: "success",
                 height: 30
             }
-            },
+        }, {
-            {
             el: {
                 type: "bi.button",
                 text: "表示警告状态的按钮",
@@ -238,8 +235,7 @@ $(function () {
                 },
                 height: 30
             }
-            }
+        }];
-        ];
         // BI.each(items, function (i, item) {
         //     item.el.handler = function () {
         //         BI.Msg.alert("按钮", this.options.text);

src/case/colorchooser/colorchooser.js

@@ -21,6 +21,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
         this.combo = BI.createWidget({
             type: "bi.combo",
             element: this,
+            container: o.container,
             adjustLength: 1,
             isNeedAdjustWidth: false,
             isNeedAdjustHeight: false,

src/case/colorchooser/colorchooser.simple.js

@@ -21,6 +21,7 @@ BI.SimpleColorChooser = BI.inherit(BI.Widget, {
         this.combo = BI.createWidget({
             type: "bi.color_chooser",
             element: this,
+            container: o.container,
             value: o.value,
             popup: {
                 type: "bi.simple_color_chooser_popup"

src/case/combo/bubblecombo/combo.bubble.js

@@ -36,6 +36,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
             element: this,
             trigger: o.trigger,
             toggle: o.toggle,
+            container: o.container,
             direction: o.direction,
             isDefaultInit: o.isDefaultInit,
             destroyWhenHide: o.destroyWhenHide,

src/case/combo/icontextvaluecombo/combo.icontextvalue.js

@@ -44,6 +44,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
         this.textIconCombo = BI.createWidget({
             type: "bi.combo",
             element: this,
+            container: o.container,
             adjustLength: 2,
             el: this.trigger,
             popup: {

src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

@@ -19,6 +19,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
             items: [{
                 el: {
                     type: "bi.combo",
+                    container: o.container,
                     adjustLength: 2,
                     toggle: false,
                     ref: function () {

src/case/combo/staticcombo/combo.static.js

@@ -45,6 +45,7 @@ BI.StaticCombo = BI.inherit(BI.Widget, {
             type: "bi.combo",
             element: this,
             adjustLength: 2,
+            container: o.container,
             el: this.trigger,
             popup: {
                 el: this.popup

src/case/richeditor/niceditor/niceditor.js

@@ -68,7 +68,7 @@
             var self = this;
             var found = false;
             do {
-                if (t.nodeName !== "svg" && t.className && t.className.indexOf(prefix) != -1) {
+                if (t.nodeName !== "svg" && t.className && t.className.indexOf && t.className.indexOf(prefix) != -1) {
                     return;
                     // return false;
                 }

src/widget/multiselect/multiselect.combo.js

@@ -119,6 +119,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
         this.combo = BI.createWidget({
             type: "bi.combo",
             toggle: false,
+            container: o.container,
             el: this.trigger,
             adjustLength: 1,
             popup: {

src/widget/multiselect/multiselect.insert.combo.js

@@ -114,6 +114,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             toggle: false,
             el: this.trigger,
             adjustLength: 1,
+            container: o.container,
             popup: {
                 type: "bi.multi_select_popup_view",
                 ref: function () {

src/widget/multiselect/multiselect.insert.combo.nobar.js

@@ -121,6 +121,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
         this.combo = BI.createWidget({
             type: "bi.combo",
             toggle: false,
+            container: o.container,
             el: this.trigger,
             adjustLength: 1,
             popup: {

src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

@@ -124,6 +124,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
         this.combo = BI.createWidget({
             type: "bi.combo",
             toggle: false,
+            container: o.container,
             el: this.trigger,
             adjustLength: 1,
             popup: {