Browse Source

Fixed slider, rusha

master
Igor Zhukov 10 years ago
parent
commit
b0d62c9b2c
  1. 2
      app/css/app.css
  2. 5
      app/js/directives.js
  3. 2
      app/js/lib/ng_utils.js
  4. 2
      gulpfile.js

2
app/css/app.css

@ -617,7 +617,7 @@ a.tg_radio_on:hover i.icon-radio {
height: 12px; height: 12px;
border-radius: 6px; border-radius: 6px;
margin-top: 4px; margin-top: 4px;
overflow: hidden; /*overflow: hidden;*/
z-index: 3; z-index: 3;
} }

5
app/js/directives.js

@ -2182,6 +2182,11 @@ angular.module('myApp.directives', ['myApp.filters'])
} }
stopMouseTrack(); stopMouseTrack();
e = e.originalEvent || e;
if (e.offsetX == undefined) {
e.offsetX = e.layerX;
}
lastMinPageX = e.pageX - e.offsetX; lastMinPageX = e.pageX - e.offsetX;
// console.log('mdown', lastMinPageX, e.pageX, e.offsetX); // console.log('mdown', lastMinPageX, e.pageX, e.offsetX);
lastUpdValue = minValue + e.offsetX / width * (maxValue - minValue); lastUpdValue = minValue + e.offsetX / width * (maxValue - minValue);

2
app/js/lib/ng_utils.js

@ -500,7 +500,7 @@ angular.module('izhukov.utils', [])
}; };
if (navigator.mimeTypes['application/x-pnacl'] !== undefined) { if (navigator.mimeTypes['application/x-pnacl'] !== undefined) {
var listener = $('<div id="nacl_listener"><embed id="mtproto_crypto" width="0" height="0" src="nacl/mtproto_crypto.nmf?'+Math.random()+'" type="application/x-pnacl" /></div>').appendTo($('body'))[0]; var listener = $('<div id="nacl_listener"><embed id="mtproto_crypto" width="0" height="0" src="nacl/mtproto_crypto.nmf" type="application/x-pnacl" /></div>').appendTo($('body'))[0];
listener.addEventListener('load', function (e) { listener.addEventListener('load', function (e) {
naClEmbed = listener.firstChild; naClEmbed = listener.firstChild;
console.log(dT(), 'NaCl ready'); console.log(dT(), 'NaCl ready');

2
gulpfile.js

@ -55,6 +55,8 @@ gulp.task('copy', function() {
.pipe(gulp.dest('dist/vendor/jsbn')), .pipe(gulp.dest('dist/vendor/jsbn')),
gulp.src('app/vendor/leemon_bigint/bigint.js') gulp.src('app/vendor/leemon_bigint/bigint.js')
.pipe(gulp.dest('dist/vendor/leemon_bigint')), .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') gulp.src('app/vendor/cryptoJS/crypto.js')
.pipe(gulp.dest('dist/vendor/cryptoJS')), .pipe(gulp.dest('dist/vendor/cryptoJS')),
gulp.src(['app/nacl/mtproto_crypto.pexe', 'app/nacl/mtproto_crypto.nmf']) gulp.src(['app/nacl/mtproto_crypto.pexe', 'app/nacl/mtproto_crypto.nmf'])

Loading…
Cancel
Save