summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-01-28 04:46:10 +0000
committerZach Copley <zach@status.net>2010-01-28 04:46:10 +0000
commitc2c262e4b47f5a4965317148b66ff390f4fc85fd (patch)
tree00e5aa602bc57a254d440c4d780438a154346139
parent644c319f5ad78dbedb686cdfef38152cadf615b2 (diff)
Move faceboookapp.js to the Facebook plugin
-rw-r--r--plugins/Facebook/facebookaction.php4
-rw-r--r--plugins/Facebook/facebookapp.js (renamed from js/facebookapp.js)0
2 files changed, 1 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/js/facebookapp.js b/plugins/Facebook/facebookapp.js
index 5deb6e42b..5deb6e42b 100644
--- a/js/facebookapp.js
+++ b/plugins/Facebook/facebookapp.js