← All changes | js/merchants.js +14 -11 1.0.2 → 1.4.3 View file →

		@@ -24,18 +24,18 @@
24	24
25	25	};
26	26
27	27	// Networks Settings Page
28		- $("#dfrapi_networks .group").click(function (e) {
	28	+ $("#dfrapi_networks .group").on("click", function (e) {
29	29	$(".networks", this).toggle(500);
30	30	e.preventDefault();
31	31	});
32	32
33		- $("#dfrapi_networks .group .networks").click(function(e) {
	33	+ $("#dfrapi_networks .group .networks").on("click", function (e) {
34	34	e.stopPropagation();
35	35	});
36	36
37		- $("#dfrapi_networks .group .networks .network .check_network").change(function(e) {
	37	+ $("#dfrapi_networks .group .networks .network .check_network").on("change", function(e) {
38	38	var parent = $(this).parent('td').parent('tr');
39	39	var id = parent.attr('id');
40	40	var nid = parent.attr('nid');
41	41	var key = parent.attr('key');
		@@ -42,12 +42,14 @@
42	42	var aid = parent.attr('aid');
43	43	var tid = parent.attr('tid');
44	44	if ($(this).prop('checked')) {
45	45	$("#" + id + " .aid_input").children().show();
	46	+ $("#" + id + " .tid_input").children().show();
46	47	} else {
47	48	$("#" + id + " .aid_input").children().hide();
	49	+ $("#" + id + " .tid_input").children().hide();
48	50	}
49		- }).change();
	51	+ }).trigger( "change" );
50	52
51	53	// Merchants Settings Page
52	54	var refreshSearch = function(e) {
53	55	$(e).closest(".network").find(".merchant_actions input").change();
		@@ -52,13 +54,13 @@
52	54	var refreshSearch = function(e) {
53	55	$(e).closest(".network").find(".merchant_actions input").change();
54	56	}
55	57
56		- $("#dfrapi_merchants .network .meta").click(function () {
	58	+ $("#dfrapi_merchants .network .meta").on("click", function () {
57	59	$(this).parent().find(".merchants").slideToggle(500);
58	60	});
59	61
60		- $("#dfrapi_merchants .hide_empty_merchants").click(function () {
	62	+ $("#dfrapi_merchants .hide_empty_merchants").on("click", function () {
61	63	var n = $(this).closest(".network");
62	64	n.find(".no_products").addClass("hidden");
63	65	n.find(".show_empty_merchants").show();
64	66	$(this).hide();
		@@ -65,9 +67,9 @@
65	67	refreshSearch(this);
66	68	return false;
67	69	});
68	70
69		- $("#dfrapi_merchants .show_empty_merchants").click(function () {
	71	+ $("#dfrapi_merchants .show_empty_merchants").on("click",function () {
70	72	var n = $(this).closest(".network");
71	73	n.find(".no_products").removeClass("hidden");
72	74	n.find(".hide_empty_merchants").show();
73	75	$(this).hide();
		@@ -98,19 +100,19 @@
98	100	});
99	101	$("#ids").val(ids.sort().join(","));
100	102	};
101	103
102		- $('#dfrapi_merchants .add_all').click(function () {
	104	+ $('#dfrapi_merchants .add_all').on("click", function () {
103	105	selMerchant(this, true, null);
104	106	return false;
105	107	});
106	108
107		- $('#dfrapi_merchants .remove_all').click(function () {
	109	+ $('#dfrapi_merchants .remove_all').on("click", function () {
108	110	selMerchant(this, false, null);
109	111	return false;
110	112	});
111	113
112		- $("#dfrapi_merchants .merchant").click(function() {
	114	+ $("#dfrapi_merchants .merchant").on("click", function() {
113	115	var isLeft = $(this).closest(".dfrapi_pane_left").length;
114	116	selMerchant(this, isLeft, this);
115	117	return false;
116	118	});
		@@ -120,13 +122,14 @@
120	122	$(this).searchFilter({
121	123	element: function() { return $(this).closest(".network").find(".merchant") },
122	124	subject: ".merchant_name",
123	125	highlight: "<span style='background: yellow'>",
	126	+ stepSize: 100,
124	127	after: function() { $(this).parent().find(".hidden").removeAttr("style") }
125	128	});
126	129	});
127	130
128		- $("#dfrapi_merchants .merchant_actions .reset_search").click(function() {
	131	+ $("#dfrapi_merchants .merchant_actions .reset_search").on("click", function() {
129	132	$(this).parent().find("input").val("").change();
130	133	return false;
131	134	});
132	135