From b0d62c9b2c7b7053e2c411462e7cca6a44b9147a Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Tue, 11 Nov 2014 18:49:31 +0300 Subject: [PATCH] Fixed slider, rusha --- app/css/app.css | 2 +- app/js/directives.js | 5 +++++ app/js/lib/ng_utils.js | 2 +- gulpfile.js | 2 ++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/css/app.css b/app/css/app.css index 42e128ef..3fcb938d 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -617,7 +617,7 @@ a.tg_radio_on:hover i.icon-radio { height: 12px; border-radius: 6px; margin-top: 4px; - overflow: hidden; + /*overflow: hidden;*/ z-index: 3; } diff --git a/app/js/directives.js b/app/js/directives.js index 3ee01257..a3555475 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -2182,6 +2182,11 @@ angular.module('myApp.directives', ['myApp.filters']) } stopMouseTrack(); + e = e.originalEvent || e; + + if (e.offsetX == undefined) { + e.offsetX = e.layerX; + } lastMinPageX = e.pageX - e.offsetX; // console.log('mdown', lastMinPageX, e.pageX, e.offsetX); lastUpdValue = minValue + e.offsetX / width * (maxValue - minValue); diff --git a/app/js/lib/ng_utils.js b/app/js/lib/ng_utils.js index 40436120..0993366d 100644 --- a/app/js/lib/ng_utils.js +++ b/app/js/lib/ng_utils.js @@ -500,7 +500,7 @@ angular.module('izhukov.utils', []) }; if (navigator.mimeTypes['application/x-pnacl'] !== undefined) { - var listener = $('
').appendTo($('body'))[0]; + var listener = $('
').appendTo($('body'))[0]; listener.addEventListener('load', function (e) { naClEmbed = listener.firstChild; console.log(dT(), 'NaCl ready'); diff --git a/gulpfile.js b/gulpfile.js index 81a07a06..c9d07024 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -55,6 +55,8 @@ gulp.task('copy', function() { .pipe(gulp.dest('dist/vendor/jsbn')), gulp.src('app/vendor/leemon_bigint/bigint.js') .pipe(gulp.dest('dist/vendor/leemon_bigint')), + gulp.src('app/vendor/rusha/rusha.js') + .pipe(gulp.dest('dist/vendor/rusha')), gulp.src('app/vendor/cryptoJS/crypto.js') .pipe(gulp.dest('dist/vendor/cryptoJS')), gulp.src(['app/nacl/mtproto_crypto.pexe', 'app/nacl/mtproto_crypto.nmf'])