diff -r 8f99b0df3278 -r 6008172a0592 src/js/layout.js
--- a/src/js/layout.js	Mon Nov 14 16:12:13 2011 +0100
+++ b/src/js/layout.js	Mon Nov 14 17:19:26 2011 +0100
@@ -1,59 +1,61 @@
 /* layout.js - very basic layout management */
 
-/*
-  a layout manager manages a div and the layout of objects
-  inside it.
-*/
+define(["IriSP"], function() {
+  /*
+    a layout manager manages a div and the layout of objects
+    inside it.
+  */
 
-IriSP.LayoutManager = function(options) {
-    this._Popcorn = null;
-    this._widgets = [];
-    
-    this._div = "LdtPlayer";
-    this._width = 640;
-    
-    if (options === undefined) {
-      options = {};
-    };
-    
-    if (options.hasOwnProperty('container')) {
-      this._div = options.container;
-    }
+  IriSP.LayoutManager = function(options) {
+      this._Popcorn = null;
+      this._widgets = [];
+      
+      this._div = "LdtPlayer";
+      this._width = 640;
+      
+      if (options === undefined) {
+        options = {};
+      };
+      
+      if (options.hasOwnProperty('container')) {
+        this._div = options.container;
+      }
 
-    if (options.hasOwnProperty('width')) {
-      this._width = options.width;
-    }    
-    
-    if (options.hasOwnProperty('height')) {
-      this._height = options.height;
-    } 
-    
-    /* this is a shortcut */
-    this.selector = IriSP.jQuery("#" + this._div);
-    
-    this.selector.css("width", this._width);
-    
-    if (this._height !== undefined)
-      this.selector.css("height", this._height);
-};
+      if (options.hasOwnProperty('width')) {
+        this._width = options.width;
+      }    
+      
+      if (options.hasOwnProperty('height')) {
+        this._height = options.height;
+      } 
+      
+      /* this is a shortcut */
+      this.selector = IriSP.jQuery("#" + this._div);
+      
+      this.selector.css("width", this._width);
+      
+      if (this._height !== undefined)
+        this.selector.css("height", this._height);
+  };
 
-/* we need this special setter because of a chicken and egg problem :
-   we want the manager to use popcorn but the popcorn div will be managed
-   by the manager. So we need a way to set the instance the manager uses
-*/
-   
-IriSP.LayoutManager.prototype.setPopcornInstance = function(popcorn) {
-    this._Popcorn = popcorn;
-    /* FIXME - don't forget to add the popcorn messages handlers there */
-}
+  /* we need this special setter because of a chicken and egg problem :
+     we want the manager to use popcorn but the popcorn div will be managed
+     by the manager. So we need a way to set the instance the manager uses
+  */
+     
+  IriSP.LayoutManager.prototype.setPopcornInstance = function(popcorn) {
+      this._Popcorn = popcorn;
+      /* FIXME - don't forget to add the popcorn messages handlers there */
+  }
 
-IriSP.LayoutManager.prototype.createDiv = function() {
-    var newDiv = Popcorn.guid(this._div + "_widget_");
-    this._widgets.push(newDiv);
+  IriSP.LayoutManager.prototype.createDiv = function() {
+      var newDiv = Popcorn.guid(this._div + "_widget_");
+      this._widgets.push(newDiv);
 
-    var templ = "<div id='{{id}}' style='width: 100%; position: relative;'></div";
-    var txt = Mustache.to_html(templ, {id: newDiv});
-    this.selector.append(txt);
-    
-    return newDiv;
-};
+      var templ = "<div id='{{id}}' style='width: 100%; position: relative;'></div";
+      var txt = Mustache.to_html(templ, {id: newDiv});
+      this.selector.append(txt);
+      
+      return newDiv;
+  };
+});
\ No newline at end of file