r252597 - in zettwerk.clickmap/trunk: . docs zettwerk/clickmap/browser/javascripts

Author: jkubaile
Date: Fri Sep 27 12:35:34 2013
New Revision: 252597

Modified:
   zettwerk.clickmap/trunk/docs/HISTORY.txt
   zettwerk.clickmap/trunk/setup.py
   zettwerk.clickmap/trunk/zettwerk/clickmap/browser/javascripts/clickmap.js
Log:
Back to development: 0.2.0

Modified: zettwerk.clickmap/trunk/docs/HISTORY.txt
==============================================================================
--- zettwerk.clickmap/trunk/docs/HISTORY.txt	(original)
+++ zettwerk.clickmap/trunk/docs/HISTORY.txt	Fri Sep 27 12:35:34 2013
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.2.0 (unreleased)
+------------------
+
+- Nothing changed yet.
+
+
 0.13 (2012-03-02)
 -----------------
 

Modified: zettwerk.clickmap/trunk/setup.py
==============================================================================
--- zettwerk.clickmap/trunk/setup.py	(original)
+++ zettwerk.clickmap/trunk/setup.py	Fri Sep 27 12:35:34 2013
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = '0.13'
+version = '0.2.0.dev0'
 
 setup(name='zettwerk.clickmap',
       version=version,

Modified: zettwerk.clickmap/trunk/zettwerk/clickmap/browser/javascripts/clickmap.js
==============================================================================
--- zettwerk.clickmap/trunk/zettwerk/clickmap/browser/javascripts/clickmap.js	(original)
+++ zettwerk.clickmap/trunk/zettwerk/clickmap/browser/javascripts/clickmap.js	Fri Sep 27 12:35:34 2013
@@ -1,6 +1,6 @@
-(function(jq) { 
+(function(jq) {
     jq.fn.saveClicks = function() {
-	jq(this).bind('mousedown.clickmap', function(evt) {
+	$(this).bind('mousedown.clickmap', function(evt) {
 	    var data = collectClickerData(evt);
 	    jq.post(clickmap_tool_url+'/clicker', {
 		'x:int': data['x'],
@@ -9,15 +9,15 @@
 		'uid': clickmap_uid
 	    });
 	});
-    }; 
-    
+    };
+
     jq.fn.stopSaveClicks = function() {
-	jq(this).unbind('mousedown.clickmap');
+	$(this).unbind('mousedown.clickmap');
     };
-})(jQuery); 
+})(jQuery);
 
 function collectClickerData(evt) {
-    /* 
+    /*
        collect the values, needed for the clicker call.
        x: is the x position of the click relative from #visual-portal-wrapper
        y: is the y position of the click relative from #visual-portal-wrapper
@@ -31,16 +31,16 @@
 
 function getVisualReference() {
     /* all used coordinates are relative to a reference. */
-    return jq('#visual-portal-wrapper');
+    return $('#visual-portal-wrapper');
 }
 
 function showClickmapOutput() {
     var visual_reference = getVisualReference();
     visual_reference.width(clickmap_output_width); // make the coords suitable
-    
+
     var src = clickmap_tool_url+'/drawImage';
     src += '?uid='+clickmap_uid;
-    
+
     var pos = visual_reference.offset();
     var styles = 'z-index: 100; left: '+pos['left']+'px; top: '+pos['top']+'px;';
     styles += 'position: absolute; background-color: silver; display: none; border: 1px solid red';
@@ -51,26 +51,26 @@
     var output_controller = '<div style="'+controller_styles+'" id="clickmap_output_controller"></div>';
     visual_reference.append('<div style="'+styles+'" id="clickmap_output">'+output_image_tag+output_controller+'</div>');
 
-    jq('#clickmap_output').fadeTo('slow', 
-				  0.0, 
-				  function() { jq(this).show(); }
+    $('#clickmap_output').fadeTo('slow',
+				  0.0,
+				  function() { $(this).show(); }
 				  );
-    jq('#clickmap_output').fadeTo('slow', 0.63);
+    $('#clickmap_output').fadeTo('slow', 0.63);
 
-    jq('#clickmap_output_controller').load(clickmap_tool_url+'/getControlPanel', {}, enableControlPanelForm);
+    $('#clickmap_output_controller').load(clickmap_tool_url+'/getControlPanel', {}, enableControlPanelForm);
 }
 
 function enableControlPanelForm() {
-    jq('#clickmap_output_controller_form input[name=refresh]').click(function() {
-	var start = jq('#clickmap_output_controller_form input[name=start]').val();
-	var end = jq('#clickmap_output_controller_form input[name=end]').val();
-	
+    $('#clickmap_output_controller_form input[name=refresh]').click(function() {
+	var start = $('#clickmap_output_controller_form input[name=start]').val();
+	var end = $('#clickmap_output_controller_form input[name=end]').val();
+
 	if (start && end) {
 	    var new_src = clickmap_tool_url+'/drawImage?uid='+clickmap_uid+'&start='+start+'&end='+end;
-	    
-	    jq('#clickmap_output').fadeTo('fast', 0.0);
-	    jq('#clickmap_output img').attr('src', new_src);
-	    jq('#clickmap_output').fadeTo('slow', 0.63);
+
+	    $('#clickmap_output').fadeTo('fast', 0.0);
+	    $('#clickmap_output img').attr('src', new_src);
+	    $('#clickmap_output').fadeTo('slow', 0.63);
 	} else {
 	    alert ("Please enter some date");
 	}
@@ -79,7 +79,7 @@
 }
 
 function clickmapSetup() {
-    /* 
+    /*
        we resize the windows viewport to check if the visual reference resizes also.
        If so, then the page has a variable width and the right_align_threshold must be set.
        Otherwise, the page uses a fixed width and the threshold must not be set.
@@ -95,13 +95,13 @@
     window.resizeTo(current_window_width,
 		    window.outerHeight);
 
-    jq('#form\\.output_width').val(visual_reference.outerWidth());
-    jq('#form\\.output_height').val(window.outerHeight);
+    $('#form\\.output_width').val(visual_reference.outerWidth());
+    $('#form\\.output_height').val(window.outerHeight);
 
     if (is_constant_layout) {
-	jq('#form\\.right_align_threshold').val(0);	
+	$('#form\\.right_align_threshold').val(0);
     } else {
-	jq('#form\\.right_align_threshold').val(Math.round(visual_reference.outerWidth() / 3 * 2));
+	$('#form\\.right_align_threshold').val(Math.round(visual_reference.outerWidth() / 3 * 2));
     }
 }
 
@@ -111,13 +111,13 @@
     }
 }
 
-jq(document.body).ready(function() {
+$(document.body).ready(function() {
     if (clickmap_uid != '') {
 	if (show_clickmap_output) {
 	    showClickmapOutput();
 	}
-	else 
+	else
 	    if (clickmap_do)
-		jq('#visual-portal-wrapper').saveClicks();
+		$('#visual-portal-wrapper').saveClicks();
     }
 });

------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk