projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix menu item # triggering url change
[roojs1]
/
roojs-bootstrap-debug.js
diff --git
a/roojs-bootstrap-debug.js
b/roojs-bootstrap-debug.js
index
8a2a9f6
..
21ccfdf
100644
(file)
--- a/
roojs-bootstrap-debug.js
+++ b/
roojs-bootstrap-debug.js
@@
-3616,7
+3616,7
@@
Roo.bootstrap.menu.Manager = function(){
* @class Roo.bootstrap.menu.Menu
* @extends Roo.bootstrap.Component
* @licence LGPL
* @class Roo.bootstrap.menu.Menu
* @extends Roo.bootstrap.Component
* @licence LGPL
- * @children Roo.bootstrap.menu.Item
+ * @children Roo.bootstrap.menu.Item
Roo.bootstrap.menu.Separator
* @parent none
* Bootstrap Menu class - container for MenuItems - normally has to be added to a object that supports the menu property
*
* @parent none
* Bootstrap Menu class - container for MenuItems - normally has to be added to a object that supports the menu property
*
@@
-3624,8
+3624,8
@@
Roo.bootstrap.menu.Manager = function(){
* @cfg {bool} hidden if the menu should be hidden when rendered.
* @cfg {bool} stopEvent (true|false) Stop event after trigger press (default true)
* @cfg {bool} isLink (true|false) the menu has link disable auto expand and collaspe (default false)
* @cfg {bool} hidden if the menu should be hidden when rendered.
* @cfg {bool} stopEvent (true|false) Stop event after trigger press (default true)
* @cfg {bool} isLink (true|false) the menu has link disable auto expand and collaspe (default false)
-
* @cfg {bool} hideTrigger (true|false) default false - hide the carret for trigger.
-
* @cfg {String} align default tl-bl? == below - how the menu should be aligned.
+* @cfg {bool} hideTrigger (true|false) default false - hide the carret for trigger.
+* @cfg {String} align default tl-bl? == below - how the menu should be aligned.
* @constructor
* Create a new Menu
* @constructor
* Create a new Menu
@@
-4198,9
+4198,9
@@
Roo.extend(Roo.bootstrap.menu.Item, Roo.bootstrap.Component, {
},
onClick : function(e)
{
},
onClick : function(e)
{
- Roo.log('item on click ');
+
//
Roo.log('item on click ');
- if(this.preventDefault){
+ if(this.
href === false || this.
preventDefault){
e.preventDefault();
}
//this.parent().hideMenuItems();
e.preventDefault();
}
//this.parent().hideMenuItems();
@@
-16245,14
+16245,10
@@
Roo.extend(Roo.data.HttpProxy, Roo.data.DataProxy, {
try {
result = o.reader.read(response);
}catch(e){
try {
result = o.reader.read(response);
}catch(e){
+ o.success = false;
+ o.raw = { errorMsg : response.responseText };
this.fireEvent("loadexception", this, o, response, e);
this.fireEvent("loadexception", this, o, response, e);
- o.request.callback.call(o.request.scope, {
- success : false,
- raw : {
- errorMsg : response.responseText
- }
-
- }, o.request.arg, false);
+ o.request.callback.call(o.request.scope, o, o.request.arg, false);
return;
}
return;
}
@@
-28783,7
+28779,7
@@
Roo.extend(Roo.bootstrap.PagingToolbar, Roo.bootstrap.nav.Simplebar, {
},
// private
},
// private
- onLoadError : function(o){
+ onLoadError : function(
proxy,
o){
this.loading.enable();
if (this.ds.events.loadexception.listeners.length < 2) {
// nothing has been assigned to loadexception except this...
this.loading.enable();
if (this.ds.events.loadexception.listeners.length < 2) {
// nothing has been assigned to loadexception except this...