r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'pr/6'

Browse Source
This commit is contained in:
Igor Zhukov 2014-01-24 22:07:46 +04:00
commit ecbb4b3060
8 changed files with 186 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/index.html
View File

@ -21,6 +21,7 @@
<div ng-view></div> <div ng-view></div>
<script type="text/javascript" src="vendor/console-polyfill/console-polyfill.js"></script>
<script type="text/javascript" src="vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="vendor/jquery.nanoscroller/nanoscroller.js"></script> <script type="text/javascript" src="vendor/jquery.nanoscroller/nanoscroller.js"></script>
<script type="text/javascript" src="vendor/jquery.emojiarea/jquery.emojiarea.js"></script> <script type="text/javascript" src="vendor/jquery.emojiarea/jquery.emojiarea.js"></script>

22
app/js/controllers.js
View File

@ -59,9 +59,9 @@ angular.module('myApp.controllers', [])
$scope.error = {}; $scope.error = {};
}, function (error) { }, function (error) {
dLog(error); console.log(error);
$scope.progress.enabled = false; $scope.progress.enabled = false;
dLog('sendCode error', error); console.log('sendCode error', error);
switch (error.type) { switch (error.type) {
case 'PHONE_NUMBER_INVALID': case 'PHONE_NUMBER_INVALID':
$scope.error = {field: 'phone'}; $scope.error = {field: 'phone'};
@ -263,7 +263,7 @@ angular.module('myApp.controllers', [])
function updateHistoryPeer(preload) { function updateHistoryPeer(preload) {
var peerData = AppPeersManager.getPeer(peerID); var peerData = AppPeersManager.getPeer(peerID);
// dLog('update', preload, peerData); // console.log('update', preload, peerData);
if (!peerData || peerData.deleted) { if (!peerData || peerData.deleted) {
return false; return false;
} }
@ -348,14 +348,14 @@ angular.module('myApp.controllers', [])
$scope.$on('history_append', function (e, addedMessage) { $scope.$on('history_append', function (e, addedMessage) {
if (addedMessage.peerID == $scope.curDialog.peerID) { if (addedMessage.peerID == $scope.curDialog.peerID) {
// dLog('append', addedMessage); // console.log('append', addedMessage);
// console.trace(); // console.trace();
$scope.history.push(AppMessagesManager.wrapForHistory(addedMessage.messageID)); $scope.history.push(AppMessagesManager.wrapForHistory(addedMessage.messageID));
$scope.typing = {}; $scope.typing = {};
$scope.$broadcast('ui_history_append'); $scope.$broadcast('ui_history_append');
offset++; offset++;
// dLog('append check', $rootScope.idle.isIDLE, addedMessage.peerID, $scope.curDialog.peerID); // console.log('append check', $rootScope.idle.isIDLE, addedMessage.peerID, $scope.curDialog.peerID);
if (!$rootScope.idle.isIDLE) { if (!$rootScope.idle.isIDLE) {
$timeout(function () { $timeout(function () {
AppMessagesManager.readHistory($scope.curDialog.inputPeer); AppMessagesManager.readHistory($scope.curDialog.inputPeer);
@ -365,7 +365,7 @@ angular.module('myApp.controllers', [])
}); });
$scope.$on('apiUpdate', function (e, update) { $scope.$on('apiUpdate', function (e, update) {
// dLog('on apiUpdate inline', update); // console.log('on apiUpdate inline', update);
switch (update._) { switch (update._) {
case 'updateUserTyping': case 'updateUserTyping':
if (update.user_id == $scope.curDialog.peerID && AppUsersManager.hasUser(update.user_id)) { if (update.user_id == $scope.curDialog.peerID && AppUsersManager.hasUser(update.user_id)) {
@ -424,10 +424,10 @@ angular.module('myApp.controllers', [])
var backupDraftObj = {}; var backupDraftObj = {};
backupDraftObj['draft' + $scope.curDialog.peerID] = newVal; backupDraftObj['draft' + $scope.curDialog.peerID] = newVal;
AppConfigManager.set(backupDraftObj); AppConfigManager.set(backupDraftObj);
// dLog('draft save', backupDraftObj); // console.log('draft save', backupDraftObj);
} else { } else {
AppConfigManager.remove('draft' + $scope.curDialog.peerID); AppConfigManager.remove('draft' + $scope.curDialog.peerID);
// dLog('draft delete', 'draft' + $scope.curDialog.peerID); // console.log('draft delete', 'draft' + $scope.curDialog.peerID);
} }
var now = +new Date(); var now = +new Date();
@ -475,13 +475,13 @@ angular.module('myApp.controllers', [])
function resetDraft (newPeer) { function resetDraft (newPeer) {
if (newPeer) { if (newPeer) {
AppConfigManager.get('draft' + $scope.curDialog.peerID).then(function (draftText) { AppConfigManager.get('draft' + $scope.curDialog.peerID).then(function (draftText) {
// dLog('Restore draft', 'draft' + $scope.curDialog.peerID, draftText); // console.log('Restore draft', 'draft' + $scope.curDialog.peerID, draftText);
$scope.draftMessage.text = draftText || ''; $scope.draftMessage.text = draftText || '';
// dLog('send broadcast', $scope.draftMessage); // console.log('send broadcast', $scope.draftMessage);
$scope.$broadcast('ui_peer_draft'); $scope.$broadcast('ui_peer_draft');
}); });
} else { } else {
// dLog('Reset peer'); // console.log('Reset peer');
$scope.draftMessage.text = ''; $scope.draftMessage.text = '';
} }
} }

9
app/js/directives.js
View File

@ -282,7 +282,6 @@ angular.module('myApp.directives', ['myApp.filters'])
if (richTextarea) { if (richTextarea) {
scope.$watch('draftMessage.text', function (newVal) { scope.$watch('draftMessage.text', function (newVal) {
dLog('on update', newVal);
if (!newVal.length && !messageField.value.length) { if (!newVal.length && !messageField.value.length) {
$timeout(function () { $timeout(function () {
updateField(); updateField();
@ -292,8 +291,6 @@ angular.module('myApp.directives', ['myApp.filters'])
} }
function updateField () { function updateField () {
dLog(scope.draftMessage);
dLog('update field', scope.draftMessage.text);
$(richTextarea).text(scope.draftMessage.text || ''); $(richTextarea).text(scope.draftMessage.text || '');
} }
@ -387,7 +384,7 @@ angular.module('myApp.directives', ['myApp.filters'])
element.attr('src', url); element.attr('src', url);
} }
}, function (e) { }, function (e) {
dLog('Download image failed', e, scope.thumb.location); console.log('Download image failed', e, scope.thumb.location);
if (counterSaved == counter) { if (counterSaved == counter) {
element.attr('src', scope.thumb.placeholder || 'img/blank.gif'); element.attr('src', scope.thumb.placeholder || 'img/blank.gif');
} }
@ -466,7 +463,7 @@ angular.module('myApp.directives', ['myApp.filters'])
.removeClass('thumb_blurred'); .removeClass('thumb_blurred');
}, function (e) { }, function (e) {
dLog('Download image failed', e, scope.fullPhoto.location); console.log('Download image failed', e, scope.fullPhoto.location);
scope.progress.enabled = false; scope.progress.enabled = false;
if (e && e.type == 'FS_BROWSER_UNSUPPORTED') { if (e && e.type == 'FS_BROWSER_UNSUPPORTED') {
@ -549,7 +546,7 @@ angular.module('myApp.directives', ['myApp.filters'])
scope.player.quicktime = hasQt; scope.player.quicktime = hasQt;
scope.player.src = $sce.trustAsResourceUrl(url); scope.player.src = $sce.trustAsResourceUrl(url);
}, function (e) { }, function (e) {
dLog('Download video failed', e, scope.video); console.log('Download video failed', e, scope.video);
scope.progress.enabled = false; scope.progress.enabled = false;
scope.player.src = ''; scope.player.src = '';

214
app/js/lib/mtproto.js
View File

@ -5,20 +5,6 @@
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE
*/ */
var _logTimer = (new Date()).getTime();
function dLog () {
try {
var t = '[' + (((new Date()).getTime() - _logTimer) / 1000).toFixed(3) + '] ';
if (window.console && console.log) {
var args = Array.prototype.slice.call(arguments);
args.unshift(t);
console.log.apply(console, args);
}
} catch (e) {}
return true;
}
function bigint (num) { function bigint (num) {
return new BigInteger(num.toString(16), 16); return new BigInteger(num.toString(16), 16);
} }
@ -199,9 +185,9 @@ function uintToInt (val) {
} }
function sha1Hash (bytes) { function sha1Hash (bytes) {
// dLog('SHA-1 hash start'); // console.log('SHA-1 hash start');
var hashBytes = sha1.hash(bytes, true); var hashBytes = sha1.hash(bytes, true);
// dLog('SHA-1 hash finish'); // console.log('SHA-1 hash finish');
return hashBytes; return hashBytes;
} }
@ -217,20 +203,20 @@ function rsaEncrypt (publicKey, bytes) {
bytes = bytes.concat(padding); bytes = bytes.concat(padding);
} }
// dLog('RSA encrypt start'); // console.log('RSA encrypt start');
var N = new BigInteger(publicKey.modulus, 16), var N = new BigInteger(publicKey.modulus, 16),
E = new BigInteger(publicKey.exponent, 16), E = new BigInteger(publicKey.exponent, 16),
X = new BigInteger(bytes), X = new BigInteger(bytes),
encryptedBigInt = X.modPowInt(E, N), encryptedBigInt = X.modPowInt(E, N),
encryptedBytes = bytesFromBigInt(encryptedBigInt, 256); encryptedBytes = bytesFromBigInt(encryptedBigInt, 256);
// dLog('RSA encrypt finish'); // console.log('RSA encrypt finish');
return encryptedBytes; return encryptedBytes;
} }
function aesEncrypt (bytes, keyBytes, ivBytes) { function aesEncrypt (bytes, keyBytes, ivBytes) {
// dLog('AES encrypt start', bytes.length/*, bytesToHex(keyBytes), bytesToHex(ivBytes)*/); // console.log('AES encrypt start', bytes.length/*, bytesToHex(keyBytes), bytesToHex(ivBytes)*/);
var needPadding = 16 - (bytes.length % 16); var needPadding = 16 - (bytes.length % 16);
if (needPadding > 0 && needPadding < 16) { if (needPadding > 0 && needPadding < 16) {
@ -248,13 +234,13 @@ function aesEncrypt (bytes, keyBytes, ivBytes) {
var encryptedBytes = bytesFromWords(encryptedWords); var encryptedBytes = bytesFromWords(encryptedWords);
// dLog('AES encrypt finish'); // console.log('AES encrypt finish');
return encryptedBytes; return encryptedBytes;
} }
function aesDecrypt (encryptedBytes, keyBytes, ivBytes) { function aesDecrypt (encryptedBytes, keyBytes, ivBytes) {
// dLog('AES decrypt start', encryptedBytes.length/*, bytesToHex(keyBytes), bytesToHex(ivBytes)*/); // console.log('AES decrypt start', encryptedBytes.length/*, bytesToHex(keyBytes), bytesToHex(ivBytes)*/);
var decryptedWords = CryptoJS.AES.decrypt({ciphertext: bytesToWords(encryptedBytes)}, bytesToWords(keyBytes), { var decryptedWords = CryptoJS.AES.decrypt({ciphertext: bytesToWords(encryptedBytes)}, bytesToWords(keyBytes), {
iv: bytesToWords(ivBytes), iv: bytesToWords(ivBytes),
@ -264,15 +250,15 @@ function aesDecrypt (encryptedBytes, keyBytes, ivBytes) {
var bytes = bytesFromWords(decryptedWords); var bytes = bytesFromWords(decryptedWords);
// dLog('AES decrypt finish'); // console.log('AES decrypt finish');
return bytes; return bytes;
} }
function gzipUncompress (bytes) { function gzipUncompress (bytes) {
// dLog('Gzip uncompress start'); // console.log('Gzip uncompress start');
var result = (new Zlib.Gunzip(bytes)).decompress(); var result = (new Zlib.Gunzip(bytes)).decompress();
// dLog('Gzip uncompress finish'); // console.log('Gzip uncompress finish');
return result; return result;
} }
@ -281,7 +267,7 @@ function nextRandomInt (maxValue) {
}; };
function pqPrimeFactorization (pqBytes) { function pqPrimeFactorization (pqBytes) {
dLog('PQ start'); console.log('PQ start');
var what = new BigInteger(pqBytes), var what = new BigInteger(pqBytes),
g; g;
@ -338,7 +324,7 @@ function pqPrimeFactorization (pqBytes) {
Q = f; Q = f;
} }
dLog('PQ finish', it + ' iterations'); console.log('PQ finish', it + ' iterations');
return [bytesFromBigInt(P), bytesFromBigInt(Q)]; return [bytesFromBigInt(P), bytesFromBigInt(Q)];
} }
@ -388,7 +374,7 @@ TLSerialization.prototype.checkLength = function (needBytes) {
return; return;
} }
dLog('Increase buffer', this.offset, needBytes, this.maxLength); console.log('Increase buffer', this.offset, needBytes, this.maxLength);
console.trace(); console.trace();
this.maxLength = Math.max(this.maxLength * 2, this.offset + needBytes + 16); this.maxLength = Math.max(this.maxLength * 2, this.offset + needBytes + 16);
var previousBuffer = this.buffer, var previousBuffer = this.buffer,
@ -400,7 +386,7 @@ TLSerialization.prototype.checkLength = function (needBytes) {
}; };
TLSerialization.prototype.writeInt = function (i, field) { TLSerialization.prototype.writeInt = function (i, field) {
this.debug && dLog('>>>', i.toString(16), i, field); this.debug && console.log('>>>', i.toString(16), i, field);
this.checkLength(4); this.checkLength(4);
this.intView[this.offset / 4] = i; this.intView[this.offset / 4] = i;
@ -451,7 +437,7 @@ TLSerialization.prototype.storeDouble = function (f) {
}; };
TLSerialization.prototype.storeString = function (s, field) { TLSerialization.prototype.storeString = function (s, field) {
this.debug && dLog('>>>', s, (field || '') + ':string'); this.debug && console.log('>>>', s, (field || '') + ':string');
var sUTF8 = unescape(encodeURIComponent(s)); var sUTF8 = unescape(encodeURIComponent(s));
@ -479,7 +465,7 @@ TLSerialization.prototype.storeString = function (s, field) {
TLSerialization.prototype.storeBytes = function (bytes, field) { TLSerialization.prototype.storeBytes = function (bytes, field) {
this.debug && dLog('>>>', bytesToHex(bytes), (field || '') + ':bytes'); this.debug && console.log('>>>', bytesToHex(bytes), (field || '') + ':bytes');
this.checkLength(bytes.length + 8); this.checkLength(bytes.length + 8);
@ -508,7 +494,7 @@ TLSerialization.prototype.storeIntBytes = function (bytes, bits, field) {
throw new Error('Invalid bits: ' + bits + ', ' + bytes.length); throw new Error('Invalid bits: ' + bits + ', ' + bytes.length);
} }
this.debug && dLog('>>>', bytesToHex(bytes), (field || '') + ':int' + bits); this.debug && console.log('>>>', bytesToHex(bytes), (field || '') + ':int' + bits);
this.checkLength(len); this.checkLength(len);
for (var i = 0; i < len; i++) { for (var i = 0; i < len; i++) {
@ -519,7 +505,7 @@ TLSerialization.prototype.storeIntBytes = function (bytes, bits, field) {
TLSerialization.prototype.storeRawBytes = function (bytes, field) { TLSerialization.prototype.storeRawBytes = function (bytes, field) {
var len = bytes.length; var len = bytes.length;
this.debug && dLog('>>>', bytesToHex(bytes), (field || '')); this.debug && console.log('>>>', bytesToHex(bytes), (field || ''));
this.checkLength(len); this.checkLength(len);
for (var i = 0; i < len; i++) { for (var i = 0; i < len; i++) {
@ -643,7 +629,7 @@ TLDeserialization.prototype.readInt = function (field) {
var i = this.intView[this.offset / 4]; var i = this.intView[this.offset / 4];
this.debug && dLog('<<<', i.toString(16), i, field); this.debug && console.log('<<<', i.toString(16), i, field);
this.offset += 4; this.offset += 4;
@ -709,7 +695,7 @@ TLDeserialization.prototype.fetchString = function (field) {
var s = sUTF8; var s = sUTF8;
} }
this.debug && dLog('<<<', s, (field || '') + ':string'); this.debug && console.log('<<<', s, (field || '') + ':string');
return s; return s;
} }
@ -734,7 +720,7 @@ TLDeserialization.prototype.fetchBytes = function (field) {
this.offset++; this.offset++;
} }
this.debug && dLog('<<<', bytesToHex(bytes), (field || '') + ':bytes'); this.debug && console.log('<<<', bytesToHex(bytes), (field || '') + ':bytes');
return bytes; return bytes;
} }
@ -750,7 +736,7 @@ TLDeserialization.prototype.fetchIntBytes = function (bits, field) {
bytes.push(this.byteView[this.offset++]); bytes.push(this.byteView[this.offset++]);
} }
this.debug && dLog('<<<', bytesToHex(bytes), (field || '') + ':int' + bits); this.debug && console.log('<<<', bytesToHex(bytes), (field || '') + ':int' + bits);
return bytes; return bytes;
}; };
@ -766,7 +752,7 @@ TLDeserialization.prototype.fetchRawBytes = function (len, field) {
bytes.push(this.byteView[this.offset++]); bytes.push(this.byteView[this.offset++]);
} }
this.debug && dLog('<<<', bytesToHex(bytes), (field || '')); this.debug && console.log('<<<', bytesToHex(bytes), (field || ''));
return bytes; return bytes;
}; };
@ -1035,14 +1021,14 @@ factory('MtpMessageIdGenerator', function (AppConfigManager) {
lastMessageID = messageID; lastMessageID = messageID;
// dLog('generated msg id', messageID); // console.log('generated msg id', messageID);
return longFromInts(messageID[0], messageID[1]); return longFromInts(messageID[0], messageID[1]);
}; };
function applyServerTime (serverTime, localTime) { function applyServerTime (serverTime, localTime) {
timeOffset = serverTime - Math.floor((localTime || +new Date()) / 1000); timeOffset = serverTime - Math.floor((localTime || +new Date()) / 1000);
dLog('Apply server time', serverTime, localTime, timeOffset); console.log('Apply server time', serverTime, localTime, timeOffset);
AppConfigManager.set({server_time_offset: timeOffset}); AppConfigManager.set({server_time_offset: timeOffset});
}; };
@ -1100,7 +1086,7 @@ factory('MtpAuthorizer', function (MtpDcConfigurator, MtpRsaKeysManager, MtpSecu
request.storeMethod('req_pq', {nonce: auth.nonce}); request.storeMethod('req_pq', {nonce: auth.nonce});
dLog('Send req_pq', bytesToHex(auth.nonce)); console.log('Send req_pq', bytesToHex(auth.nonce));
mtpSendPlainRequest(auth.dcID, request.getBuffer()).then(function (result) { mtpSendPlainRequest(auth.dcID, request.getBuffer()).then(function (result) {
var deserializer = result.data; var deserializer = result.data;
var response = deserializer.fetchObject('ResPQ'); var response = deserializer.fetchObject('ResPQ');
@ -1117,7 +1103,7 @@ factory('MtpAuthorizer', function (MtpDcConfigurator, MtpRsaKeysManager, MtpSecu
auth.pq = response.pq; auth.pq = response.pq;
auth.fingerprints = response.server_public_key_fingerprints; auth.fingerprints = response.server_public_key_fingerprints;
dLog('Got ResPQ', bytesToHex(auth.serverNonce), bytesToHex(auth.pq), auth.fingerprints); console.log('Got ResPQ', bytesToHex(auth.serverNonce), bytesToHex(auth.pq), auth.fingerprints);
auth.publicKey = MtpRsaKeysManager.select(auth.fingerprints); auth.publicKey = MtpRsaKeysManager.select(auth.fingerprints);
@ -1125,7 +1111,7 @@ factory('MtpAuthorizer', function (MtpDcConfigurator, MtpRsaKeysManager, MtpSecu
throw new Error('No public key found'); throw new Error('No public key found');
} }
dLog('PQ factorization start'); console.log('PQ factorization start');
if (!!window.Worker) { if (!!window.Worker) {
var worker = new Worker('js/lib/pq_worker.js'); var worker = new Worker('js/lib/pq_worker.js');
@ -1135,7 +1121,7 @@ factory('MtpAuthorizer', function (MtpDcConfigurator, MtpRsaKeysManager, MtpSecu
mtpSendReqDhParams(auth); mtpSendReqDhParams(auth);
}; };
worker.onerror = function(error) { worker.onerror = function(error) {
dLog('Worker error', error); console.log('Worker error', error);
deferred.reject(error); deferred.reject(error);
}; };
worker.postMessage(auth.pq) worker.postMessage(auth.pq)
@ -1184,7 +1170,7 @@ factory('MtpAuthorizer', function (MtpDcConfigurator, MtpRsaKeysManager, MtpSecu
encrypted_data: rsaEncrypt(auth.publicKey, dataWithHash) encrypted_data: rsaEncrypt(auth.publicKey, dataWithHash)
}); });
dLog('Send req_DH_params'); console.log('Send req_DH_params');
mtpSendPlainRequest(auth.dcID, request.getBuffer()).then(function (result) { mtpSendPlainRequest(auth.dcID, request.getBuffer()).then(function (result) {
var deserializer = result.data; var deserializer = result.data;
var response = deserializer.fetchObject('Server_DH_Params', 'RESPONSE'); var response = deserializer.fetchObject('Server_DH_Params', 'RESPONSE');
@ -1254,7 +1240,7 @@ factory('MtpAuthorizer', function (MtpDcConfigurator, MtpRsaKeysManager, MtpSecu
throw new Error('server_DH_inner_data serverNonce mismatch'); throw new Error('server_DH_inner_data serverNonce mismatch');
} }
dLog('Done decrypting answer'); console.log('Done decrypting answer');
auth.g = response.g; auth.g = response.g;
auth.dhPrime = response.dh_prime; auth.dhPrime = response.dh_prime;
auth.gA = response.g_a; auth.gA = response.g_a;
@ -1301,7 +1287,7 @@ factory('MtpAuthorizer', function (MtpDcConfigurator, MtpRsaKeysManager, MtpSecu
encrypted_data: encryptedData encrypted_data: encryptedData
}); });
dLog('Send set_client_DH_params'); console.log('Send set_client_DH_params');
mtpSendPlainRequest(auth.dcID, request.getBuffer()).then(function (result) { mtpSendPlainRequest(auth.dcID, request.getBuffer()).then(function (result) {
var deserializer = result.data; var deserializer = result.data;
var response = deserializer.fetchObject('Set_client_DH_params_answer'); var response = deserializer.fetchObject('Set_client_DH_params_answer');
@ -1329,7 +1315,7 @@ factory('MtpAuthorizer', function (MtpDcConfigurator, MtpRsaKeysManager, MtpSecu
authKeyAux = authKeyHash.slice(0, 8), authKeyAux = authKeyHash.slice(0, 8),
authKeyID = authKeyHash.slice(-8); authKeyID = authKeyHash.slice(-8);
dLog('Got Set_client_DH_params_answer', response._); console.log('Got Set_client_DH_params_answer', response._);
switch (response._) { switch (response._) {
case 'dh_gen_ok': case 'dh_gen_ok':
var newNonceHash1 = sha1Hash(auth.newNonce.concat([1], authKeyAux)).slice(-16); var newNonceHash1 = sha1Hash(auth.newNonce.concat([1], authKeyAux)).slice(-16);
@ -1340,7 +1326,7 @@ factory('MtpAuthorizer', function (MtpDcConfigurator, MtpRsaKeysManager, MtpSecu
} }
var serverSalt = bytesXor(auth.newNonce.slice(0, 8), auth.serverNonce.slice(0, 8)); var serverSalt = bytesXor(auth.newNonce.slice(0, 8), auth.serverNonce.slice(0, 8));
// dLog('Auth successfull!', authKeyID, authKey, serverSalt); // console.log('Auth successfull!', authKeyID, authKey, serverSalt);
auth.authKeyID = authKeyID; auth.authKeyID = authKeyID;
auth.authKey = authKey; auth.authKey = authKey;
@ -1431,10 +1417,10 @@ factory('MtpAesService', function ($q) {
deferred.resolve(e.data.result); deferred.resolve(e.data.result);
delete awaiting[e.data.taskID]; delete awaiting[e.data.taskID];
} }
// dLog('AES worker message', e.data, deferred); // console.log('AES worker message', e.data, deferred);
}; };
worker.onerror = function(error) { worker.onerror = function(error) {
dLog('AES Worker error', error); console.log('AES Worker error', error);
}; };
return { return {
@ -1443,7 +1429,7 @@ factory('MtpAesService', function ($q) {
awaiting[taskID] = deferred; awaiting[taskID] = deferred;
// dLog('AES post message', {taskID: taskID, task: 'encrypt', bytes: bytes, keyBytes: keyBytes, ivBytes: ivBytes}) // console.log('AES post message', {taskID: taskID, task: 'encrypt', bytes: bytes, keyBytes: keyBytes, ivBytes: ivBytes})
worker.postMessage({taskID: taskID, task: 'encrypt', bytes: bytes, keyBytes: keyBytes, ivBytes: ivBytes}); worker.postMessage({taskID: taskID, task: 'encrypt', bytes: bytes, keyBytes: keyBytes, ivBytes: ivBytes});
taskID++ taskID++
@ -1483,10 +1469,10 @@ factory('MtpSha1Service', function ($q) {
deferred.resolve(e.data.result); deferred.resolve(e.data.result);
delete awaiting[e.data.taskID]; delete awaiting[e.data.taskID];
} }
// dLog('sha1 got message', e.data, deferred); // console.log('sha1 got message', e.data, deferred);
}; };
worker.onerror = function(error) { worker.onerror = function(error) {
dLog('SHA-1 Worker error', error); console.log('SHA-1 Worker error', error);
}; };
return { return {
@ -1494,7 +1480,7 @@ factory('MtpSha1Service', function ($q) {
var deferred = $q.defer(); var deferred = $q.defer();
awaiting[taskID] = deferred; awaiting[taskID] = deferred;
// dLog(11, taskID, bytes); // console.log(11, taskID, bytes);
worker.postMessage({taskID: taskID, bytes: bytes}); worker.postMessage({taskID: taskID, bytes: bytes});
taskID++; taskID++;
@ -1519,7 +1505,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
// if (1 == dcID) { // if (1 == dcID) {
// var self = this; // var self = this;
// (function () { // (function () {
// dLog('update server salt'); // console.log('update server salt');
// self.serverSalt = [0,0,0,0,0,0,0,0]; // self.serverSalt = [0,0,0,0,0,0,0,0];
// setTimeout(arguments.callee, nextRandomInt(2000, 12345)); // setTimeout(arguments.callee, nextRandomInt(2000, 12345));
// })(); // })();
@ -1577,7 +1563,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
}; };
if (window._debugMode) { if (window._debugMode) {
dLog('MT call', method, params, messageID, seqNo); console.log('MT call', method, params, messageID, seqNo);
} }
return this.pushMessage(message, options); return this.pushMessage(message, options);
@ -1598,7 +1584,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
}; };
if (window._debugMode) { if (window._debugMode) {
dLog('MT message', object, messageID, seqNo); console.log('MT message', object, messageID, seqNo);
} }
return this.pushMessage(message, options); return this.pushMessage(message, options);
@ -1629,9 +1615,9 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
}; };
if (window._debugMode) { if (window._debugMode) {
dLog('Api call', method, params, messageID, seqNo) console.log('Api call', method, params, messageID, seqNo)
} else { } else {
dLog('Api call', method, messageID, seqNo); console.log('Api call', method, messageID, seqNo);
} }
return this.pushMessage(message, options); return this.pushMessage(message, options);
@ -1639,7 +1625,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
MtpNetworker.prototype.checkLongPoll = function(force) { MtpNetworker.prototype.checkLongPoll = function(force) {
var isClean = this.cleanupSent(); var isClean = this.cleanupSent();
// dLog('Check lp', this.longPollPending, (new Date().getTime())); // console.log('Check lp', this.longPollPending, (new Date().getTime()));
if (this.longPollPending && (new Date().getTime()) < this.longPollPending) { if (this.longPollPending && (new Date().getTime()) < this.longPollPending) {
return false; return false;
} }
@ -1656,7 +1642,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
MtpNetworker.prototype.sendLongPoll = function() { MtpNetworker.prototype.sendLongPoll = function() {
var maxWait = 25000; var maxWait = 25000;
this.longPollPending = (new Date().getTime()) + maxWait; this.longPollPending = (new Date().getTime()) + maxWait;
// dLog('Set lp', this.longPollPending, (new Date().getTime())); // console.log('Set lp', this.longPollPending, (new Date().getTime()));
this.wrapMtpCall('http_wait', {max_delay: 0, wait_after: 0, max_wait: maxWait}, {noResponse: true}). this.wrapMtpCall('http_wait', {max_delay: 0, wait_after: 0, max_wait: maxWait}, {noResponse: true}).
then((function () { then((function () {
@ -1689,7 +1675,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
this.pendingMessages[messageID] = value; this.pendingMessages[messageID] = value;
} }
// dLog('Resend due', messageID, this.pendingMessages); // console.log('Resend due', messageID, this.pendingMessages);
this.sheduleRequest(delay); this.sheduleRequest(delay);
}; };
@ -1715,14 +1701,14 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
MtpNetworker.prototype.performSheduledRequest = function() { MtpNetworker.prototype.performSheduledRequest = function() {
// dLog('start sheduled'); // console.log('start sheduled');
delete this.nextReq; delete this.nextReq;
if (this.pendingAcks.length) { if (this.pendingAcks.length) {
var ackMsgIDs = []; var ackMsgIDs = [];
for (var i = 0; i < this.pendingAcks.length; i++) { for (var i = 0; i < this.pendingAcks.length; i++) {
ackMsgIDs.push(this.pendingAcks[i]); ackMsgIDs.push(this.pendingAcks[i]);
} }
// dLog('acking messages', ackMsgIDs); // console.log('acking messages', ackMsgIDs);
this.wrapMtpMessage({_: 'msgs_ack', msg_ids: ackMsgIDs}, {notContentRelated: true, noShedule: true}); this.wrapMtpMessage({_: 'msgs_ack', msg_ids: ackMsgIDs}, {notContentRelated: true, noShedule: true});
} }
@ -1731,7 +1717,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
for (var i = 0; i < this.pendingResends.length; i++) { for (var i = 0; i < this.pendingResends.length; i++) {
resendMsgIDs.push(this.pendingResends[i]); resendMsgIDs.push(this.pendingResends[i]);
} }
// dLog('resendReq messages', resendMsgIDs); // console.log('resendReq messages', resendMsgIDs);
this.wrapMtpMessage({_: 'msg_resend_req', msg_ids: resendMsgIDs}, {noShedule: true}); this.wrapMtpMessage({_: 'msg_resend_req', msg_ids: resendMsgIDs}, {noShedule: true});
} }
@ -1747,14 +1733,14 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
messages.push(message); messages.push(message);
messagesByteLen += message.body.length + 32; messagesByteLen += message.body.length + 32;
} else { } else {
// dLog(message, messageID); // console.log(message, messageID);
} }
delete self.pendingMessages[messageID]; delete self.pendingMessages[messageID];
} }
}); });
if (!messages.length) { if (!messages.length) {
// dLog('no sheduled messages'); // console.log('no sheduled messages');
return; return;
} }
@ -1789,7 +1775,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
this.sentMessages[message.msg_id] = containerSentMessage; this.sentMessages[message.msg_id] = containerSentMessage;
if (window._debugMode) { if (window._debugMode) {
dLog('Container', innerMessages, message.msg_id, message.seq_no); console.log('Container', innerMessages, message.msg_id, message.seq_no);
} }
} else { } else {
if (message.noResponse) { if (message.noResponse) {
@ -1804,7 +1790,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
this.sendEncryptedRequest(message).then(function (result) { this.sendEncryptedRequest(message).then(function (result) {
self.parseResponse(result.data).then(function (response) { self.parseResponse(result.data).then(function (response) {
if (window._debugMode) { if (window._debugMode) {
dLog('Server response', self.dcID, response); console.log('Server response', self.dcID, response);
} }
self.processMessage(response.response, response.messageID, response.sessionID); self.processMessage(response.response, response.messageID, response.sessionID);
@ -1825,15 +1811,15 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
MtpNetworker.prototype.getEncryptedMessage = function (bytes) { MtpNetworker.prototype.getEncryptedMessage = function (bytes) {
var self = this; var self = this;
// dLog('enc', bytes); // console.log('enc', bytes);
return MtpSha1Service.hash(bytes).then(function (bytesHash) { return MtpSha1Service.hash(bytes).then(function (bytesHash) {
// dLog('bytesHash', bytesHash); // console.log('bytesHash', bytesHash);
var msgKey = bytesHash.slice(-16); var msgKey = bytesHash.slice(-16);
return self.getMsgKeyIv(msgKey, true).then(function (keyIv) { return self.getMsgKeyIv(msgKey, true).then(function (keyIv) {
// dLog('keyIv', keyIv); // console.log('keyIv', keyIv);
return MtpAesService.encrypt(bytes, keyIv[0], keyIv[1]).then(function (encryptedBytes) { return MtpAesService.encrypt(bytes, keyIv[0], keyIv[1]).then(function (encryptedBytes) {
// dLog('encryptedBytes', encryptedBytes); // console.log('encryptedBytes', encryptedBytes);
return { return {
bytes: encryptedBytes, bytes: encryptedBytes,
msgKey: msgKey msgKey: msgKey
@ -1851,7 +1837,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
MtpNetworker.prototype.sendEncryptedRequest = function (message) { MtpNetworker.prototype.sendEncryptedRequest = function (message) {
var self = this; var self = this;
// dLog('send encrypted', message); // console.log('send encrypted', message);
// console.trace(); // console.trace();
var data = new TLSerialization({startMaxLength: message.body.length + 64}); var data = new TLSerialization({startMaxLength: message.body.length + 64});
@ -1865,7 +1851,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
data.storeRawBytes(message.body, 'message_data'); data.storeRawBytes(message.body, 'message_data');
return this.getEncryptedMessage(data.getBytes()).then(function (encryptedResult) { return this.getEncryptedMessage(data.getBytes()).then(function (encryptedResult) {
// dLog('got enc result', encryptedResult); // console.log('got enc result', encryptedResult);
var request = new TLSerialization({startMaxLength: encryptedResult.bytes.length + 256}); var request = new TLSerialization({startMaxLength: encryptedResult.bytes.length + 256});
request.storeIntBytes(self.authKeyID, 64, 'auth_key_id'); request.storeIntBytes(self.authKeyID, 64, 'auth_key_id');
request.storeIntBytes(encryptedResult.msgKey, 128, 'msg_key'); request.storeIntBytes(encryptedResult.msgKey, 128, 'msg_key');
@ -1948,7 +1934,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
return false; return false;
} }
// dLog('shedule req', delay); // console.log('shedule req', delay);
// console.trace(); // console.trace();
clearTimeout(this.nextReqTO); clearTimeout(this.nextReqTO);
@ -1958,17 +1944,17 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
}; };
MtpNetworker.prototype.onSessionCreate = function (sessionID, messageID) { MtpNetworker.prototype.onSessionCreate = function (sessionID, messageID) {
dLog('New session created', bytesToHex(sessionID)); console.log('New session created', bytesToHex(sessionID));
}; };
MtpNetworker.prototype.ackMessage = function (msgID) { MtpNetworker.prototype.ackMessage = function (msgID) {
// dLog('ack message', msgID); // console.log('ack message', msgID);
this.pendingAcks.push(msgID); this.pendingAcks.push(msgID);
this.sheduleRequest(30000); this.sheduleRequest(30000);
}; };
MtpNetworker.prototype.reqResendMessage = function (msgID) { MtpNetworker.prototype.reqResendMessage = function (msgID) {
dLog('req resend', msgID); console.log('req resend', msgID);
this.pendingResends.push(msgID); this.pendingResends.push(msgID);
this.sheduleRequest(100); this.sheduleRequest(100);
}; };
@ -1976,22 +1962,22 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
MtpNetworker.prototype.cleanupSent = function () { MtpNetworker.prototype.cleanupSent = function () {
var self = this; var self = this;
var notEmpty = false; var notEmpty = false;
// dLog('clean start', this.dcID/*, this.sentMessages*/); // console.log('clean start', this.dcID/*, this.sentMessages*/);
angular.forEach(this.sentMessages, function(message, msgID) { angular.forEach(this.sentMessages, function(message, msgID) {
// dLog('clean iter', msgID, message); // console.log('clean iter', msgID, message);
if (message.notContentRelated && self.pendingMessages[msgID] === undefined) { if (message.notContentRelated && self.pendingMessages[msgID] === undefined) {
// dLog('clean notContentRelated', msgID); // console.log('clean notContentRelated', msgID);
delete self.sentMessages[msgID]; delete self.sentMessages[msgID];
} }
else if (message.container) { else if (message.container) {
for (var i = 0; i < message.inner.length; i++) { for (var i = 0; i < message.inner.length; i++) {
if (self.sentMessages[message.inner[i]] !== undefined) { if (self.sentMessages[message.inner[i]] !== undefined) {
// dLog('clean failed, found', msgID, message.inner[i], self.sentMessages[message.inner[i]].seq_no); // console.log('clean failed, found', msgID, message.inner[i], self.sentMessages[message.inner[i]].seq_no);
notEmpty = true; notEmpty = true;
return; return;
} }
} }
// dLog('clean container', msgID); // console.log('clean container', msgID);
delete self.sentMessages[msgID]; delete self.sentMessages[msgID];
} else { } else {
notEmpty = true; notEmpty = true;
@ -2028,7 +2014,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
MtpNetworker.prototype.processMessage = function (message, messageID, sessionID) { MtpNetworker.prototype.processMessage = function (message, messageID, sessionID) {
// dLog('process message', message, messageID, sessionID); // console.log('process message', message, messageID, sessionID);
switch (message._) { switch (message._) {
case 'msg_container': case 'msg_container':
var len = message.messages.length; var len = message.messages.length;
@ -2038,10 +2024,10 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
break; break;
case 'bad_server_salt': case 'bad_server_salt':
dLog('Bad server salt', message); console.log('Bad server salt', message);
var sentMsg = this.sentMessages[message.bad_msg_id]; var sentMsg = this.sentMessages[message.bad_msg_id];
if (!sentMsg || sentMsg.seq_no != message.bad_msg_seqno) { if (!sentMsg || sentMsg.seq_no != message.bad_msg_seqno) {
dLog(message.bad_msg_id, message.bad_msg_seqno); console.log(message.bad_msg_id, message.bad_msg_seqno);
throw new Error('Bad server salt for invalid message'); throw new Error('Bad server salt for invalid message');
} }
@ -2051,10 +2037,10 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
break; break;
case 'bad_msg_notification': case 'bad_msg_notification':
dLog('Bad msg notification', message); console.log('Bad msg notification', message);
var sentMsg = this.sentMessages[message.bad_msg_id]; var sentMsg = this.sentMessages[message.bad_msg_id];
if (!sentMsg || sentMsg.seq_no != message.bad_msg_seqno) { if (!sentMsg || sentMsg.seq_no != message.bad_msg_seqno) {
dLog(message.bad_msg_id, message.bad_msg_seqno); console.log(message.bad_msg_id, message.bad_msg_seqno);
throw new Error('Bad msg notification for invalid message'); throw new Error('Bad msg notification for invalid message');
} }
@ -2105,13 +2091,13 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
var deferred = sentMessage.deferred; var deferred = sentMessage.deferred;
if (message.result._ == 'rpc_error') { if (message.result._ == 'rpc_error') {
var error = this.processError(message.result); var error = this.processError(message.result);
dLog('rpc error', error) console.log('rpc error', error)
if (deferred) { if (deferred) {
deferred.reject(error) deferred.reject(error)
} }
} else { } else {
if (deferred) { if (deferred) {
dLog('rpc response', message.result._); console.log('rpc response', message.result._);
sentMessage.deferred.resolve(message.result); sentMessage.deferred.resolve(message.result);
} }
if (sentMessage.isAPI) { if (sentMessage.isAPI) {
@ -2126,7 +2112,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
default: default:
this.ackMessage(messageID); this.ackMessage(messageID);
// dLog('Update', message); // console.log('Update', message);
if (updatesProcessor) { if (updatesProcessor) {
updatesProcessor(message); updatesProcessor(message);
} }
@ -2194,7 +2180,7 @@ factory('MtpApiManager', function (AppConfigManager, MtpAuthorizer, MtpNetworker
var authKeyHex = result[0], var authKeyHex = result[0],
serverSaltHex = result[1]; serverSaltHex = result[1];
// dLog('ass', dcID, authKeyHex, serverSaltHex); // console.log('ass', dcID, authKeyHex, serverSaltHex);
if (authKeyHex && authKeyHex.length == 512) { if (authKeyHex && authKeyHex.length == 512) {
var authKey = bytesFromHex(authKeyHex); var authKey = bytesFromHex(authKeyHex);
var serverSalt = bytesFromHex(serverSaltHex); var serverSalt = bytesFromHex(serverSaltHex);
@ -2210,7 +2196,7 @@ factory('MtpApiManager', function (AppConfigManager, MtpAuthorizer, MtpNetworker
return cachedNetworkers[dcID] = MtpNetworkerFactory.getNetworker(dcID, auth.authKey, auth.serverSalt); return cachedNetworkers[dcID] = MtpNetworkerFactory.getNetworker(dcID, auth.authKey, auth.serverSalt);
}, function (error) { }, function (error) {
dLog('Get networker error', error, error.stack); console.log('Get networker error', error, error.stack);
return $q.reject(error); return $q.reject(error);
}); });
}); });
@ -2242,7 +2228,7 @@ factory('MtpApiManager', function (AppConfigManager, MtpAuthorizer, MtpNetworker
// }, 1000); // }, 1000);
}, },
function (error) { function (error) {
dLog('error', error.code, error.type, baseDcID, dcID); console.log('error', error.code, error.type, baseDcID, dcID);
if (error.code == 401 && error.type == 'AUTH_KEY_UNREGISTERED' && baseDcID && dcID != baseDcID) { if (error.code == 401 && error.type == 'AUTH_KEY_UNREGISTERED' && baseDcID && dcID != baseDcID) {
if (cachedExportPromise[dcID] === undefined) { if (cachedExportPromise[dcID] === undefined) {
var exportDeferred = $q.defer(); var exportDeferred = $q.defer();
@ -2263,7 +2249,7 @@ factory('MtpApiManager', function (AppConfigManager, MtpAuthorizer, MtpNetworker
cachedExportPromise[dcID] = exportDeferred.promise; cachedExportPromise[dcID] = exportDeferred.promise;
} }
// dLog('promise', cachedExportPromise[dcID]); // console.log('promise', cachedExportPromise[dcID]);
cachedExportPromise[dcID] = cachedExportPromise[dcID].then(function () { cachedExportPromise[dcID] = cachedExportPromise[dcID].then(function () {
(cachedNetworker = networker).wrapApiCall(method, params, options).then(function (result) { (cachedNetworker = networker).wrapApiCall(method, params, options).then(function (result) {
@ -2480,7 +2466,7 @@ factory('MtpApiFileManager', function (MtpApiManager, $q, $window) {
} }
function downloadSmallFile(location) { function downloadSmallFile(location) {
// dLog('dload small', location); // console.log('dload small', location);
var fileName = getFileName(location), var fileName = getFileName(location),
cachedPromise = cachedSavePromises[fileName] || cachedDownloadPromises[fileName]; cachedPromise = cachedSavePromises[fileName] || cachedDownloadPromises[fileName];
@ -2498,7 +2484,7 @@ factory('MtpApiFileManager', function (MtpApiManager, $q, $window) {
doDownload = function () { doDownload = function () {
cachedFS.root.getFile(fileName, {create: true}, function(fileEntry) { cachedFS.root.getFile(fileName, {create: true}, function(fileEntry) {
var downloadPromise = downloadRequest(location.dc_id, function () { var downloadPromise = downloadRequest(location.dc_id, function () {
// dLog('next small promise'); // console.log('next small promise');
return MtpApiManager.invokeApi('upload.getFile', { return MtpApiManager.invokeApi('upload.getFile', {
location: angular.extend({}, location, {_: 'inputFileLocation'}), location: angular.extend({}, location, {_: 'inputFileLocation'}),
offset: 0, offset: 0,
@ -2510,7 +2496,7 @@ factory('MtpApiFileManager', function (MtpApiManager, $q, $window) {
cacheFileWriter = fileWriter; cacheFileWriter = fileWriter;
downloadPromise.then(function (result) { downloadPromise.then(function (result) {
fileWriteBytes(fileWriter, result.bytes).then(function () { fileWriteBytes(fileWriter, result.bytes).then(function () {
// dLog('Success', location, fileEntry.toURL()); // console.log('Success', location, fileEntry.toURL());
deferred.resolve(cachedDownloads[fileName] = fileEntry.toURL()); deferred.resolve(cachedDownloads[fileName] = fileEntry.toURL());
}, errorHandler); }, errorHandler);
}, errorHandler); }, errorHandler);
@ -2524,7 +2510,7 @@ factory('MtpApiFileManager', function (MtpApiManager, $q, $window) {
if (file.size) { if (file.size) {
deferred.resolve(cachedDownloads[fileName] = fileEntry.toURL()); deferred.resolve(cachedDownloads[fileName] = fileEntry.toURL());
} else { } else {
dLog('Small file empty', file); console.log('Small file empty', file);
doDownload(); doDownload();
} }
}, errorHandler); }, errorHandler);
@ -2532,7 +2518,7 @@ factory('MtpApiFileManager', function (MtpApiManager, $q, $window) {
}, function (error) { }, function (error) {
downloadRequest(location.dc_id, function () { downloadRequest(location.dc_id, function () {
// dLog('next small promise'); // console.log('next small promise');
return MtpApiManager.invokeApi('upload.getFile', { return MtpApiManager.invokeApi('upload.getFile', {
location: angular.extend({}, location, {_: 'inputFileLocation'}), location: angular.extend({}, location, {_: 'inputFileLocation'}),
offset: 0, offset: 0,
@ -2547,7 +2533,7 @@ factory('MtpApiFileManager', function (MtpApiManager, $q, $window) {
} }
function downloadFile (dcID, location, size, fileEntry) { function downloadFile (dcID, location, size, fileEntry) {
dLog('dload file', dcID, location, size); console.log('dload file', dcID, location, size);
var fileName = getFileName(location), var fileName = getFileName(location),
cachedPromise = cachedSavePromises[fileName] || cachedDownloadPromises[fileName]; cachedPromise = cachedSavePromises[fileName] || cachedDownloadPromises[fileName];
@ -2559,7 +2545,7 @@ factory('MtpApiFileManager', function (MtpApiManager, $q, $window) {
cacheFileWriter, cacheFileWriter,
errorHandler = function (error) { errorHandler = function (error) {
console.error(error); console.error(error);
// dLog('fail'); // console.log('fail');
deferred.reject(error); deferred.reject(error);
if (cacheFileWriter) cacheFileWriter.truncate(0); if (cacheFileWriter) cacheFileWriter.truncate(0);
errorHandler = angular.noop; errorHandler = angular.noop;
@ -2577,7 +2563,7 @@ factory('MtpApiFileManager', function (MtpApiManager, $q, $window) {
writeFileDeferred = $q.defer(); writeFileDeferred = $q.defer();
(function (isFinal, offset, writeFileDeferred, writeFilePromise) { (function (isFinal, offset, writeFileDeferred, writeFilePromise) {
return downloadRequest(dcID, function () { return downloadRequest(dcID, function () {
// dLog('next big promise'); // console.log('next big promise');
return MtpApiManager.invokeApi('upload.getFile', { return MtpApiManager.invokeApi('upload.getFile', {
location: location, location: location,
offset: offset, offset: offset,
@ -2586,13 +2572,13 @@ factory('MtpApiFileManager', function (MtpApiManager, $q, $window) {
}, 6).then(function (result) { }, 6).then(function (result) {
// dLog('waiting for file promise', offset); // console.log('waiting for file promise', offset);
writeFilePromise.then(function () { writeFilePromise.then(function () {
// dLog('resolved file promise', offset); // console.log('resolved file promise', offset);
return fileWriteBytes(fileWriter, result.bytes).then(function () { return fileWriteBytes(fileWriter, result.bytes).then(function () {
// dLog('resolve file promise', offset); // console.log('resolve file promise', offset);
writeFileDeferred.resolve(); writeFileDeferred.resolve();
}, errorHandler).then(function () { }, errorHandler).then(function () {
@ -2600,7 +2586,7 @@ factory('MtpApiFileManager', function (MtpApiManager, $q, $window) {
if (isFinal) { if (isFinal) {
deferred.resolve(cachedDownloads[fileName] = fileEntry.toURL('image/jpeg')); deferred.resolve(cachedDownloads[fileName] = fileEntry.toURL('image/jpeg'));
} else { } else {
// dLog('notify', {done: offset + limit, total: size}); // console.log('notify', {done: offset + limit, total: size});
deferred.notify({done: offset + limit, total: size}); deferred.notify({done: offset + limit, total: size});
}; };
@ -2625,11 +2611,11 @@ factory('MtpApiFileManager', function (MtpApiManager, $q, $window) {
requestFS().then(function () { requestFS().then(function () {
cachedFS.root.getFile(fileName, {create: false}, function(fileEntry) { cachedFS.root.getFile(fileName, {create: false}, function(fileEntry) {
fileEntry.file(function(file) { fileEntry.file(function(file) {
dLog('check size', file.size, size); console.log('check size', file.size, size);
if (file.size >= size) { if (file.size >= size) {
deferred.resolve(cachedDownloads[fileName] = fileEntry.toURL()); deferred.resolve(cachedDownloads[fileName] = fileEntry.toURL());
} else { } else {
dLog('File bad size', file, size); console.log('File bad size', file, size);
cachedFS.root.getFile(fileName, {create: true}, saveToFileEntry, errorHandler) cachedFS.root.getFile(fileName, {create: true}, saveToFileEntry, errorHandler)
} }
}, errorHandler); }, errorHandler);
@ -2695,13 +2681,13 @@ factory('MtpApiFileManager', function (MtpApiManager, $q, $window) {
} }
function writeFile (file) { function writeFile (file) {
dLog('write file', file); console.log('write file', file);
var fileName = getTempFileName(file); var fileName = getTempFileName(file);
var deferred = $q.defer(), var deferred = $q.defer(),
cacheFileWriter, cacheFileWriter,
errorHandler = function (error) { errorHandler = function (error) {
dLog('fail'); console.log('fail');
deferred.reject(error); deferred.reject(error);
if (cacheFileWriter) cacheFileWriter.truncate(0); if (cacheFileWriter) cacheFileWriter.truncate(0);
errorHandler = angular.noop; errorHandler = angular.noop;
@ -2737,7 +2723,7 @@ factory('MtpApiFileManager', function (MtpApiManager, $q, $window) {
var fileID = [nextRandomInt(0xFFFFFFFF), nextRandomInt(0xFFFFFFFF)], var fileID = [nextRandomInt(0xFFFFFFFF), nextRandomInt(0xFFFFFFFF)],
deferred = $q.defer(), deferred = $q.defer(),
errorHandler = function (error) { errorHandler = function (error) {
dLog('error', error); console.log('error', error);
deferred.reject(error); deferred.reject(error);
errorHandler = angular.noop; errorHandler = angular.noop;
}, },
@ -2780,7 +2766,7 @@ factory('MtpApiFileManager', function (MtpApiManager, $q, $window) {
if (doneParts >= totalParts) { if (doneParts >= totalParts) {
deferred.resolve(resultInputFile); deferred.resolve(resultInputFile);
} else { } else {
dLog('Progress', doneParts * partSize / fileSize); console.log('Progress', doneParts * partSize / fileSize);
deferred.notify({done: doneParts * partSize, total: fileSize}); deferred.notify({done: doneParts * partSize, total: fileSize});
} }
}, errorHandler); }, errorHandler);

92
app/js/services.js
View File

@ -46,19 +46,19 @@ angular.module('myApp.services', [])
var deferred = $q.defer(); var deferred = $q.defer();
// dLog('get', keys); // console.log('get', keys);
chrome.storage.local.get(keys, function (resultObj) { chrome.storage.local.get(keys, function (resultObj) {
// dLog('got', resultObj); // console.log('got', resultObj);
result = []; result = [];
angular.forEach(keys, function (key) { angular.forEach(keys, function (key) {
var value = resultObj[key]; var value = resultObj[key];
// dLog('p1', key, value); // console.log('p1', key, value);
value = value === undefined || value === null ? false : JSON.parse(value); value = value === undefined || value === null ? false : JSON.parse(value);
// dLog('p2', value); // console.log('p2', value);
result.push(cache[key] = value); result.push(cache[key] = value);
}); });
// dLog('got parsed', result); // console.log('got parsed', result);
deferred.resolve(single ? result[0] : result); deferred.resolve(single ? result[0] : result);
}); });
@ -231,7 +231,7 @@ angular.module('myApp.services', [])
$rootScope.openUser = openUser; $rootScope.openUser = openUser;
$rootScope.$on('apiUpdate', function (e, update) { $rootScope.$on('apiUpdate', function (e, update) {
// dLog('on apiUpdate', update); // console.log('on apiUpdate', update);
switch (update._) { switch (update._) {
case 'updateUserStatus': case 'updateUserStatus':
var userID = update.user_id; var userID = update.user_id;
@ -486,7 +486,7 @@ angular.module('myApp.services', [])
} }
} }
} }
// dLog('history storage', angular.copy(historyStorage.history), maxID, offset); // console.log('history storage', angular.copy(historyStorage.history), maxID, offset);
if (historyStorage.count !== null && historyStorage.history.length >= offset + limit) { if (historyStorage.count !== null && historyStorage.history.length >= offset + limit) {
return $q.when({ return $q.when({
@ -520,13 +520,13 @@ angular.module('myApp.services', [])
} }
} }
// dLog('history storage after', angular.copy(historyStorage.history), historyResult.messages, maxID, offset); // console.log('history storage after', angular.copy(historyStorage.history), historyResult.messages, maxID, offset);
historyStorage.history.splice(offset, historyStorage.history.length - offset); historyStorage.history.splice(offset, historyStorage.history.length - offset);
angular.forEach(historyResult.messages, function (message) { angular.forEach(historyResult.messages, function (message) {
historyStorage.history.push(message.id); historyStorage.history.push(message.id);
}); });
// dLog('history storage final', angular.copy(historyStorage.history), historyResult.messages, maxID, offset); // console.log('history storage final', angular.copy(historyStorage.history), historyResult.messages, maxID, offset);
deferred.resolve({ deferred.resolve({
count: historyStorage.count, count: historyStorage.count,
@ -557,7 +557,7 @@ angular.module('myApp.services', [])
} }
function readHistory (inputPeer) { function readHistory (inputPeer) {
// dLog('start read'); // console.log('start read');
var peerID = AppPeersManager.getPeerID(inputPeer), var peerID = AppPeersManager.getPeerID(inputPeer),
historyStorage = historiesStorage[peerID], historyStorage = historiesStorage[peerID],
foundDialog = getDialogByPeerID(peerID); foundDialog = getDialogByPeerID(peerID);
@ -565,22 +565,22 @@ angular.module('myApp.services', [])
if (!historyStorage || if (!historyStorage ||
!historyStorage.history.length || !historyStorage.history.length ||
foundDialog[0] && !foundDialog[0].unread_count) { foundDialog[0] && !foundDialog[0].unread_count) {
// dLog('bad1', historyStorage, foundDialog[0]); // console.log('bad1', historyStorage, foundDialog[0]);
return false; return false;
} }
var wasUnread = false; var wasUnread = false;
// dLog(historyStorage); // console.log(historyStorage);
for (i = 0; i < historyStorage.history.length; i++) { for (i = 0; i < historyStorage.history.length; i++) {
messageID = historyStorage.history[i]; messageID = historyStorage.history[i];
message = messagesStorage[messageID]; message = messagesStorage[messageID];
// dLog('ms', message); // console.log('ms', message);
if (message && !message.out) { if (message && !message.out) {
if (message.unread) { if (message.unread) {
// dLog('unread'); // console.log('unread');
wasUnread = true; wasUnread = true;
} else if (!wasUnread) { } else if (!wasUnread) {
// dLog('bad2'); // console.log('bad2');
return false; return false;
} }
} }
@ -765,7 +765,7 @@ angular.module('myApp.services', [])
}); });
}, null, function (progress) { }, null, function (progress) {
// dLog('upload progress', progress); // console.log('upload progress', progress);
var historyMessage = messagesForHistory[messageID], var historyMessage = messagesForHistory[messageID],
percent = Math.max(1, Math.floor(100 * progress.done / progress.total)); percent = Math.max(1, Math.floor(100 * progress.done / progress.total));
@ -794,7 +794,7 @@ angular.module('myApp.services', [])
function finalizePendingMessage(randomID, finalMessage) { function finalizePendingMessage(randomID, finalMessage) {
var pendingData = pendingByRandomID[randomID]; var pendingData = pendingByRandomID[randomID];
// dLog('pdata', randomID, pendingData); // console.log('pdata', randomID, pendingData);
if (pendingData) { if (pendingData) {
var peerID = pendingData[0], var peerID = pendingData[0],
@ -805,7 +805,7 @@ angular.module('myApp.services', [])
historyMessage = false, historyMessage = false,
i; i;
// dLog('pending', randomID, historyStorage.pending); // console.log('pending', randomID, historyStorage.pending);
for (i = 0; i < historyStorage.pending.length; i++) { for (i = 0; i < historyStorage.pending.length; i++) {
if (historyStorage.pending[i] == tempID) { if (historyStorage.pending[i] == tempID) {
historyStorage.pending.splice(i, 1); historyStorage.pending.splice(i, 1);
@ -1009,7 +1009,7 @@ angular.module('myApp.services', [])
} }
$rootScope.$on('apiUpdate', function (e, update) { $rootScope.$on('apiUpdate', function (e, update) {
dLog('on apiUpdate', update); console.log('on apiUpdate', update);
switch (update._) { switch (update._) {
case 'updateMessageID': case 'updateMessageID':
pendingByMessageID[update.id] = update.random_id; pendingByMessageID[update.id] = update.random_id;
@ -1047,7 +1047,7 @@ angular.module('myApp.services', [])
delete pendingByMessageID[message.id]; delete pendingByMessageID[message.id];
} }
// dLog(11, randomID, pendingMessage); // console.log(11, randomID, pendingMessage);
if (!pendingMessage) { if (!pendingMessage) {
$rootScope.$broadcast('history_append', {peerID: peerID, messageID: message.id}); $rootScope.$broadcast('history_append', {peerID: peerID, messageID: message.id});
} }
@ -1085,11 +1085,11 @@ angular.module('myApp.services', [])
for (i = 0; i < update.messages.length; i++) { for (i = 0; i < update.messages.length; i++) {
messageID = update.messages[i]; messageID = update.messages[i];
message = messagesStorage[messageID]; message = messagesStorage[messageID];
// dLog('read', messageID, message); // console.log('read', messageID, message);
if (message) { if (message) {
message.unread = false; message.unread = false;
if (messagesForHistory[messageID]) { if (messagesForHistory[messageID]) {
// dLog(222, messagesForHistory[messageID]); // console.log(222, messagesForHistory[messageID]);
messagesForHistory[messageID].unread = false; messagesForHistory[messageID].unread = false;
} }
peerID = getMessagePeer(message); peerID = getMessagePeer(message);
@ -1166,7 +1166,7 @@ angular.module('myApp.services', [])
height: height height: height
}; };
// dLog('chosen photo size', photoID, thumbPhotoSize); // console.log('chosen photo size', photoID, thumbPhotoSize);
if (thumbPhotoSize && thumbPhotoSize._ != 'photoSizeEmpty') { if (thumbPhotoSize && thumbPhotoSize._ != 'photoSizeEmpty') {
if (thumbPhotoSize.w > thumbPhotoSize.h) { if (thumbPhotoSize.w > thumbPhotoSize.h) {
thumb.height = parseInt(thumbPhotoSize.h * width / thumbPhotoSize.w); thumb.height = parseInt(thumbPhotoSize.h * width / thumbPhotoSize.w);
@ -1397,7 +1397,7 @@ angular.module('myApp.services', [])
historyDoc.progress = {enabled: true, percent: 1, total: doc.size}; historyDoc.progress = {enabled: true, percent: 1, total: doc.size};
function updateDownloadProgress (progress) { function updateDownloadProgress (progress) {
dLog('dl progress', progress); console.log('dl progress', progress);
historyDoc.progress.done = progress.done; historyDoc.progress.done = progress.done;
historyDoc.progress.percent = Math.max(1, Math.floor(100 * progress.done / progress.total)); historyDoc.progress.percent = Math.max(1, Math.floor(100 * progress.done / progress.total));
$rootScope.$broadcast('history_update'); $rootScope.$broadcast('history_update');
@ -1417,9 +1417,9 @@ angular.module('myApp.services', [])
}, function (writableFileEntry) { }, function (writableFileEntry) {
MtpApiFileManager.downloadFile(doc.dc_id, inputFileLocation, doc.size, writableFileEntry).then(function (url) { MtpApiFileManager.downloadFile(doc.dc_id, inputFileLocation, doc.size, writableFileEntry).then(function (url) {
delete historyDoc.progress; delete historyDoc.progress;
dLog('file save done'); console.log('file save done');
}, function (e) { }, function (e) {
dLog('document download failed', e); console.log('document download failed', e);
historyDoc.progress.enabled = false; historyDoc.progress.enabled = false;
}, updateDownloadProgress); }, updateDownloadProgress);
}); });
@ -1434,7 +1434,7 @@ angular.module('myApp.services', [])
a.remove(); a.remove();
}, 100); }, 100);
}, function (e) { }, function (e) {
dLog('document download failed', e); console.log('document download failed', e);
historyDoc.progress.enabled = false; historyDoc.progress.enabled = false;
}, updateDownloadProgress); }, updateDownloadProgress);
} }
@ -1517,12 +1517,12 @@ angular.module('myApp.services', [])
case 'updateNewMessage': case 'updateNewMessage':
message = update.message; message = update.message;
if (message.from_id && !AppUsersManager.hasUser(message.from_id)) { if (message.from_id && !AppUsersManager.hasUser(message.from_id)) {
dLog('User not found', message.from_id, 'getDiff'); console.log('User not found', message.from_id, 'getDiff');
getDifference(); getDifference();
return false; return false;
} }
if (message.to_id.chat_id && !AppChatsManager.hasChat(message.to_id.chat_id)) { if (message.to_id.chat_id && !AppChatsManager.hasChat(message.to_id.chat_id)) {
dLog('Chat not found', message.to_id.chat_id, 'getDiff'); console.log('Chat not found', message.to_id.chat_id, 'getDiff');
getDifference(); getDifference();
return false; return false;
} }
@ -1537,7 +1537,7 @@ angular.module('myApp.services', [])
case 'updateShortMessage': case 'updateShortMessage':
if (!AppUsersManager.hasUser(updateMessage.from_id)) { if (!AppUsersManager.hasUser(updateMessage.from_id)) {
dLog('User not found', updateMessage.from_id, 'getDiff'); console.log('User not found', updateMessage.from_id, 'getDiff');
getDifference(); getDifference();
break; break;
} }
@ -1561,7 +1561,7 @@ angular.module('myApp.services', [])
case 'updateShortChatMessage': case 'updateShortChatMessage':
if (!AppUsersManager.hasUser(updateMessage.from_id) || if (!AppUsersManager.hasUser(updateMessage.from_id) ||
!AppChatsManager.hasChat(updateMessage.chat_id)) { !AppChatsManager.hasChat(updateMessage.chat_id)) {
dLog('User or chat not found', updateMessage.from_id, updateMessage.chat_id, 'getDiff'); console.log('User or chat not found', updateMessage.from_id, updateMessage.chat_id, 'getDiff');
getDifference(); getDifference();
break; break;
} }
@ -1641,7 +1641,7 @@ angular.module('myApp.services', [])
} }
function saveSeq (seq, seqStart) { function saveSeq (seq, seqStart) {
// dLog('saving seq', curState.invalid, seq, seqStart, curState.seq); // console.log('saving seq', curState.invalid, seq, seqStart, curState.seq);
if (curState.invalid) { if (curState.invalid) {
return false; return false;
@ -1650,7 +1650,7 @@ angular.module('myApp.services', [])
seqStart = seqStart || seq; seqStart = seqStart || seq;
if (seqStart != curState.seq + 1) { if (seqStart != curState.seq + 1) {
// dLog('seq hole', seqStart, curState.seq); // console.log('seq hole', seqStart, curState.seq);
if (seqStart != curState.seq) { if (seqStart != curState.seq) {
getDifference(); getDifference();
} }
@ -1694,7 +1694,7 @@ angular.module('myApp.services', [])
var regExp = new RegExp('((?:(ftp|https?)://|(?:mailto:)?([A-Za-z0-9._%+-]+@))(\\S*\\.\\S*[^\\s.;,(){}<>"\']))|(\\n)|(' + emojiUtf.join('|') + ')', 'i'); var regExp = new RegExp('((?:(ftp|https?)://|(?:mailto:)?([A-Za-z0-9._%+-]+@))(\\S*\\.\\S*[^\\s.;,(){}<>"\']))|(\\n)|(' + emojiUtf.join('|') + ')', 'i');
// dLog(regExp); // console.log(regExp);
return { return {
@ -1730,7 +1730,7 @@ angular.module('myApp.services', [])
while ((match = raw.match(regExp))) { while ((match = raw.match(regExp))) {
// dLog(2, match); // console.log(2, match);
html.push(encodeEntities(raw.substr(0, match.index))); html.push(encodeEntities(raw.substr(0, match.index)));
if (match[1]) { // URL if (match[1]) { // URL
@ -1788,14 +1788,14 @@ angular.module('myApp.services', [])
text = $sanitize(html.join('')); text = $sanitize(html.join(''));
// dLog(3, text, html); // console.log(3, text, html);
if (emojiFound) { if (emojiFound) {
text = text.replace(/<span class="emoji emoji-file-([0-9a-f]+?)"(.+?)<\/span>/g, text = text.replace(/<span class="emoji emoji-file-([0-9a-f]+?)"(.+?)<\/span>/g,
'<span class="emoji" style="background-image: url(\'vendor/gemoji/images/$1.png\')"$2</span>'); '<span class="emoji" style="background-image: url(\'vendor/gemoji/images/$1.png\')"$2</span>');
} }
// dLog(4, text, html); // console.log(4, text, html);
return $sce.trustAs('html', text); return $sce.trustAs('html', text);
} }
@ -1818,7 +1818,7 @@ angular.module('myApp.services', [])
} }
function onEvent (e) { function onEvent (e) {
// dLog('event', e.type); // console.log('event', e.type);
if (e.type == 'mousemove') { if (e.type == 'mousemove') {
$($window).off('mousemove', onEvent); $($window).off('mousemove', onEvent);
} }
@ -1826,7 +1826,7 @@ angular.module('myApp.services', [])
$timeout.cancel(toPromise); $timeout.cancel(toPromise);
if (!isIDLE) { if (!isIDLE) {
// dLog('update timeout'); // console.log('update timeout');
toPromise = $timeout(function () { toPromise = $timeout(function () {
onEvent({type: 'timeout'}); onEvent({type: 'timeout'});
}, 30000); }, 30000);
@ -1836,7 +1836,7 @@ angular.module('myApp.services', [])
return; return;
} }
// dLog('IDLE changed', isIDLE); // console.log('IDLE changed', isIDLE);
$rootScope.$apply(function () { $rootScope.$apply(function () {
$rootScope.idle.isIDLE = isIDLE; $rootScope.idle.isIDLE = isIDLE;
}); });
@ -1861,7 +1861,7 @@ angular.module('myApp.services', [])
titlePromise; titlePromise;
$rootScope.$watch('idle.isIDLE', function (newVal) { $rootScope.$watch('idle.isIDLE', function (newVal) {
// dLog('isIDLE watch', newVal); // console.log('isIDLE watch', newVal);
$interval.cancel(titlePromise); $interval.cancel(titlePromise);
if (!newVal) { if (!newVal) {
@ -1874,7 +1874,7 @@ angular.module('myApp.services', [])
titlePromise = $interval(function () { titlePromise = $interval(function () {
var time = +new Date(); var time = +new Date();
// dLog('check title', notificationsCount, time % 2000 > 1000); // console.log('check title', notificationsCount, time % 2000 > 1000);
if (!notificationsCount || time % 2000 > 1000) { if (!notificationsCount || time % 2000 > 1000) {
document.title = titleBackup; document.title = titleBackup;
faviconEl.attr('href', faviconBackup); faviconEl.attr('href', faviconBackup);
@ -1903,7 +1903,7 @@ angular.module('myApp.services', [])
peer: AppPeersManager.getInputPeerByID(peerID) peer: AppPeersManager.getInputPeerByID(peerID)
} }
}).then(function (peerNotifySettings) { }).then(function (peerNotifySettings) {
// dLog('got settings', peerID, peerNotifySettings); // console.log('got settings', peerID, peerNotifySettings);
return peerNotifySettings._ == 'peerNotifySettings' && return peerNotifySettings._ == 'peerNotifySettings' &&
peerNotifySettings.mute_until * 1000 > (+new Date()); peerNotifySettings.mute_until * 1000 > (+new Date());
}); });
@ -1915,7 +1915,7 @@ angular.module('myApp.services', [])
} }
var havePermission = window.webkitNotifications.checkPermission(); var havePermission = window.webkitNotifications.checkPermission();
// dLog('perm', havePermission); // console.log('perm', havePermission);
if (havePermission != 0) { // 0 is PERMISSION_ALLOWED if (havePermission != 0) { // 0 is PERMISSION_ALLOWED
$($window).on('click', requestPermission); $($window).on('click', requestPermission);
@ -1930,7 +1930,7 @@ angular.module('myApp.services', [])
} }
function notify (data) { function notify (data) {
// dLog('notify', $rootScope.idle.isIDLE); // console.log('notify', $rootScope.idle.isIDLE);
if (!$rootScope.idle.isIDLE) { if (!$rootScope.idle.isIDLE) {
return false; return false;
} }
@ -1957,7 +1957,7 @@ angular.module('myApp.services', [])
} }
}; };
// dLog('notify', notification); // console.log('notify', notification);
notification.show(); notification.show();

15
app/vendor/console-polyfill/console-polyfill.js vendored Normal file
View File

@ -0,0 +1,15 @@
// Console-polyfill. MIT license.
// https://github.com/paulmillr/console-polyfill
// Make it safe to do console.log() always.
(function (con) {
'use strict';
var prop, method;
var empty = {};
var dummy = function() {};
var properties = 'memory'.split(',');
var methods = ('assert,count,debug,dir,dirxml,error,exception,group,' +
'groupCollapsed,groupEnd,info,log,markTimeline,profile,profileEnd,' +
'time,timeEnd,trace,warn').split(',');
while (prop = properties.pop()) con[prop] = con[prop] || empty;
while (method = methods.pop()) con[method] = con[method] || dummy;
})(window.console = window.console || {});

6
app/vendor/jquery.nanoscroller/nanoscroller.js vendored
View File

@ -409,7 +409,7 @@
this.prevScrollTop = this.contentScrollTop || 0; this.prevScrollTop = this.contentScrollTop || 0;
this.contentScrollTop = content.scrollTop; this.contentScrollTop = content.scrollTop;
if (!this.iOSNativeScrolling) { if (!this.iOSNativeScrolling) {
// dLog(this.maxScrollTop, this.contentScrollTop, this.maxSliderTop, this.maxScrollTop); // console.log(this.maxScrollTop, this.contentScrollTop, this.maxSliderTop, this.maxScrollTop);
// console.trace(); // console.trace();
this.maxSliderTop = this.paneHeight - this.sliderHeight; this.maxSliderTop = this.paneHeight - this.sliderHeight;
this.sliderTop = this.maxScrollTop === 0 ? 0 : this.contentScrollTop * this.maxSliderTop / this.maxScrollTop; this.sliderTop = this.maxScrollTop === 0 ? 0 : this.contentScrollTop * this.maxSliderTop / this.maxScrollTop;
@ -431,7 +431,7 @@
cssValue = {}; cssValue = {};
cssValue[transform] = "translate(0, " + this.sliderTop + "px)"; cssValue[transform] = "translate(0, " + this.sliderTop + "px)";
// dLog(this.sliderTop, cssValue, this.scrollRAF, rAF); // console.log(this.sliderTop, cssValue, this.scrollRAF, rAF);
} else { } else {
cssValue = { cssValue = {
top: this.sliderTop top: this.sliderTop
@ -440,7 +440,7 @@
if (rAF) { if (rAF) {
if (!this.scrollRAF) { if (!this.scrollRAF) {
this.scrollRAF = rAF(function() { this.scrollRAF = rAF(function() {
// dLog('raf called', cssValue); // console.log('raf called', cssValue);
_this.scrollRAF = null; _this.scrollRAF = null;
_this.slider.css(cssValue); _this.slider.css(cssValue);
}); });

14
app/vendor/ui-bootstrap/ui-bootstrap-custom-0.7.0.js vendored
View File

@ -71,10 +71,10 @@ angular.module('ui.bootstrap.modal', [])
}); });
scope.close = function (evt) { scope.close = function (evt) {
dLog('close', evt); console.log('close', evt);
var modal = $modalStack.getTop(); var modal = $modalStack.getTop();
if (modal && modal.value.backdrop && modal.value.backdrop != 'static') { if (modal && modal.value.backdrop && modal.value.backdrop != 'static') {
dLog('backdrop click'); console.log('backdrop click');
evt.preventDefault(); evt.preventDefault();
evt.stopPropagation(); evt.stopPropagation();
$modalStack.dismiss(modal.key, 'backdrop click'); $modalStack.dismiss(modal.key, 'backdrop click');
@ -94,7 +94,7 @@ angular.module('ui.bootstrap.modal', [])
transclude: true, transclude: true,
templateUrl: 'template/modal/window.html', templateUrl: 'template/modal/window.html',
link: function (scope, element, attrs) { link: function (scope, element, attrs) {
dLog('init window'); console.log('init window');
scope.windowClass = attrs.windowClass || ''; scope.windowClass = attrs.windowClass || '';
//trigger CSS transitions //trigger CSS transitions
@ -170,7 +170,7 @@ angular.module('ui.bootstrap.modal', [])
}); });
$modalStack.open = function (modalInstance, modal) { $modalStack.open = function (modalInstance, modal) {
dLog('open', 11); console.log('open', 11);
openedWindows.add(modalInstance, { openedWindows.add(modalInstance, {
deferred: modal.deferred, deferred: modal.deferred,
@ -196,7 +196,7 @@ angular.module('ui.bootstrap.modal', [])
}; };
$modalStack.close = function (modalInstance, result) { $modalStack.close = function (modalInstance, result) {
// dLog('close'); // console.log('close');
console.trace(); console.trace();
var modal = openedWindows.get(modalInstance); var modal = openedWindows.get(modalInstance);
if (modal) { if (modal) {
@ -260,14 +260,14 @@ angular.module('ui.bootstrap.modal', [])
result: modalResultDeferred.promise, result: modalResultDeferred.promise,
opened: modalOpenedDeferred.promise, opened: modalOpenedDeferred.promise,
close: function (result) { close: function (result) {
dLog('close'); console.log('close');
$modalStack.close(modalInstance, result); $modalStack.close(modalInstance, result);
}, },
dismiss: function (reason) { dismiss: function (reason) {
$modalStack.dismiss(modalInstance, reason); $modalStack.dismiss(modalInstance, reason);
} }
}; };
dLog('modal', modalInstance); console.log('modal', modalInstance);
//merge and clean up options //merge and clean up options
modalOptions = angular.extend({}, $modalProvider.options, modalOptions); modalOptions = angular.extend({}, $modalProvider.options, modalOptions);