Permalink
Browse files

Merge branch 'master' of git@github.com:tonytomov/jqGrid.git

  • Loading branch information...
2 parents 3bc44fb + 35c1d9c commit 7199172d9724b2373c35e2794acab8cff2fbb3b5 @tonytomov committed Oct 10, 2012
Showing with 13 additions and 4 deletions.
  1. +1 −1 js/grid.base.js
  2. +11 −2 js/grid.formedit.js
  3. +1 −1 js/i18n/grid.locale-fa.js
View
@@ -933,7 +933,7 @@ $.fn.jqGrid = function( pin ) {
return;
}
}
- $(this).empty().attr("tabindex","1");
+ $(this).empty().attr("tabindex","0");
this.p = p ;
this.p.useProp = !!$.fn.prop;
var i, dir;
View
@@ -2049,15 +2049,24 @@ $.jgrid.extend({
navSeparatorAdd:function (elem,p) {
p = $.extend({
sepclass : "ui-separator",
- sepcontent: ''
+ sepcontent: '',
+ position : "last"
}, p ||{});
return this.each(function() {
if( !this.grid) {return;}
if( typeof elem === "string" && elem.indexOf("#") !== 0) {elem = "#"+$.jgrid.jqID(elem);}
var findnav = $(".navtable",elem)[0];
if(findnav) {
var sep = "<td class='ui-pg-button ui-state-disabled' style='width:4px;'><span class='"+p.sepclass+"'></span>"+p.sepcontent+"</td>";
- $("tr",findnav).append(sep);
+ if (p.position === 'first') {
+ if (findnav.rows[0].cells.length === 0) {
+ $("tr", findnav).append(sep);
+ } else {
+ $("tr td:eq(0)", findnav).before(sep);
+ }
+ } else {
+ $("tr", findnav).append(sep);
+ }
}
});
},
@@ -70,7 +70,7 @@
addtext: " ",
addtitle: "افزودن رديف جديد",
deltext: " ",
- deltitle: "حذف ردبف هاي انتخاب شده",
+ deltitle: "حذف ردبف هاي انتیاب شده",
searchtext: " ",
searchtitle: "جستجوي رديف",
refreshtext: "",

0 comments on commit 7199172

Please sign in to comment.