aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/video_upload/video_upload.js12
-rw-r--r--plugins/video_upload/video_upload.module14
-rw-r--r--video.js3
-rw-r--r--video.module2
4 files changed, 30 insertions, 1 deletions
diff --git a/plugins/video_upload/video_upload.js b/plugins/video_upload/video_upload.js
new file mode 100644
index 0000000..0fd80c1
--- /dev/null
+++ b/plugins/video_upload/video_upload.js
@@ -0,0 +1,12 @@
+// $Id$
+/**
+ * @file
+ * Javascript functions for busy status on video uploads
+ *
+ * TODO: Support AJAX Uploads :-)
+ *
+ * @author Fabio Varesano <fvaresano at yahoo dot it>
+*/
+
+
+
diff --git a/plugins/video_upload/video_upload.module b/plugins/video_upload/video_upload.module
index f22327b..55d72d7 100644
--- a/plugins/video_upload/video_upload.module
+++ b/plugins/video_upload/video_upload.module
@@ -133,6 +133,8 @@ function video_upload_nodeapi(&$node, $op, $teaser) {
function video_upload_form_alter($form_id, &$form) {
if($form_id == 'video_node_form' && isset($form['video']) && user_access('upload video files')) {
+
+ theme('video_upload_get_script');
//get node object from form
$node = $form['#node'];
@@ -352,3 +354,15 @@ function _video_upload_check_settings() {
return true;
}
+
+
+
+/**
+ * Import the video_upload.js script
+ */
+function theme_video_upload_get_script() {
+ drupal_add_js(drupal_get_path('module', 'video_upload') . '/video_upload.js');
+}
+
+
+
diff --git a/video.js b/video.js
index d4d5e11..00ab0f3 100644
--- a/video.js
+++ b/video.js
@@ -36,3 +36,6 @@ if (document.all) {
}
}
+
+
+
diff --git a/video.module b/video.module
index 33a4c3c..ff22472 100644
--- a/video.module
+++ b/video.module
@@ -1412,7 +1412,7 @@ function theme_video_fields($fields) {
* Import the video.js script
*/
function theme_video_get_script() {
- drupal_set_html_head('<script defer="defer" type="text/javascript" src="'. check_url(base_path() . drupal_get_path('module', 'video')) . '/video.js"></script>');
+ drupal_set_html_head('<script type="text/javascript" src="'. check_url(base_path() . drupal_get_path('module', 'video')) . '/video.js"></script>');
}
/******************************************************************************