can3p (can3p) wrote in changelog,
can3p
can3p
changelog

[ljcom] r11522: LJSUP-11099: LJ Shop. Change LJ Tokens m...

Committer: dpetrov
LJSUP-11099: LJ Shop. Change LJ Tokens mechanics
U   trunk/cgi-bin/LJ/Widget/Shop.pm
U   trunk/htdocs/js/jquery/jquery.lj.range.js
U   trunk/htdocs/shop/tokens.bml
Modified: trunk/cgi-bin/LJ/Widget/Shop.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/Shop.pm	2012-02-22 13:40:08 UTC (rev 11521)
+++ trunk/cgi-bin/LJ/Widget/Shop.pm	2012-02-22 14:36:39 UTC (rev 11522)
@@ -423,12 +423,6 @@
         stc/framework/layout.css
         stc/framework/modules.css
         stc/shop/shop.css
-        stc/widgets/range.css
-        js/jquery/jquery.hotkeys.js
-        js/jquery/jquery.ui.mouse.min.js
-        js/jquery/jquery.ui.draggable.min.js
-        js/jquery/jquery.lj.range.js
-        js/jquery/shop/jquery.lj.tokenSelect.js
     ));
     LJ::need_res( {condition => 'IE'}, 'stc/shop/ie.css');
 }

Modified: trunk/htdocs/js/jquery/jquery.lj.range.js
===================================================================
--- trunk/htdocs/js/jquery/jquery.lj.range.js	2012-02-22 13:40:08 UTC (rev 11521)
+++ trunk/htdocs/js/jquery/jquery.lj.range.js	2012-02-22 14:36:39 UTC (rev 11522)
@@ -76,7 +76,11 @@
 				.keyup(this._onKeyUp.bind(this));
 
 			this.element
-				.bind('mousedown touchstart', this._onChange.bind(this))
+				.bind('mousedown touchstart', function(ev) {
+					if (self._el('handle')[0] !== this.currentTarget) {
+						self._onChange;
+					}
+				});
 
 			this._input
 				.input(this._onInput.bind(this))
@@ -172,7 +176,6 @@
 
 			if (x <= this._offsets[0]) { return delims[0]; }
 			if (x >= this._offsets[this._offsets.length - 1]) {
-				console.log(delims[delims.length - 1]);
 				return delims[delims.length - 1];
 			} 
 

Modified: trunk/htdocs/shop/tokens.bml
===================================================================
--- trunk/htdocs/shop/tokens.bml	2012-02-22 13:40:08 UTC (rev 11521)
+++ trunk/htdocs/shop/tokens.bml	2012-02-22 14:36:39 UTC (rev 11522)
@@ -17,6 +17,7 @@
     BML::set_language_scope('wallet.bml.landing');
     LJ::need_string('number.punctuation');
     LJ::need_res(qw(
+        stc/widgets/range.css
         js/jquery/jquery.hotkeys.js
         js/jquery/jquery.ui.mouse.min.js
         js/jquery/jquery.ui.draggable.min.js

Tags: bml, can3p, dpetrov, js, ljcom, pm
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments