diff options
| -rw-r--r-- | actions/facebookhome.php | 3 | ||||
| -rw-r--r-- | js/facebookapp.js | 47 | ||||
| -rw-r--r-- | lib/facebookaction.php | 3 |
3 files changed, 33 insertions, 20 deletions
diff --git a/actions/facebookhome.php b/actions/facebookhome.php index e17c0f813..4eaf0b4f7 100644 --- a/actions/facebookhome.php +++ b/actions/facebookhome.php @@ -122,7 +122,6 @@ class FacebookhomeAction extends FacebookAction // XXX: Do some error handling here $this->setDefaults(); - //$this->showHome($flink, _('You can now use Identi.ca from Facebook!')); $this->getUpdatePermission(); return; @@ -154,6 +153,8 @@ class FacebookhomeAction extends FacebookAction $notice_form = new FacebookNoticeForm($this, $post_action, null, $post_action, $this->user); $notice_form->show(); + + } function title() diff --git a/js/facebookapp.js b/js/facebookapp.js index c7e8d6aa2..8ef9aa532 100644 --- a/js/facebookapp.js +++ b/js/facebookapp.js @@ -1,18 +1,31 @@ /* - * Laconica - a distributed open-source microblogging tool - * Copyright (C) 2008, Controlez-Vous, 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/>. - */ -
\ No newline at end of file +* Laconica - a distributed open-source microblogging tool +* Copyright (C) 2008, Controlez-Vous, 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'); + +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/lib/facebookaction.php b/lib/facebookaction.php index a12c7d6f9..63ac66250 100644 --- a/lib/facebookaction.php +++ b/lib/facebookaction.php @@ -122,8 +122,7 @@ class FacebookAction extends Action // Add a timestamp to the file so Facebook cache wont ignore our changes $ts = filemtime(INSTALLDIR.'/js/facebookapp.js'); - $this->element('script', array('type' => 'text/javascript', - 'src' => common_path('js/facebookapp.js') . '?ts=' . $ts)); + $this->element('script', array('src' => common_path('js/facebookapp.js') . '?ts=' . $ts)); } /** |