Index: ooyala_upload.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ooyala/ooyala_upload.js,v
retrieving revision 1.1
diff -u -r1.1 ooyala_upload.js
--- ooyala_upload.js	10 Nov 2009 21:17:44 -0000	1.1
+++ ooyala_upload.js	12 Nov 2009 01:12:18 -0000
@@ -6,29 +6,30 @@
  */
 
 function onProgress(event) {
-  $('#ooyala-upload-progress').empty().append( (parseInt(event.ratio * 100) ) + '%');
-} 
+  if (event.ratio < 1) {
+    $('#ooyala-upload-progress').empty().append((parseInt(event.ratio * 100)) + '%');
+  }
+}
 
 function onUploadComplete() {
   $('#ooyala-upload-progress').empty().append(Drupal.t('Finished'));
-  $('#ooyala-upload-progress').parent().find('input').value(Drupal.settings.ooyala_final_embedCode);
-  $('.ooyala_button_container').css('background-color', 'lightgreen');
-} 
+  $('.ooyala-button-container').css('background-color', 'lightgreen');
+}
 
-function onUploadError(text) { 
+function onUploadError(text) {
   $('#ooyala-upload-progress').empty().append('Upload Error: ' + text);
 }
 
-function onEmbedCodeReady(embedCode) { 
-  $('.ooyala_embed_code_input').val(embedCode);
-} 
+function onEmbedCodeReady(embedCode) {
+  $('.ooyala-embed-code-input').val(embedCode);
+}
 
-var ooyala_process_upload = function() {
-  $(this).parent('.ooyala_button_container').find('input[type=text]').addClass('ooyala_embed_code_input');
+var ooyalaProcessUpload = function() {
+  $(this).parent('.ooyala-button-container').find('input[type=text]').addClass('ooyala-embed-code-input');
   try { 
     var formvalues = $(this).parents('form').serializeArray();
     $.post(
-      '/ooyala/js/' + Drupal.settings.ooyala_upload_input_id,
+      '/ooyala/js/' + Drupal.settings.ooyalaUploadInputId,
       formvalues,
       function(data, textStatus) {
         ooyalaUploader.setTitle(data.title);
@@ -49,13 +50,14 @@
   }
 }
 
+/**
+ * This function is called by naming convention when the uploader finishes.
+ */
+function onOoyalaUploaderReady() {
+  ooyalaUploader.addEventListener('progress', 'onProgress');
+  ooyalaUploader.addEventListener('complete', 'onUploadComplete');
+  ooyalaUploader.addEventListener('error', 'onUploadError');
+  ooyalaUploader.addEventListener('embedCodeReady', 'onEmbedCodeReady');
 
-function onOoyalaUploaderReady()  { 
-
-  ooyalaUploader.addEventListener('progress', 'onProgress');  
-  ooyalaUploader.addEventListener('complete', 'onUploadComplete');  
-  ooyalaUploader.addEventListener('error', 'onUploadError');  
-    ooyalaUploader.addEventListener('embedCodeReady', 'onEmbedCodeReady');  
-  
-  $('#ooyala_upload_button').attr('disabled', false).click(ooyala_process_upload);
+  $('#ooyala-upload-button').attr('disabled', false).click(ooyalaProcessUpload);
 }
\ No newline at end of file
Index: ooyala.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ooyala/ooyala.module,v
retrieving revision 1.4
diff -u -r1.4 ooyala.module
--- ooyala.module	12 Nov 2009 00:44:29 -0000	1.4
+++ ooyala.module	12 Nov 2009 01:12:18 -0000
@@ -395,15 +395,15 @@
     '#title' => 'Embeded code ' ,
     '#description' => $element['#description'],
     '#default_value' => isset($element['#value'][0][$field_key]) ? $element['#value'][0][$field_key]  : FALSE,
-    '#prefix'  => '<div class="ooyala_button_container">
+    '#prefix'  => '<div class="ooyala-button-container">
       <script src="http://www.ooyala.com/partner/uploadButton?width=100&height=20&label='.t('Browse').'""></script>
-      <input type="button" value="' .t('Upload').'" id="ooyala_upload_button" disabled="disabled" />
+      <input type="button" value="' .t('Upload').'" id="ooyala-upload-button" disabled="disabled" />
       <div id="ooyala-upload-progress"></div>',
     '#suffix' => '</div>',
   );
 
   drupal_add_js(drupal_get_path('module', 'ooyala') . '/ooyala_upload.js');
-  drupal_add_js(array('ooyala_upload_input_id' => $field_name ), 'setting');
+  drupal_add_js(array('ooyalaUploadInputId' => $field_name ), 'setting');
   // Set #element_validate in a way that it will not wipe out other
   // validation functions already set by other modules.
   if (empty($element['#element_validate'])) {