From 683f85d6a6e5c1b1abb336fe8a02a0d492529734 Mon Sep 17 00:00:00 2001
From: Alex King
Date: Sat, 7 Apr 2012 21:16:05 -0600
Subject: [PATCH] simplify maxlength feature
---
.gitmodules | 3 ---
assets/admin.css | 6 +----
assets/admin.js | 28 +++++++++--------------
assets/jquery-maxlength-display | 1 -
views/wp-admin/post/broadcast/options.php | 1 -
5 files changed, 12 insertions(+), 27 deletions(-)
delete mode 160000 assets/jquery-maxlength-display
diff --git a/.gitmodules b/.gitmodules
index 531586e1..e69de29b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "assets/jquery-maxlength-display"]
- path = assets/jquery-maxlength-display
- url = git@github.com:crowdfavorite/jquery-maxlength-display.git
diff --git a/assets/admin.css b/assets/admin.css
index f00e75c0..6b788160 100755
--- a/assets/admin.css
+++ b/assets/admin.css
@@ -686,10 +686,6 @@
margin-right: 5px;
}
-.maxlength-remaining-short {
+.broadcast-interstitial li.account .broadcast-edit.edit .maxlength-remaining-short {
color: #900;
}
-.maxlength-remaining-empty {
- color: #900;
- font-weight: bold;
-}
\ No newline at end of file
diff --git a/assets/admin.js b/assets/admin.js
index 515c3527..57030f42 100755
--- a/assets/admin.js
+++ b/assets/admin.js
@@ -186,30 +186,24 @@
else {
$parent.removeClass('checked');
}
+ });
+
+ $('.broadcast-interstitial .broadcast-edit textarea').on('keyup change click focus', function() {
+ $counter = $(this).closest('.broadcast-edit').find('.counter');
+ var diff = parseInt($(this).attr('maxlength')) - parseInt($(this).val().length),
+ diffClass = '';
+ if (diff < 10) {
+ diffClass = 'maxlength-remaining-short';
+ }
+ $counter.removeClass('maxlength-remaining-short').addClass(diffClass).html(diff);
}).change();
- $('.broadcast-interstitial .broadcast-edit textarea').each(function() {
-// $(this).maxLengthDisplay({
-// 'displayTarget': $(this).closest('.broadcast-edit').find('.counter'),
-// 'lengths': {
-// 'short': 10,
-// 'empty': 0
-// }
-// });
- });
-
- $('body.clean ul.accounts li.proto .broadcast-edit textarea').change(function() {
+ $('body.clean ul.accounts li.proto .broadcast-edit textarea').on('keyup change click focus', function() {
var val = $(this).val();
$(this).closest('ul.accounts').find('.broadcast-edit').not('.edit').each(function() {
$(this).find('.readonly').text(val).end()
.find('textarea').val(val);
});
- }).keypress(function() {
- $(this).change();
- }).click(function() {
- $(this).change();
- }).focus(function() {
- $(this).change();
});
});
diff --git a/assets/jquery-maxlength-display b/assets/jquery-maxlength-display
deleted file mode 160000
index 7f6ad801..00000000
--- a/assets/jquery-maxlength-display
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7f6ad8015ee5fa2720b9e67ec059fe42538cf5a3
diff --git a/views/wp-admin/post/broadcast/options.php b/views/wp-admin/post/broadcast/options.php
index 1724a767..6482a087 100755
--- a/views/wp-admin/post/broadcast/options.php
+++ b/views/wp-admin/post/broadcast/options.php
@@ -91,7 +91,6 @@
-