Skip to content

Commit 8e6d83d

Browse files
author
Mark Vincent
authored
Merge pull request #12 from WildcardSearch/major-18
2.0 Release
2 parents 713ac3b + 7067983 commit 8e6d83d

File tree

5 files changed

+56
-59
lines changed

5 files changed

+56
-59
lines changed

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
## YourCode 1.1.1
1+
## YourCode 2.0
2+
for MyBB 1.8.x
23

34
*Forget MyCode. Take control of YourCode-- a much better way of handling BB Code for MyBB forums*
45

‎Upload/admin/jscripts/yourcode/yourcode_inline.js

+16-16
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ var YourCode = (function(yc) {
3434
*/
3535
function init() {
3636
initialCount();
37-
$('yc_select_all').observe('click', selectAll);
38-
$$('.yc_check').invoke('observe', 'click', keepCount);
39-
$('yc_inline_clear').observe('click', clearAll);
40-
$('yc_inline_submit').observe('click', submitCheck);
37+
$('#yc_select_all').click(selectAll);
38+
$('.yc_check').click(keepCount);
39+
$('#yc_inline_clear').click(clearAll);
40+
$('#yc_inline_submit').click(submitCheck);
4141
}
4242

4343
/**
@@ -47,7 +47,7 @@ var YourCode = (function(yc) {
4747
* @return void
4848
*/
4949
function setup(language) {
50-
Object.extend(lang, language || {});
50+
$.extend(lang, language || {});
5151
}
5252

5353
/**
@@ -58,8 +58,8 @@ var YourCode = (function(yc) {
5858
*/
5959
function submitCheck(e) {
6060
if (!checkCount) {
61-
Event.stop(e);
62-
alert(lang.noSelection);
61+
e.preventDefault();
62+
$.jGrowl(lang.noSelection);
6363
}
6464
}
6565

@@ -72,7 +72,7 @@ var YourCode = (function(yc) {
7272
function selectAll(e) {
7373
var onOff = false;
7474

75-
if(this.checked) {
75+
if($(this).prop("checked")) {
7676
onOff = true;
7777
}
7878
setAllChecks(onOff);
@@ -89,9 +89,9 @@ var YourCode = (function(yc) {
8989
onOff = false;
9090
}
9191
checkCount = 0;
92-
$('yc_select_all').checked = onOff;
93-
$$('.yc_check').each(function(check) {
94-
check.checked = onOff;
92+
$('#yc_select_all').prop("checked", onOff);
93+
$('.yc_check').each(function(k, check) {
94+
$(check).prop("checked", onOff);
9595
if (onOff) {
9696
++checkCount;
9797
}
@@ -106,7 +106,7 @@ var YourCode = (function(yc) {
106106
* @return void
107107
*/
108108
function keepCount(e) {
109-
if(this.checked) {
109+
if(this.prop("checked")) {
110110
++checkCount;
111111
} else {
112112
--checkCount;
@@ -120,7 +120,7 @@ var YourCode = (function(yc) {
120120
* @return void
121121
*/
122122
function updateCheckCount() {
123-
$('yc_inline_submit').value = lang.go + ' (' + checkCount + ')';
123+
$('#yc_inline_submit').val(lang.go + ' (' + checkCount + ')');
124124
}
125125

126126
/**
@@ -140,15 +140,15 @@ var YourCode = (function(yc) {
140140
*/
141141
function initialCount() {
142142
checkCount = 0;
143-
$$('.yc_check').each(function(check) {
144-
if (check.checked) {
143+
$('.yc_check').each(function(k, check) {
144+
if ($(check).prop("checked")) {
145145
++checkCount;
146146
}
147147
});
148148
updateCheckCount();
149149
}
150150

151-
Event.observe(window, 'load', init);
151+
$(document).ready(init);
152152

153153
// the public method
154154
yc.inline = {

‎Upload/admin/jscripts/yourcode/yourcode_sandbox.js

+21-25
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var YourCode = (function(yc) {
2424
function Sandbox(url, elements) {
2525
var allGood = true;
2626

27-
['button', 'regexTextbox', 'replacementTextbox', 'testTextbox', 'htmlTextbox', 'actualDiv', 'nestableInput', 'caseSensitiveInput', 'singleLineInput', 'multiLineInput', 'evalInput'].each(function(key) {
27+
$.each(['button', 'regexTextbox', 'replacementTextbox', 'testTextbox', 'htmlTextbox', 'actualDiv', 'nestableInput', 'caseSensitiveInput', 'singleLineInput', 'multiLineInput', 'evalInput'], function(k, key) {
2828
if (elements && elements[key]) {
2929
this[key] = elements[key];
3030
} else {
@@ -38,7 +38,7 @@ var YourCode = (function(yc) {
3838
}
3939

4040
this.url = url;
41-
this.button.observe('click', this.update.bindAsEventListener(this));
41+
this.button.click($.proxy(this.update, this));
4242
}
4343

4444
/**
@@ -49,27 +49,26 @@ var YourCode = (function(yc) {
4949
*/
5050
function update(e) {
5151
var fn = encodeURIComponent;
52-
Event.stop(e);
52+
e.preventDefault();
5353

5454
// build the data
55-
postData = "regex=" + fn(this.regexTextbox.value) +
56-
"&replacement=" + fn(this.replacementTextbox.value) +
57-
"&test_value=" + fn(this.testTextbox.value) +
55+
postData = "regex=" + fn(this.regexTextbox.val()) +
56+
"&replacement=" + fn(this.replacementTextbox.val()) +
57+
"&test_value=" + fn(this.testTextbox.val()) +
5858
"&my_post_key=" + fn(my_post_key) +
59-
(this.nestableInput.checked ? '&nestable=1' : '') +
60-
(this.caseSensitiveInput.checked ? '&case_sensitive=1' : '') +
61-
(this.singleLineInput.checked ? '&single_line=1' : '') +
62-
(this.multiLineInput.checked ? '&multi_line=1' : '') +
63-
(this.evalInput.checked ? '&eval=1' : '');
59+
(this.nestableInput.prop("checked") ? '&nestable=1' : '') +
60+
(this.caseSensitiveInput.prop("checked") ? '&case_sensitive=1' : '') +
61+
(this.singleLineInput.prop("checked") ? '&single_line=1' : '') +
62+
(this.multiLineInput.prop("checked") ? '&multi_line=1' : '') +
63+
(this.evalInput.prop("checked") ? '&eval=1' : '');
6464

65-
this.spinner = new ActivityIndicator("body", {
66-
image: this.spinnerImage
67-
});
68-
69-
new Ajax.Request(this.url, {
70-
method: 'post',
71-
postBody: postData,
72-
onComplete: this.onComplete.bind(this)
65+
$.jGrowl("updating...");
66+
67+
$.ajax({
68+
type: 'post',
69+
url: this.url,
70+
data: postData,
71+
complete: $.proxy(this.onComplete, this),
7372
});
7473
}
7574

@@ -86,13 +85,11 @@ var YourCode = (function(yc) {
8685
if (!message[1]) {
8786
message[1] = "An unknown error occurred.";
8887
}
89-
alert('There was an error fetching the test results.\n\n' + message[1]);
88+
$.jGrowl('There was an error fetching the test results.\n\n' + message[1]);
9089
} else if(transport.responseText) {
91-
this.actualDiv.innerHTML = transport.responseText;
92-
this.htmlTextbox.value = transport.responseText;
90+
this.actualDiv.html(transport.responseText);
91+
this.htmlTextbox.val(transport.responseText);
9392
}
94-
95-
this.spinner.destroy();
9693
return true;
9794
}
9895

@@ -109,7 +106,6 @@ var YourCode = (function(yc) {
109106
singleLineInput: null,
110107
multiLineInput: null,
111108
evalInput: null,
112-
spinnerImage: "../images/spinner_big.gif",
113109
update: update,
114110
onComplete: onComplete,
115111
}

‎Upload/inc/plugins/yourcode/acp.php

+15-15
Original file line numberDiff line numberDiff line change
@@ -562,20 +562,20 @@ function yourcode_admin_edit()
562562
echo <<<EOF
563563
<script type="text/javascript" src="./jscripts/yourcode/yourcode_sandbox.js"></script>
564564
<script type="text/javascript">
565-
Event.observe(window, "load", function() {
565+
$(document).ready(function() {
566566
<!--
567567
new YourCode.Sandbox("./index.php?module=config-yourcode&action=edit&mode=xmlhttp", {
568-
button: $("test"),
569-
regexTextbox: $("regex"),
570-
replacementTextbox: $("replacement"),
571-
testTextbox: $("test_value"),
572-
htmlTextbox: $("result_html"),
573-
actualDiv: $("result_actual"),
574-
nestableInput: $('nestable'),
575-
caseSensitiveInput: $('case_sensitive'),
576-
singleLineInput: $('single_line'),
577-
multiLineInput: $('multi_line'),
578-
evalInput: $('eval'),
568+
button: $("#test"),
569+
regexTextbox: $("#regex"),
570+
replacementTextbox: $("#replacement"),
571+
testTextbox: $("#test_value"),
572+
htmlTextbox: $("#result_html"),
573+
actualDiv: $("#result_actual"),
574+
nestableInput: $('#nestable'),
575+
caseSensitiveInput: $('#case_sensitive'),
576+
singleLineInput: $('#single_line'),
577+
multiLineInput: $('#multi_line'),
578+
evalInput: $('#eval'),
579579
});
580580
});
581581
// -->
@@ -986,7 +986,7 @@ function yourcode_admin_tools()
986986
yourcode_output_tabs('yourcode_tools');
987987

988988
$onsubmit = <<<EOF
989-
if($('file_s').value) { return true; } alert('{$lang->yourcode_import_no_file}'); return false;
989+
if($('#file_s').val()) { return true; } alert('{$lang->yourcode_import_no_file}'); return false;
990990
EOF;
991991

992992
$form = new Form($html->url(array("action" => 'import')), 'post', '', 1, '', '', $onsubmit);
@@ -1095,10 +1095,10 @@ function yourcode_admin_import()
10951095

10961096
$total = count($codes);
10971097
$onclick = <<<EOF
1098-
var all_checks = $$('input.checkbox_input'); if(this.checked) { checked = true; } for(x = 0; x < all_checks.length; x++) { all_checks[x].checked = checked; }
1098+
var all_checks = $('input.checkbox_input'); if(this.checked) { checked = true; } for(x = 0; x < all_checks.length; x++) { all_checks[x].checked = checked; }
10991099
EOF;
11001100
$onsubmit = <<<EOF
1101-
var all_checks = $$('input.checkbox_input'); for(x = 0; x < all_checks.length; x++) { if(all_checks[x].checked) { return true; } } alert('{$lang->yourcode_import_selection_error}'); return false;
1101+
var all_checks = $('input.checkbox_input'); for(x = 0; x < all_checks.length; x++) { if(all_checks[x].checked) { return true; } } alert('{$lang->yourcode_import_selection_error}'); return false;
11021102
EOF;
11031103
$form = new Form($html->url(array("action" => 'import', "mode" => 'finish')), 'post', '', '', '', '', $onsubmit);
11041104
$form_container = new FormContainer($lang->yourcode_import);

‎Upload/inc/plugins/yourcode/install.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ function yourcode_info()
6969
"website" => 'https://github.com/WildcardSearch/YourCode',
7070
"author" => $author,
7171
"authorsite" => 'http://www.rantcentralforums.com',
72-
"version" => '1.1.1',
73-
"compatibility" => '16*',
72+
"version" => '2.0',
73+
"compatibility" => '18*',
7474
"guid" => '36a18ebc285a181a42561141adfd1d7f',
7575
);
7676
}

0 commit comments

Comments
 (0)