← All changes | js/merchants.js +12 -11 1.0.21 → 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');
		@@ -47,9 +47,9 @@
47	47	} else {
48	48	$("#" + id + " .aid_input").children().hide();
49	49	$("#" + id + " .tid_input").children().hide();
50	50	}
51		- }).change();
	51	+ }).trigger( "change" );
52	52
53	53	// Merchants Settings Page
54	54	var refreshSearch = function(e) {
55	55	$(e).closest(".network").find(".merchant_actions input").change();
		@@ -54,13 +54,13 @@
54	54	var refreshSearch = function(e) {
55	55	$(e).closest(".network").find(".merchant_actions input").change();
56	56	}
57	57
58		- $("#dfrapi_merchants .network .meta").click(function () {
	58	+ $("#dfrapi_merchants .network .meta").on("click", function () {
59	59	$(this).parent().find(".merchants").slideToggle(500);
60	60	});
61	61
62		- $("#dfrapi_merchants .hide_empty_merchants").click(function () {
	62	+ $("#dfrapi_merchants .hide_empty_merchants").on("click", function () {
63	63	var n = $(this).closest(".network");
64	64	n.find(".no_products").addClass("hidden");
65	65	n.find(".show_empty_merchants").show();
66	66	$(this).hide();
		@@ -67,9 +67,9 @@
67	67	refreshSearch(this);
68	68	return false;
69	69	});
70	70
71		- $("#dfrapi_merchants .show_empty_merchants").click(function () {
	71	+ $("#dfrapi_merchants .show_empty_merchants").on("click",function () {
72	72	var n = $(this).closest(".network");
73	73	n.find(".no_products").removeClass("hidden");
74	74	n.find(".hide_empty_merchants").show();
75	75	$(this).hide();
		@@ -100,19 +100,19 @@
100	100	});
101	101	$("#ids").val(ids.sort().join(","));
102	102	};
103	103
104		- $('#dfrapi_merchants .add_all').click(function () {
	104	+ $('#dfrapi_merchants .add_all').on("click", function () {
105	105	selMerchant(this, true, null);
106	106	return false;
107	107	});
108	108
109		- $('#dfrapi_merchants .remove_all').click(function () {
	109	+ $('#dfrapi_merchants .remove_all').on("click", function () {
110	110	selMerchant(this, false, null);
111	111	return false;
112	112	});
113	113
114		- $("#dfrapi_merchants .merchant").click(function() {
	114	+ $("#dfrapi_merchants .merchant").on("click", function() {
115	115	var isLeft = $(this).closest(".dfrapi_pane_left").length;
116	116	selMerchant(this, isLeft, this);
117	117	return false;
118	118	});
		@@ -122,13 +122,14 @@
122	122	$(this).searchFilter({
123	123	element: function() { return $(this).closest(".network").find(".merchant") },
124	124	subject: ".merchant_name",
125	125	highlight: "<span style='background: yellow'>",
	126	+ stepSize: 100,
126	127	after: function() { $(this).parent().find(".hidden").removeAttr("style") }
127	128	});
128	129	});
129	130
130		- $("#dfrapi_merchants .merchant_actions .reset_search").click(function() {
	131	+ $("#dfrapi_merchants .merchant_actions .reset_search").on("click", function() {
131	132	$(this).parent().find("input").val("").change();
132	133	return false;
133	134	});
134	135