Index: modalframe.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/modalframe/Attic/modalframe.info,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 modalframe.info
--- modalframe.info	30 May 2009 09:38:56 -0000	1.1.2.3
+++ modalframe.info	14 Jun 2009 09:34:57 -0000
@@ -3,5 +3,6 @@ name = Modal Frame API
 description = Provides an API to render an iframe within a modal dialog based on the jQuery UI Dialog plugin.
 package = User interface
 dependencies[] = jquery_ui
-dependencies[] = onbeforeunload
-core = 6.x
+;dependencies[] = onbeforeunload
+core = 7.x
+files[] = modalframe.module
\ No newline at end of file
Index: js/child.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/modalframe/js/Attic/child.js,v
retrieving revision 1.1.2.4
diff -u -p -r1.1.2.4 child.js
--- js/child.js	29 May 2009 16:32:35 -0000	1.1.2.4
+++ js/child.js	14 Jun 2009 09:34:57 -0000
@@ -1,5 +1,7 @@
 // $Id: child.js,v 1.1.2.4 2009/05/29 16:32:35 markuspetrux Exp $
 
+(function ($) {
+
 /**
  * Modal Frame object for child windows.
  */
@@ -11,7 +13,8 @@ Drupal.modalFrameChild = Drupal.modalFra
 /**
  * Child dialog behavior.
  */
-Drupal.behaviors.modalFrameChild = function(context) {
+Drupal.behaviors.modalFrameChild = {
+  attach: function(context) {
   var self = Drupal.modalFrameChild;
   var settings = Drupal.settings.modalFrameChild || {};
 
@@ -49,6 +52,7 @@ Drupal.behaviors.modalFrameChild = funct
 
   // Attach child related behaviors to the iframed document.
   self.attachBehaviors(context);
+  }
 };
 
 /**
@@ -85,3 +89,5 @@ Drupal.modalFrameChild.behaviors.parseLi
     $(this).attr('target', '_new');
   });
 };
+
+})(jQuery);
\ No newline at end of file
Index: js/parent.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/modalframe/js/Attic/parent.js,v
retrieving revision 1.1.2.5
diff -u -p -r1.1.2.5 parent.js
--- js/parent.js	29 May 2009 19:17:05 -0000	1.1.2.5
+++ js/parent.js	14 Jun 2009 09:34:58 -0000
@@ -1,5 +1,7 @@
 // $Id: parent.js,v 1.1.2.5 2009/05/29 19:17:05 markuspetrux Exp $
 
+(function ($) {
+
 /**
  * Modal Frame object for parent windows.
  */
@@ -228,7 +230,7 @@ Drupal.modalFrame.close = function(args)
  */
 Drupal.modalFrame.bindChild = function(iFrameWindow, isClosing) {
   var self = this;
-  var $iFrameWindow = iFrameWindow.$;
+  var $iFrameWindow = iFrameWindow.jQuery;
   var $iFrameDocument = $iFrameWindow(iFrameWindow.document);
   self.iframe.Drupal = iFrameWindow.Drupal;
 
@@ -485,3 +487,5 @@ Drupal.modalFrame.resize = function(size
     }
   });
 };
+
+})(jQuery);
\ No newline at end of file
Index: modules/modalframe_example/modalframe_example.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/modalframe/modules/modalframe_example/Attic/modalframe_example.info,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 modalframe_example.info
--- modules/modalframe_example/modalframe_example.info	30 May 2009 09:29:58 -0000	1.1.2.2
+++ modules/modalframe_example/modalframe_example.info	14 Jun 2009 09:34:58 -0000
@@ -3,4 +3,5 @@ name = Modal Frame Example
 description = Example for the Modal Frame API.
 package = User interface
 dependencies[] = modalframe
-core = 6.x
+core = 7.x
+files[] = modalframe_example.module
\ No newline at end of file
Index: modules/modalframe_example/modalframe_example.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/modalframe/modules/modalframe_example/Attic/modalframe_example.js,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 modalframe_example.js
--- modules/modalframe_example/modalframe_example.js	29 May 2009 16:32:35 -0000	1.1.2.3
+++ modules/modalframe_example/modalframe_example.js	14 Jun 2009 09:34:58 -0000
@@ -1,6 +1,9 @@
 // $Id: modalframe_example.js,v 1.1.2.3 2009/05/29 16:32:35 markuspetrux Exp $
 
-Drupal.behaviors.modalFrameExample = function() {
+(function ($) {
+
+Drupal.behaviors.modalFrameExample = {
+  attach: function(context) {
   $('.modalframe-example-child:not(.modalframe-example-processed)').addClass('modalframe-example-processed').click(function() {
     var element = this;
 
@@ -35,4 +38,7 @@ Drupal.behaviors.modalFrameExample = fun
     // Prevent default action of the link click event.
     return false;
   });
+  }
 };
+
+})(jQuery);
\ No newline at end of file