Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/oria/gridx
Browse files Browse the repository at this point in the history
  • Loading branch information
bingjianguo committed Jun 13, 2014
2 parents eea700d + 5d7f6c7 commit c4238e6
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ define([
// - revision: Number: The Git rev from which dojo was pulled
major: 1,
minor: 3,
patch: 0,
patch: 2,
flag: "",
toString: function(){
return this.major + "." + this.minor + "." + this.patch + this.flag; // String
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gridx",
"version": "1.3.1",
"version": "1.3.2",
"dependencies": {
"dojo": ">=1.9.1",
"dijit": ">=1.9.1",
Expand Down
20 changes: 17 additions & 3 deletions modules/Bar.js
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,10 @@ define([
},

_doBlur: function(node, evt, step){
var elems = a11y._getTabNavigable(node),
first = elems.first,
last = elems.last, result;

function isChild(child, parent){
if(!child || !parent){ return false; }
var n = child;
Expand All @@ -327,9 +331,19 @@ define([
}
return !!n;
}
var elems = a11y._getTabNavigable(node);
return evt ? (evt.target == (step < 0 ? elems.first : elems.last)
|| isChild(evt.target, step < 0 ? elems.first : elems.last)) : true;

if(!evt){
return true;
}
if(step > 0 && !last){
return true;
}
if(step < 0 && !first){
return true;
}

result = (evt.target == (step < 0 ? elems.first : elems.last)) || isChild(evt.target, step < 0 ? elems.first : elems.last);
return result;
}
}));
});
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"dijit": "https://github.com/dojo/dijit/zipball/1.9.1",
"dojox": "https://github.com/dojo/dojox/zipball/1.9.1"
},
"version": "1.3.1",
"version": "1.3.2",
"maintainers":[
{
"name": "Xiao Wen Zhu(Oliver)",
Expand Down
12 changes: 12 additions & 0 deletions tests/test_grid_bar.html
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,17 @@ <h2>SummaryBar as a module</h2>
"gridx/modules/SummaryBar"
]
'></div>
<h2>Empty Toolbar</h2>
<div id='grid5' jsid='grid5' data-dojo-type='gridx.Grid' data-dojo-props='
cacheClass: "gridx/core/model/cache/Sync",
store: store,
structure: layout,
selectRowTriggerOnCell: true,
modules: [
"gridx/modules/extendedSelect/Row",
"gridx/modules/IndirectSelectColumn",
"gridx/modules/ToolBar"
]
'></div>
</body>
</html>

0 comments on commit c4238e6

Please sign in to comment.