# HG changeset patch
# User veltr
# Date 1334578917 -7200
# Node ID dc5e0ea0093cafc547943219068fa8e54da422fa
# Parent  002a16ff171b67cec32f37df875827b8aa080d52
minor ie8 bugfixes

diff -r 002a16ff171b -r dc5e0ea0093c src/js/init.js
--- a/src/js/init.js	Thu Apr 12 18:41:11 2012 +0200
+++ b/src/js/init.js	Mon Apr 16 14:21:57 2012 +0200
@@ -153,11 +153,10 @@
   
   var ret_widgets = [];
   var index;
-  
-  for (index = 0; index < guiOptions.widgets.length; index++) {    
+  for (index = 0; index < guiOptions.widgets.length; index++) {
     var widget = IriSP.instantiateWidget(popcornInstance, serialFactory, layoutManager, guiOptions.widgets[index], default_options);
    
-    ret_widgets.push(widget);   
+    ret_widgets.push(widget);
   };
 
   return ret_widgets;
@@ -193,8 +192,12 @@
  */
 IriSP.instantiateWidget = function(popcornInstance, serialFactory, layoutManager, widgetConfig, defaultOptions) {
 
-    if (IriSP.null_or_undefined(defaultOptions))
+    if (IriSP.null_or_undefined(defaultOptions)) {
       defaultOptions = {};
+    }
+    if (IriSP.null_or_undefined(widgetConfig)) {
+      return;
+    }
     
     widgetConfig = IriSP.underscore.defaults(widgetConfig, defaultOptions);
 
diff -r 002a16ff171b -r dc5e0ea0093c src/js/widgets/createAnnotationWidget.js
--- a/src/js/widgets/createAnnotationWidget.js	Thu Apr 12 18:41:11 2012 +0200
+++ b/src/js/widgets/createAnnotationWidget.js	Mon Apr 16 14:21:57 2012 +0200
@@ -187,10 +187,10 @@
         _rx = IriSP.regexpFromText(_keyword),
         _contents = _field.val();
     _contents = ( _rx.test(_contents)
-        ? _contents.replace(_rx,"").replace("  "," ").trim()
-        : _contents.trim() + " " + _keyword
+        ? _contents.replace(_rx,"").replace("  "," ").replace(/(^\s+|\s+$)/g,'')
+        : _contents.replace(/(^\s+|\s+$)/g,'') + " " + _keyword
     );
-    _field.val(_contents.trim()).trigger("js_mod");
+    _field.val(_contents.replace(/(^\s+|\s+$)/g,'')).trigger("js_mod");
 }
 
 /** handles clicks on the annotate button. Works only for the non-cinecast version */
@@ -495,7 +495,7 @@
                     var _an_ids = IriSP.underscore(this._serializer._data.annotations).map(function(_a) {
                         return _a.id.toLowerCase();
                     });
-                    if (_an_ids.indexOf(annotation.id.toLowerCase()) == -1) {
+                    if (IriSP._(_an_ids).indexOf(annotation.id.toLowerCase()) == -1) {
                         _this._serializer._data.annotations.push(annotation);
                     }
                     
diff -r 002a16ff171b -r dc5e0ea0093c test/integration/allocine_dossier_independant/test-allocine.htm
--- a/test/integration/allocine_dossier_independant/test-allocine.htm	Thu Apr 12 18:41:11 2012 +0200
+++ b/test/integration/allocine_dossier_independant/test-allocine.htm	Mon Apr 16 14:21:57 2012 +0200
@@ -67,7 +67,7 @@
                         disable_share: true,
                         api_endpoint_template : "json_examples/return_after_post.json", //"endpoint/{{id}}.json",
                         api_method : 'POST'
-                    }, /* {
+                    } /*, {
                         type: "TraceWidget",
                      //   js_console : true,
                         url: "http://traces.advene.org:5000/",
diff -r 002a16ff171b -r dc5e0ea0093c test/integration/allocine_dossier_independant/test-vodkaster.htm
--- a/test/integration/allocine_dossier_independant/test-vodkaster.htm	Thu Apr 12 18:41:11 2012 +0200
+++ b/test/integration/allocine_dossier_independant/test-vodkaster.htm	Mon Apr 16 14:21:57 2012 +0200
@@ -74,8 +74,7 @@
                             alias : 'http://festival.cinecast.fr/configuration.jsonp?jsonp=?'
                         },
                         random_tags : 3,
-                        disable_share: true,
-                        api_endpoint_template : "endpoint/{{id}}.json",
+                        api_endpoint_template : "json_examples/return_after_post.json",
                         api_method : 'POST'
                     }, {
                         type: "TraceWidget",