projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bezier signature prototype
[roojs1]
/
roojs-bootstrap-debug.js
diff --git
a/roojs-bootstrap-debug.js
b/roojs-bootstrap-debug.js
index
d299698
..
0fae497
100644
(file)
--- a/
roojs-bootstrap-debug.js
+++ b/
roojs-bootstrap-debug.js
@@
-2671,14
+2671,7
@@
Roo.bootstrap.Modal = function(config){
* @param {Roo.bootstrap.Modal} this
* @param {Roo.EventObject} e
*/
* @param {Roo.bootstrap.Modal} this
* @param {Roo.EventObject} e
*/
- "resize" : true,
- /**
- * @event close
- * Fire when the top 'x' close button is pressed.
- * @param {Roo.bootstrap.Modal} this
- * @param {Roo.EventObject} e
- */
- "close" : true
+ "resize" : true
});
this.buttons = this.buttons || [];
});
this.buttons = this.buttons || [];
@@
-2817,7
+2810,7
@@
Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component, {
if(this.specificTitle){
title = this.title;
if(this.specificTitle){
title = this.title;
- }
;
+ }
var header = [];
if (this.allow_close && Roo.bootstrap.version == 3) {
var header = [];
if (this.allow_close && Roo.bootstrap.version == 3) {
@@
-2909,17
+2902,13
@@
Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component, {
initEvents : function()
{
if (this.allow_close) {
initEvents : function()
{
if (this.allow_close) {
- this.closeEl.on('click', this.
onClosePress
, this);
+ this.closeEl.on('click', this.
hide
, this);
}
Roo.EventManager.onWindowResize(this.resize, this, true);
},
}
Roo.EventManager.onWindowResize(this.resize, this, true);
},
-
- onClosePress : function()
- {
-
- },
+
resize : function()
{
resize : function()
{
@@
-2930,8
+2919,7
@@
Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component, {
if (this.fitwindow) {
if (this.fitwindow) {
- var view_height = Roo.lib.Dom.getViewportHeight(true);
-
+
this.setSize(
this.width || Roo.lib.Dom.getViewportWidth(true) - 30,
this.height || Roo.lib.Dom.getViewportHeight(true) // catering margin-top 30 margin-bottom 30
this.setSize(
this.width || Roo.lib.Dom.getViewportWidth(true) - 30,
this.height || Roo.lib.Dom.getViewportHeight(true) // catering margin-top 30 margin-bottom 30
@@
-2995,7
+2983,7
@@
Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component, {
Roo.get(document.body).addClass('modal-open');
if(this.animate){ // element has 'fade' - so stuff happens after .3s ?- not sure why the delay?
Roo.get(document.body).addClass('modal-open');
if(this.animate){ // element has 'fade' - so stuff happens after .3s ?- not sure why the delay?
- var _this = this;
+
(function(){
this.el.addClass('show');
this.el.addClass('in');
(function(){
this.el.addClass('show');
this.el.addClass('in');
@@
-3102,7
+3090,7
@@
Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component, {
{
this.dialogEl.setWidth(w);
{
this.dialogEl.setWidth(w);
- var diff = this.headerEl.getHeight() + this.footerEl.getHeight() +
3
0; // dialog margin-bottom: 30
+ var diff = this.headerEl.getHeight() + this.footerEl.getHeight() +
6
0; // dialog margin-bottom: 30
this.bodyEl.setHeight(h - diff);
this.bodyEl.setHeight(h - diff);
@@
-38393,7
+38381,7
@@
Roo.extend(Roo.bootstrap.panel.Tabs, Roo.util.Observable, {
*/
activate : function(id)
{
*/
activate : function(id)
{
- Roo.log('activite:' + id);
+
//
Roo.log('activite:' + id);
var tab = this.items[id];
if(!tab){
var tab = this.items[id];
if(!tab){