From 426f2d5bccf38192a953c54c2784f8445f0d704c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= <commits@skodak.org>
Date: Mon, 6 Aug 2012 13:52:39 +0200
Subject: [PATCH] MDL-34741 use 2in3 in mod_lti

---
 mod/lti/grade.php      |  4 +---
 mod/lti/settings.php   | 20 ++++++++------------
 mod/lti/submissions.js |  8 ++++----
 mod/lti/view.php       |  6 +++---
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/mod/lti/grade.php b/mod/lti/grade.php
index 14e25c47983..0fb22eb6134 100644
--- a/mod/lti/grade.php
+++ b/mod/lti/grade.php
@@ -80,14 +80,12 @@ $PAGE->set_url($url);
 $module = array(
     'name'      => 'mod_lti_submissions',
     'fullpath'  => '/mod/lti/submissions.js',
-    'requires'  => array('base'),
+    'requires'  => array('base', 'yui2-datatable'),
     'strings'   => array(),
 );
 
 $PAGE->requires->js_init_call('M.mod_lti.submissions.init', array(), true, $module);
 
-$PAGE->requires->yui2_lib('datatable');
-
 $submissionquery = '
     SELECT s.id, u.firstname, u.lastname, u.id AS userid, s.datesubmitted, s.gradepercent
     FROM {lti_submission} s
diff --git a/mod/lti/settings.php b/mod/lti/settings.php
index b7d4f2c181c..36efa95d459 100644
--- a/mod/lti/settings.php
+++ b/mod/lti/settings.php
@@ -134,27 +134,27 @@ if ($ADMIN->fulltree) {
 
 <script type=\"text/javascript\">
 //<![CDATA[
-    (function(){
+    YUI().use('yui2-tabview', 'yui2-datatable', function(Y) {
         //If javascript is disabled, they will just see the three tabs one after another
         var lti_tab_heading = document.getElementById('lti_tab_heading');
         lti_tab_heading.style.display = '';
 
-        new YAHOO.widget.TabView('lti_tabs');
+        new Y.YUI2.widget.TabView('lti_tabs');
 
         var setupTools = function(id, sort){
-            var lti_tools = YAHOO.util.Dom.get(id + '_tools');
+            var lti_tools = Y.YUI2.util.Dom.get(id + '_tools');
 
             if(lti_tools){
-                var dataSource = new YAHOO.util.DataSource(lti_tools);
+                var dataSource = new Y.YUI2.util.DataSource(lti_tools);
 
                 var configuredColumns = [
                     {key:'name', label:'$typename', sortable:true},
                     {key:'baseURL', label:'$baseurl', sortable:true},
-                    {key:'timecreated', label:'$createdon', sortable:true, formatter:YAHOO.widget.DataTable.formatDate},
+                    {key:'timecreated', label:'$createdon', sortable:true, formatter:Y.YUI2.widget.DataTable.formatDate},
                     {key:'action', label:'$action'}
                 ];
 
-                dataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
+                dataSource.responseType = Y.YUI2.util.DataSource.TYPE_HTMLTABLE;
                 dataSource.responseSchema = {
                     fields: [
                         {key:'name'},
@@ -164,7 +164,7 @@ if ($ADMIN->fulltree) {
                     ]
                 };
 
-                new YAHOO.widget.DataTable(id + '_container', configuredColumns, dataSource,
+                new Y.YUI2.widget.DataTable(id + '_container', configuredColumns, dataSource,
                     {
                         sortedBy: sort
                     }
@@ -175,13 +175,9 @@ if ($ADMIN->fulltree) {
         setupTools('lti_configured', {key:'name', dir:'asc'});
         setupTools('lti_pending', {key:'timecreated', dir:'desc'});
         setupTools('lti_rejected', {key:'timecreated', dir:'desc'});
-    })();
+    });
 //]]
 </script>
 ";
-    global $PAGE; // TODO: Move to YUI3 ASAP
-    $PAGE->requires->yui2_lib('tabview');
-    $PAGE->requires->yui2_lib('datatable');
-
     $settings->add(new admin_setting_heading('lti_types', get_string('external_tool_types', 'lti') . $OUTPUT->help_icon('main_admin', 'lti'), $template));
 }
diff --git a/mod/lti/submissions.js b/mod/lti/submissions.js
index 9689138abf7..2f4e730b5a6 100644
--- a/mod/lti/submissions.js
+++ b/mod/lti/submissions.js
@@ -37,9 +37,9 @@
         },
 
         setupTable: function(){
-            var lti_submissions_table = YAHOO.util.Dom.get('lti_submissions_table');
+            var lti_submissions_table = Y.YUI2.util.Dom.get('lti_submissions_table');
 
-            var dataSource = new YAHOO.util.DataSource(lti_submissions_table);
+            var dataSource = new Y.YUI2.util.DataSource(lti_submissions_table);
 
             var configuredColumns = [
                 { key: "user", label: "User", sortable:true },
@@ -53,7 +53,7 @@
                 }
             ];
 
-            dataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
+            dataSource.responseType = Y.YUI2.util.DataSource.TYPE_HTMLTABLE;
             dataSource.responseSchema = {
                 fields: [
                     { key: "user" },
@@ -62,7 +62,7 @@
                 ]
             };
 
-            new YAHOO.widget.DataTable("lti_submissions_table_container", configuredColumns, dataSource,
+            new Y.YUI2.widget.DataTable("lti_submissions_table_container", configuredColumns, dataSource,
                 {
                     sortedBy: {key:"date", dir:"desc"}
                 }
diff --git a/mod/lti/view.php b/mod/lti/view.php
index 5399bd72d93..c07408a1871 100644
--- a/mod/lti/view.php
+++ b/mod/lti/view.php
@@ -124,11 +124,11 @@ if ( $launchcontainer == LTI_LAUNCH_CONTAINER_WINDOW ) {
     $resize = '
         <script type="text/javascript">
         //<![CDATA[
-            (function(){
+            YUI().use("yui2-dom", function(Y) {
                 //Take scrollbars off the outer document to prevent double scroll bar effect
                 document.body.style.overflow = "hidden";
 
-                var dom = YAHOO.util.Dom;
+                var dom = Y.YUI2.util.Dom;
                 var frame = document.getElementById("contentframe");
 
                 var padding = 15; //The bottom of the iframe wasn\'t visible on some themes. Probably because of border widths, etc.
@@ -149,7 +149,7 @@ if ( $launchcontainer == LTI_LAUNCH_CONTAINER_WINDOW ) {
                 resize();
 
                 setInterval(resize, 250);
-            })();
+            });
         //]]
         </script>
 ';