Skip to content

Commit

Permalink
Update the build
Browse files Browse the repository at this point in the history
  • Loading branch information
tonytomov committed Jul 14, 2016
1 parent 0747671 commit e6a552c
Show file tree
Hide file tree
Showing 45 changed files with 63 additions and 55 deletions.
18 changes: 13 additions & 5 deletions js/jquery.jqGrid.js
Expand Up @@ -6819,7 +6819,11 @@ $.fn.jqFilter = function( arg ) {
groupButton : true,
ruleButtons : true,
uniqueSearchFields : false,
direction : "ltr"
direction : "ltr",
addsubgrup : "Add subgroup",
addrule : "Add rule",
delgroup : "Delete group",
delrule : "Delete rule"
}, $.jgrid.filter, arg || {});
return this.each( function() {
if (this.filter) {return;}
Expand Down Expand Up @@ -6983,7 +6987,7 @@ $.fn.jqFilter = function( arg ) {
// button for adding a new subgroup
var inputAddSubgroup ="<span></span>";
if(this.p.groupButton) {
inputAddSubgroup = $("<input type='button' value='+ {}' title='Add subgroup' class='add-group " + common.button + "'/>");
inputAddSubgroup = $("<input type='button' value='+ {}' title='" +that.p.subgroup+"' class='add-group " + common.button + "'/>");
inputAddSubgroup.on('click',function() {
if (group.groups === undefined ) {
group.groups = [];
Expand All @@ -7004,7 +7008,7 @@ $.fn.jqFilter = function( arg ) {
th.append(inputAddSubgroup);
if(this.p.ruleButtons === true) {
// button for adding a new rule
var inputAddRule = $("<input type='button' value='+' title='Add rule' class='add-rule ui-add " + common.button + "'/>"), cm;
var inputAddRule = $("<input type='button' value='+' title='"+that.p.addrule+"' class='add-rule ui-add " + common.button + "'/>"), cm;
inputAddRule.on('click',function() {
//if(!group) { group = {};}
if (group.rules === undefined) {
Expand Down Expand Up @@ -7045,7 +7049,7 @@ $.fn.jqFilter = function( arg ) {

// button for delete the group
if (parentgroup !== null) { // ignore the first group
var inputDeleteGroup = $("<input type='button' value='-' title='Delete group' class='delete-group " + common.button + "'/>");
var inputDeleteGroup = $("<input type='button' value='-' title='"+that.p.delgroup+"' class='delete-group " + common.button + "'/>");
th.append(inputDeleteGroup);
inputDeleteGroup.on('click',function() {
// remove group from parent
Expand Down Expand Up @@ -7305,7 +7309,7 @@ $.fn.jqFilter = function( arg ) {

// create button for: delete rule
if(this.p.ruleButtons === true) {
var ruleDeleteInput = $("<input type='button' value='-' title='Delete rule' class='delete-rule ui-del " + common.button + "'/>");
var ruleDeleteInput = $("<input type='button' value='-' title='"+that.p.delrule+"' class='delete-rule ui-del " + common.button + "'/>");
ruleDeleteTd.append(ruleDeleteInput);
//$(ruleDeleteInput).html("").height(20).width(30).button({icons: { primary: "ui-icon-minus", text:false}});
ruleDeleteInput.on('click',function() {
Expand Down Expand Up @@ -8258,6 +8262,10 @@ $.jgrid.extend({
operands : p.operands,
ajaxSelectOptions: $t.p.ajaxSelectOptions,
groupOps: p.groupOps,
addsubgrup : p.addsubgrup,
addrule : p.addrule,
delgroup : p.delgroup,
delrule : p.delrule,
onChange : function() {
if(this.p.showQuery) {
$('.query',this).html(this.toUserFriendlyString());
Expand Down
14 changes: 7 additions & 7 deletions js/jquery.jqGrid.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/jquery.jqGrid.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/minified/grid.filter.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/minified/i18n/grid.locale-ar.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e6a552c

Please sign in to comment.