Removed the global scope of the App and userList variables.

Author: pstaabp

htdocs/js/apps/UserList/userlist.js

@@ -1,8 +1,9 @@
+/*  userlist.js:
+   This is the base javascript code for the UserList3.pm (Classlist Editor3).  This sets up the View and the classlist object.
+  
+  You must include the User.js code before this in order to user the UserList class. 
+*/
 
-// this variable was defined inside the following, but I think it needs global scope.
-
-var userList;
-var App;
 
 
 $(function(){
@@ -89,9 +90,11 @@ $(function(){
             }, this);
             this.model.on('all', this.render, this);
             this.model.fetch();
+	    this.model.on('add',this.addOne,this); 
 
 
             document.getElementById("filter").addEventListener("keyup", function(){self.el.filter(document.getElementById("filter").value)}, false);
+	    $("input#testButton").click(function() {self.model.trigger("addstudent")});
         },
 
         render: function(){
@@ -113,9 +116,9 @@ $(function(){
 
     });
 
-    userList = new webwork.UserList;
+    var userList = new webwork.UserList;
 
-    App = new UserListView({model: userList});
+    var App = new UserListView({model: userList});
 
     // then we attach to the HTML table and render it
     //editableGrid.attachToHTMLTable('cltable');
@@ -157,6 +160,6 @@ window.onload = function()
 function addStud()
 {
 
-    var u = new webwork.User({"first_name":"Homer","last_name":"Simpson","user_id":"hsimp"});
-    userList.add(u);
+ //   var u = new webwork.User({"first_name":"Homer","last_name":"Simpson","user_id":"hsimp"});
+  //  userList.add(u);
 }

htdocs/js/lib/webwork/teacher/User.js

@@ -69,11 +69,16 @@ webwork.UserList = Backbone.Collection.extend({
             $.post(webwork.webserviceURL, requestObject, function(data){
                 var response = $.parseJSON(data);
                 console.log(response);
-                App.model.trigger('reset');
             });
 
             }, this);
         this.on('remove', function(user){}, this);
+        
+        // This is used to temporarily add a single (hard coded) student. 
+        this.on('addstudent',function(user){
+            var u = new webwork.User({"first_name":"Homer","last_name":"Simpson","user_id":"hsimp"});
+            this.add(u);
+        })
     },
 
     fetch: function(){
@@ -93,5 +98,6 @@ webwork.UserList = Backbone.Collection.extend({
     },
     email: function(students){
 
-    }    
+    }
+    
 });

lib/WeBWorK/ContentGenerator/Instructor/UserList3.pm

@@ -503,7 +503,7 @@ sub body {
 				   \%labels,\%attributes),
 	    "<label for='filter'>Filter :</label><input type='text' id='filter'/>");
 
-	print CGI::div(CGI::button(-value=>"Add User",-onClick=>"addStud()"));
+	print CGI::div(CGI::button(-value=>"Add User",-id=>"testButton"));
 
 	$self->printTableHTML(\@Users, \@PermissionLevels, \%prettyFieldNames,
 		editMode => $editMode,