diff options
author | Craig Andrews <candrews@integralblue.com> | 2010-01-28 16:13:06 -0500 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2010-01-28 16:13:06 -0500 |
commit | d14651706cf728f116b7ae44c6a6e37b5eb918a4 (patch) | |
tree | f0fda86c2e0b8e56718a2e7c01dcb6c4df1835d3 /plugins | |
parent | 065140400018dec28ed82fd31a754c94b7b87521 (diff) | |
parent | 8cdb319533a638a8f905cbc68c57bd4eca89a5aa (diff) |
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/Facebook/facebookaction.php | 4 | ||||
-rw-r--r-- | plugins/Facebook/facebookapp.js | 33 | ||||
-rw-r--r-- | plugins/TwitterBridge/Sign-in-with-Twitter-lighter.png | bin | 0 -> 2490 bytes |
3 files changed, 34 insertions, 3 deletions
diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index 389e1ea81..8437a705a 100644 --- a/plugins/Facebook/facebookaction.php +++ b/plugins/Facebook/facebookaction.php @@ -89,7 +89,7 @@ class FacebookAction extends Action function showScripts() { - $this->script('facebookapp.js'); + $this->script(common_path('plugins/Facebook/facebookapp.js')); } /** @@ -397,8 +397,6 @@ class FacebookAction extends Action return; } - - } } diff --git a/plugins/Facebook/facebookapp.js b/plugins/Facebook/facebookapp.js new file mode 100644 index 000000000..5deb6e42b --- /dev/null +++ b/plugins/Facebook/facebookapp.js @@ -0,0 +1,33 @@ +/* +* StatusNet - a distributed open-source microblogging tool +* Copyright (C) 2008, StatusNet, Inc. +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. +* +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +var max = 140; +var noticeBox = document.getElementById('notice_data-text'); + +if (noticeBox) { + noticeBox.addEventListener('keyup', keypress); + noticeBox.addEventListener('keydown', keypress); + noticeBox.addEventListener('keypress', keypress); + noticeBox.addEventListener('change', keypress); +} + +// Do our the countdown +function keypress(evt) { + document.getElementById('notice_text-count').setTextValue( + max - noticeBox.getValue().length); +} diff --git a/plugins/TwitterBridge/Sign-in-with-Twitter-lighter.png b/plugins/TwitterBridge/Sign-in-with-Twitter-lighter.png Binary files differnew file mode 100644 index 000000000..297bb0340 --- /dev/null +++ b/plugins/TwitterBridge/Sign-in-with-Twitter-lighter.png |