roojs-ui.js

[roojs1] / roojs-ui-debug.js

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 864302c..272ebf1 100644 (file)
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -10364,7 +10364,6 @@ Roo.extend(Roo.BasicDialog, Roo.util.Observable, {
     // private
     // z-index is managed by the DialogManager and may be overwritten at any time
     setZIndex : function(index){
-        console.log('run????');
         if(this.modal){
             this.mask.setStyle("z-index", index);
         }
@@ -10383,8 +10382,6 @@ Roo.extend(Roo.BasicDialog, Roo.util.Observable, {
         }
 
         this.lastZIndex = index;
-        
-        Roo.BasicDialog.lastZIndex = this.lastZIndex;
     },
 
     /**
@@ -10639,10 +10636,6 @@ Roo.extend(Roo.LayoutDialog, Roo.BasicDialog, {
     addxtype : function(c) {
         return this.layout.addxtype(c);
     }
-});
-
-Roo.apply(Roo.BasicDialog,  {
-    lastZIndex : 100
 });/*
  * Based on:
  * Ext JS Library 1.1.1
@@ -24497,12 +24490,14 @@ Roo.extend(Roo.form.BasicForm, Roo.util.Observable, {
         var target = false;
         this.items.each(function(f){
             if(f.validate()){
-                valid = false;
+                return;
+            }
+            
+            valid = false;
                 
-                if(!target && f.el.isVisible(true)){
-                    target = f;
-                }
-           }
+            if(!target && f.el.isVisible(true)){
+                target = f;
+            }
         });
         
         if(this.errorMask && !valid){
@@ -25042,8 +25037,6 @@ Roo.apply(Roo.form.BasicForm, {
         
         target : false,
         
-        toolTip : false,
-        
         intervalID : false,
         
         maskEl : false,
@@ -25066,20 +25059,6 @@ Roo.apply(Roo.form.BasicForm, {
             this.maskEl.bottom.enableDisplayMode("block");
             this.maskEl.right.enableDisplayMode("block");
             
-//            this.toolTip = new Roo.bootstrap.Tooltip({
-//                cls : 'roo-form-error-popover',
-//                alignment : {
-//                    'left' : ['r-l', [-2,0], 'right'],
-//                    'right' : ['l-r', [2,0], 'left'],
-//                    'bottom' : ['tl-bl', [0,2], 'top'],
-//                    'top' : [ 'bl-tl', [0,-2], 'bottom']
-//                }
-//            });
-//            
-//            this.toolTip.render(Roo.get(document.body));
-//
-//            this.toolTip.el.enableDisplayMode("block");
-            
             Roo.get(document.body).on('click', function(){
                 this.unmask();
             }, this);
@@ -25103,8 +25082,6 @@ Roo.apply(Roo.form.BasicForm, {
             
             var scrollable = this.target.el.findScrollableParent() || this.target.el.findParent('div.x-layout-active-content', 100, true) || Roo.get(document.body);
             
-            Roo.log(scrollable);
-            
             var ot = this.target.el.calcOffsetsTo(scrollable);
             
             var scrollTo = ot[1] - this.form.maskOffset;
@@ -25113,58 +25090,40 @@ Roo.apply(Roo.form.BasicForm, {
             
             scrollable.scrollTo('top', scrollTo);
             
-            var box = this.target.el.getBox();
-            Roo.log(box);
-            var zIndex = Roo.bootstrap.Modal.zIndex++;
-
+            var el = this.target.wrap || this.target.el;
+            
+            var box = el.getBox();
             
             this.maskEl.top.setStyle('position', 'absolute');
-            this.maskEl.top.setStyle('z-index', zIndex);
+            this.maskEl.top.setStyle('z-index', 10000);
             this.maskEl.top.setSize(Roo.lib.Dom.getDocumentWidth(), box.y - this.padding);
             this.maskEl.top.setLeft(0);
             this.maskEl.top.setTop(0);
             this.maskEl.top.show();
             
             this.maskEl.left.setStyle('position', 'absolute');
-            this.maskEl.left.setStyle('z-index', zIndex);
+            this.maskEl.left.setStyle('z-index', 10000);
             this.maskEl.left.setSize(box.x - this.padding, box.height + this.padding * 2);
             this.maskEl.left.setLeft(0);
             this.maskEl.left.setTop(box.y - this.padding);
             this.maskEl.left.show();
 
             this.maskEl.bottom.setStyle('position', 'absolute');
-            this.maskEl.bottom.setStyle('z-index', zIndex);
+            this.maskEl.bottom.setStyle('z-index', 10000);
             this.maskEl.bottom.setSize(Roo.lib.Dom.getDocumentWidth(), Roo.lib.Dom.getDocumentHeight() - box.bottom - this.padding);
             this.maskEl.bottom.setLeft(0);
             this.maskEl.bottom.setTop(box.bottom + this.padding);
             this.maskEl.bottom.show();
 
             this.maskEl.right.setStyle('position', 'absolute');
-            this.maskEl.right.setStyle('z-index', zIndex);
+            this.maskEl.right.setStyle('z-index', 10000);
             this.maskEl.right.setSize(Roo.lib.Dom.getDocumentWidth() - box.right - this.padding, box.height + this.padding * 2);
             this.maskEl.right.setLeft(box.right + this.padding);
             this.maskEl.right.setTop(box.y - this.padding);
             this.maskEl.right.show();
 
-            this.toolTip.bindEl = this.target.el;
-
-            this.toolTip.el.setStyle('z-index', Roo.bootstrap.Modal.zIndex++);
-
-            var tip = this.target.blankText;
-
-            if(this.target.getValue() !== '' ) {
-                
-                if (this.target.invalidText.length) {
-                    tip = this.target.invalidText;
-                } else if (this.target.regexText.length){
-                    tip = this.target.regexText;
-                }
-            }
-
-            this.toolTip.show(tip);
-
             this.intervalID = window.setInterval(function() {
-                Roo.bootstrap.Form.popover.unmask();
+                Roo.form.BasicForm.popover.unmask();
             }, 10000);
 
             window.onwheel = function(){ return false;};
@@ -25195,10 +25154,6 @@ Roo.apply(Roo.form.BasicForm, {
             this.maskEl.right.setSize(0, 0).setXY([0, 0]);
             this.maskEl.right.hide();
             
-//            this.toolTip.hide();
-            
-//            this.toolTip.el.hide();
-            
             window.onwheel = function(){ return true;};
             
             if(this.intervalID){