etc

4 files changed, 56 insertions, 61 deletions

diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js
index 1385820..20c3577 100644
--- a/public/assets/javascripts/ui/editor/LightControl.js
+++ b/public/assets/javascripts/ui/editor/LightControl.js
@@ -12,4 +12,25 @@ var LightControl = View.extend({
     // $("body").removeClass("pastePaper");
 	},
 
+/*
+	$("#shadow-control").on({
+		mousedown: function(){ app.dragging = true },
+		change: function(){
+			var hex = (~~($(this).int() / 100 * 0xff)).toString(10)
+			if (hex.length == 1) hex = "0" + hex;
+			var color = "rgba(" + [hex, hex, hex, "1.0"] + ")"
+			$(".face").css("border-color", color)
+		}
+	})
+
+	$("#brightness-control").on({
+		mousedown: function(){ app.dragging = true },
+		change: function(){
+			var hex = (~~($(this).int() / 100 * 0xff)).toString(10)
+			var color = "rgba(" + [hex, hex, hex, "0.9"] + ")"
+			$("body,.face").css("background-color", color)
+		}
+	})
+*/
+
 })
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 4ae6f97..e48c5b6 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -74,7 +74,6 @@ var MediaViewer = ModalView.extend({
 		if (typeof state != "boolean") {
 			state = ! this.deleteIsArmed
 		}
-		console.log(state)
 		this.deleteIsArmed = state
 		$("body").toggleClass("deleteArmed", state)
 	},
@@ -102,3 +101,32 @@ var MediaViewer = ModalView.extend({
 	},
 
 })
+
+//   function placeMedia(evt, img) {
+//   	// JULES DO YO THANG
+//   	alert('Place media at (' + evt.pageX + ', ' + evt.pageY + ')');
+//   }
+// 
+// 	$('.mediaContainer img').mousedown(function(e){
+// 		e.preventDefault()
+// 		e.stopPropagation()
+// 	})
+//   $('.mediaContainer img').click(function (e) {
+// 		e.stopPropagation()
+//   	$(".mediaDrawer, .fileUpload, .addMedia").removeClass("active icon-close");
+//   	$floatingImg.attr('src', $(this).attr('src'));
+//   	function _followCursor(e) {
+//   		$floatingImg.parent().css({
+//   			top: (e.pageY - ($floatingImg.height() / 2)) + 'px',
+//   			left: (e.pageX - ($floatingImg.width() / 2)) + 'px'
+//   		});
+//   	}
+//   	$(window).on('mousemove', _followCursor);
+//   	$(window, this).one('click', function () {
+//   		$floatingImg.attr('src', '');
+//   		$(window).off('mousemove', _followCursor);
+//   		$floatingImg.parent().removeClass('edit');
+//   	});
+//   	$floatingImg.parent().addClass('edit');
+//   	_followCursor(e);
+//   });
diff --git a/public/assets/javascripts/ui/z_misc.js b/public/assets/javascripts/ui/z_misc.js
index c0f7983..7f58f32 100644
--- a/public/assets/javascripts/ui/z_misc.js
+++ b/public/assets/javascripts/ui/z_misc.js
@@ -25,56 +25,18 @@ function bind () {
   // Place media logic
   var $floatingImg = $('.floatingImg');
 
-  function placeMedia(evt, img) {
-  	// JULES DO YO THANG
-  	alert('Place media at (' + evt.pageX + ', ' + evt.pageY + ')');
-  }
-
-	$('.mediaContainer img').mousedown(function(e){
-		e.preventDefault()
-		e.stopPropagation()
-	})
-  $('.mediaContainer img').click(function (e) {
-		e.stopPropagation()
-  	$(".mediaDrawer, .fileUpload, .addMedia").removeClass("active icon-close");
-  	$floatingImg.attr('src', $(this).attr('src'));
-  	function _followCursor(e) {
-  		$floatingImg.parent().css({
-  			top: (e.pageY - ($floatingImg.height() / 2)) + 'px',
-  			left: (e.pageX - ($floatingImg.width() / 2)) + 'px'
-  		});
-  	}
-  	$(window).on('mousemove', _followCursor);
-  	$(window, this).one('click', function () {
-  		$floatingImg.attr('src', '');
-  		$(window).off('mousemove', _followCursor);
-  		$floatingImg.parent().removeClass('edit');
-  	});
-  	$floatingImg.parent().addClass('edit');
-  	_followCursor(e);
-  });
-
   $(".icon-map").click(function(){
     $("#minimap").toggleClass("hide");
     $(this).toggleClass('hidden');
   });
 
-  
-  $(".edit-text-toggle").clickToToggle(function(isActive){
-    $(".image").toggleClass("editText", isActive);
-  });
-  
-  
-  $("#deleteMedia").click(function(){
-    $("body").toggleClass("deleteArmed");
-  });
-  
+
   $("#startpoint").click(function(){
     $(this).toggleClass("active");
     $("#startText").toggleClass("hide");
     $("#moveText").toggleClass("show");
   });
-  
+
 
   $(document).on("click", ".icon-close", disable_mode)
 
@@ -84,27 +46,7 @@ function bind () {
     $(".image").removeClass("editText")
     $("body").removeClass("deleteArmed")
   }
-
-	$("#shadow-control").on({
-		mousedown: function(){ app.dragging = true },
-		change: function(){
-			var hex = (~~($(this).int() / 100 * 0xff)).toString(10)
-			if (hex.length == 1) hex = "0" + hex;
-			var color = "rgba(" + [hex, hex, hex, "1.0"] + ")"
-			$(".face").css("border-color", color)
-		}
-	})
-
-	$("#brightness-control").on({
-		mousedown: function(){ app.dragging = true },
-		change: function(){
-			var hex = (~~($(this).int() / 100 * 0xff)).toString(10)
-			var color = "rgba(" + [hex, hex, hex, "0.9"] + ")"
-			$("body,.face").css("background-color", color)
-		}
-	})
 	
-
 	//
 	// EDIT IMAGE HOVER MENU
 	
diff --git a/views/staff.ejs b/views/staff.ejs
index 13a0361..0db8ebc 100644
--- a/views/staff.ejs
+++ b/views/staff.ejs
@@ -8,9 +8,13 @@
 <div class="rapper page">
 	[[ include partials/header ]]
 
+	<br clear="all">
+	<h1>Staff Area</h1>
+	<!--
   - recent users
   - rooms list
   - projects list
+	-->
 
 	[[ include partials/confirm-modal ]]
 	[[ include partials/footer ]]