diff --git a/app/css/app.css b/app/css/app.css index 8a56562d..0a3ca666 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -1328,12 +1328,12 @@ div.im_message_video_thumb { z-index: 1; } +.im_message_video, .im_message_document, -.im_message_upload_file { +.im_message_upload_file, +.im_message_audio { margin-top: 3px; - /*border-radius: 3px;*/ - /*display: inline-block;*/ - width: 342px; + width: 317px; } .im_message_audio { margin-top: 3px; @@ -1366,6 +1366,29 @@ div.im_message_video_thumb { height: 18px; margin: 12px 13px; } +.im_message_file_button_dl_audio { + background: #6490b1; + border-radius: 2px; +} +.im_message_file_button_dl_audio .im_message_file_button_icon { + display: block; + width: 15px; + height: 18px; + background: url(../img/icons/IconsetW.png) -15px -897px no-repeat; + background-size: 42px 1171px; + margin: 12px 13.5px; +} +.is_1x .im_message_file_button_dl_audio .im_message_file_button_icon { + background-image: url(../img/icons/IconsetW_1x.png); + background-position: -15px -899px; +} +.im_message_file_button_dl_audio .audio_player_btn_icon_pause, +.is_1x .im_message_file_button_dl_audio .audio_player_btn_icon_pause { + width: 12px; + height: 16px; + background-position: -15px -927px; + margin: 13px 15px; +} .im_message_selected .icon-document, .im_history_selectable .im_message_outer_wrap:hover .icon-document { @@ -1403,11 +1426,11 @@ img.im_message_document_thumb { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; - width: 290px; + width: 265px; padding: 0 0 1px; } .im_message_document_actions { - width: 290px; + width: 265px; } @@ -1415,7 +1438,7 @@ img.im_message_document_thumb { color: #3a6d99; display: inline-block; font-weight: bold; - max-width: 200px; + max-width: 170px; overflow: hidden; vertical-align: text-top; white-space: nowrap; @@ -1424,42 +1447,12 @@ img.im_message_document_thumb { .im_message_document_size { color: #999; padding-left: 2px; + vertical-align: text-top; } .im_message_document_actions a, .audio_player_actions a { margin-right: 10px; } -.audio_player_button { - width: 42px; - height: 42px; - padding-left: 14px; - padding-right: 14px; - border-radius: 2px; - margin-right: 12px; -} -.audio_player_btn_icon { - display: block; - width: 14px; - height: 17px; - background: url(../img/icons/IconsetW.png) -15px -897px no-repeat; - background-size: 42px 1171px; -} -.is_1x .audio_player_btn_icon { - background-image: url(../img/icons/IconsetW_1x.png); - background-position: -15px -898px; -} -.audio_player_btn_icon_pause, -.is_1x .audio_player_btn_icon_pause, -.audio_player_btn_icon_cancel, -.is_1x .audio_player_btn_icon_cancel { - width: 13px; - height: 15px; - background-position: -15px -923px; -} -.is_1x .audio_player_btn_icon_pause, -.is_1x .audio_player_btn_icon_cancel { - background-position: -15px -925px; -} .audio_player_title_wrap { overflow: hidden; white-space: nowrap; @@ -1467,11 +1460,12 @@ img.im_message_document_thumb { padding: 1px 0 1px; line-height: 16px; height: 19px; + width: 200px; } .audio_player_title { display: inline-block; font-weight: bold; - max-width: 200px; + max-width: 85px; overflow: hidden; vertical-align: text-top; white-space: nowrap; @@ -1487,10 +1481,14 @@ img.im_message_document_thumb { color: #999; padding-left: 2px; } +.audio_player_actions { + margin-top: 3px; +} + .audio_player_seek_slider { float: left; - margin-right: 17px; - width: 236px; + margin-right: 15px; + width: 200px; } .audio_player_seek_slider .tg_slider_wrap { height: 16px; @@ -1508,6 +1506,7 @@ img.im_message_document_thumb { margin: 6px 0; background: rgba(218,228,234,0.50); height: 4px; + border-radius: 0; } .audio_player_seek_slider .tg_slider_track_fill { background: #6490b1; @@ -1546,49 +1545,56 @@ img.im_message_document_thumb { width: 0; } -.im_message_upload_progress_wrap, -.im_message_download_progress_wrap { - margin-top: 5px; - width: 290px; -} .audio_player_progress_wrap { - margin-top: 4px; - /*max-width: 290px;*/ - width: 303px; overflow: hidden; } .audio_player_progress_wrap .tg_down_progress { margin-top: 5px; } + + + +.im_message_upload_progress_wrap, +.im_message_download_progress_wrap { + margin-top: 5px; + width: 200px; +} + .im_message_document_thumbed .im_message_document_name_wrap, .im_message_document_thumbed .im_message_upload_progress_wrap, .im_message_document_thumbed .im_message_download_progress_wrap, .im_message_document_thumbed .im_message_document_actions { - width: 230px; + width: 207px; } .im_message_document_thumbed .im_message_document_name { - max-width: 150px; + max-width: 110px; } .im_message_video .im_message_document_name_wrap, .im_message_video .im_message_download_progress_wrap, .im_message_video .im_message_document_actions { - width: 150px; + width: 152px; } .im_message_video .im_message_document_name_wrap { margin-top: 5px; } +.im_message_cancelable_progress_wrap, +.im_message_playback_progress_wrap { + margin-top: 4px; + /*width: 265px;*/ +} .im_message_media_progress_cancel { - font-size: 11px; - margin-left: 10px; + margin-left: 15px; line-height: 100%; + width: 50px; + display: block; + overflow: hidden; } .tg_up_progress, -.tg_down_progress, -.tg_play_progress { - height: 5px; +.tg_down_progress { + height: 4px; margin: 0; padding: 0; background: rgba(218,228,234,0.50); @@ -1598,26 +1604,15 @@ img.im_message_document_thumb { box-shadow: none; } .tg_up_progress .progress-bar, -.tg_down_progress .progress-bar, -.tg_play_progress .progress-bar { - height: 5px; - line-height: 5px; +.tg_down_progress .progress-bar { + height: 4px; + line-height: 4px; background: #6B9ABD; border-radius: 0; overflow: hidden; -webkit-box-shadow: none; box-shadow: none; } -.tg_play_progress { - background: rgba(218,228,234,0.50); - border-radius: 1px; -} -.tg_play_progress .progress-bar { - background: #628fb2; - border-radius: 1px; - -webkit-transition: none; - transition: none; -} @@ -2757,4 +2752,9 @@ ce671b orange font-size: 14px; line-height: 160%; margin: 25px 0 30px; +} + +#nacl_listener { + position: absolute; + left: -10000px; } \ No newline at end of file diff --git a/app/css/mobile.css b/app/css/mobile.css index c02539ac..d20a25d3 100644 --- a/app/css/mobile.css +++ b/app/css/mobile.css @@ -130,7 +130,7 @@ html { vertical-align: text-top; background: url(../img/icons/IconsetW.png) -15px -835px no-repeat; - background-size: 42px 971px; + background-size: 42px 1171px; opacity: 0.8; } .is_1x .icon-back { @@ -959,7 +959,7 @@ a.mobile_modal_action .tg_checkbox_label { .im_submit:active, .im_submit:hover { background: url(../img/icons/IconsetW.png) 2px -860px no-repeat; - background-size: 42px 971px; + background-size: 42px 1171px; color: transparent; box-shadow: none; } @@ -983,7 +983,7 @@ a.mobile_modal_action .tg_checkbox_label { height: 23px; vertical-align: text-top; background: url(../img/icons/IconsetW.png) -12px -68px no-repeat; - background-size: 42px 971px; + background-size: 42px 1171px; opacity: 0.8; } .is_1x .icon-paperclip { @@ -1020,7 +1020,7 @@ a.mobile_modal_action .tg_checkbox_label { opacity: 1; margin: 0; background: url(../img/icons/IconsetW.png) -10px -771px no-repeat; - background-size: 42px 971px; + background-size: 42px 1171px; } .is_1x .icon-emoji { background-image: url(../img/icons/IconsetW_1x.png); diff --git a/app/js/controllers.js b/app/js/controllers.js index 0bf741d6..e147cf98 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -316,7 +316,7 @@ angular.module('myApp.controllers', ['myApp.i18n']) ChangelogNotifyService.checkUpdate(); }) - .controller('AppIMController', function ($scope, $location, $routeParams, $modal, $rootScope, $modalStack, MtpApiManager, AppUsersManager, ContactsSelectService, ChangelogNotifyService, ErrorService, AppRuntimeManager) { + .controller('AppIMController', function ($scope, $location, $routeParams, $modal, $rootScope, $modalStack, MtpApiManager, AppUsersManager, AppChatsManager, ContactsSelectService, ChangelogNotifyService, ErrorService, AppRuntimeManager) { $scope.$on('$routeUpdate', updateCurDialog); @@ -400,9 +400,9 @@ angular.module('myApp.controllers', ['myApp.i18n']) $scope.showPeerInfo = function () { if ($scope.curDialog.peerID > 0) { - $rootScope.openUser($scope.curDialog.peerID) + AppUsersManager.openUser($scope.curDialog.peerID) } else if ($scope.curDialog.peerID < 0) { - $rootScope.openChat(-$scope.curDialog.peerID) + AppChatsManager.openChat(-$scope.curDialog.peerID) } }; @@ -2120,7 +2120,7 @@ angular.module('myApp.controllers', ['myApp.i18n']) } }); - $scope.notify = {}; + $scope.notify = {volume: 0.5}; $scope.send = {}; $scope.$watch('photo.file', onPhotoSelected); @@ -2210,31 +2210,30 @@ angular.module('myApp.controllers', ['myApp.i18n']) if (settings[1]) { $scope.notify.volume = 0; } else if (settings[3] !== false) { - $scope.notify.volume = settings[3] > 0 && Math.ceil(settings[3] * 10) || 0; + $scope.notify.volume = settings[3] > 0 && settings[3] <= 1.0 ? settings[3] : 0; } else { - $scope.notify.volume = 5; + $scope.notify.volume = 0.5; } $scope.notify.canVibrate = NotificationsManager.getVibrateSupport(); $scope.notify.vibrate = !settings[4]; $scope.notify.volumeOf4 = function () { - return 1 + Math.ceil(($scope.notify.volume - 1) / 3.3); + return 1 + Math.ceil(($scope.notify.volume - 0.1) / 0.33); }; $scope.toggleSound = function () { if ($scope.notify.volume) { $scope.notify.volume = 0; } else { - $scope.notify.volume = 5; + $scope.notify.volume = 0.5; } } var testSoundPromise; $scope.$watch('notify.volume', function (newValue, oldValue) { if (newValue !== oldValue) { - var storeVolume = newValue / 10; - Storage.set({notify_volume: storeVolume}); + Storage.set({notify_volume: newValue}); Storage.remove('notify_nosound'); NotificationsManager.clear(); @@ -2242,7 +2241,7 @@ angular.module('myApp.controllers', ['myApp.i18n']) $timeout.cancel(testSoundPromise); } testSoundPromise = $timeout(function () { - NotificationsManager.testSound(storeVolume); + NotificationsManager.testSound(newValue); }, 500); } }); diff --git a/app/js/directives.js b/app/js/directives.js index d63da2f0..b2994659 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -177,9 +177,22 @@ angular.module('myApp.directives', ['myApp.filters']) templateUrl: templateUrl('message_attach_photo') }; }) - .directive('myMessageVideo', function() { + .directive('myMessageVideo', function(AppVideoManager) { return { - templateUrl: templateUrl('message_attach_video') + scope: { + 'video': '=myMessageVideo', + 'messageId': '=messageId' + }, + templateUrl: templateUrl('message_attach_video'), + link: function ($scope, element, attrs) { + AppVideoManager.updateVideoDownloaded($scope.video.id); + $scope.videoSave = function () { + AppVideoManager.saveVideoFile($scope.video.id); + }; + $scope.videoOpen = function () { + AppVideoManager.openVideo($scope.video.id, $scope.messageId); + }; + } }; }) .directive('myMessageDocument', function(AppDocsManager) { @@ -1338,7 +1351,7 @@ angular.module('myApp.directives', ['myApp.filters']) }) - .directive('myLoadVideo', function($sce, MtpApiFileManager, _) { + .directive('myLoadVideo', function($sce, AppVideoManager, _) { return { link: link, @@ -1351,37 +1364,12 @@ angular.module('myApp.directives', ['myApp.filters']) function link ($scope, element, attrs) { - $scope.progress = {enabled: true, percent: 1}; - $scope.player = {}; + var downloadPromise = AppVideoManager.downloadVideo($scope.video.id); - var inputLocation = { - _: 'inputVideoFileLocation', - id: $scope.video.id, - access_hash: $scope.video.access_hash - }; - - var hasQt = false, i; - if (navigator.plugins) { - for (i = 0; i < navigator.plugins.length; i++) { - if (navigator.plugins[i].name.indexOf('QuickTime') >= 0) { - hasQt = true; - } - } - } - - var downloadPromise = MtpApiFileManager.downloadFile($scope.video.dc_id, inputLocation, $scope.video.size, {mime: 'video/mp4'}); - - downloadPromise.then(function (url) { - $scope.progress.enabled = false; - // $scope.progress = {enabled: true, percent: 50}; - $scope.player.hasQuicktime = hasQt; - $scope.player.quicktime = false; - $scope.player.src = $sce.trustAsResourceUrl(url); + downloadPromise.then(function () { $scope.$emit('ui_height'); }, function (e) { console.log('Download video failed', e, $scope.video); - $scope.progress.enabled = false; - $scope.player.src = ''; if (e && e.type == 'FS_BROWSER_UNSUPPORTED') { $scope.error = {html: _('error_browser_no_local_file_system_video_md', { @@ -1393,8 +1381,6 @@ angular.module('myApp.directives', ['myApp.filters']) $scope.error = {text: _('error_video_download_failed'), error: e}; } - }, function (progress) { - $scope.progress.percent = Math.max(1, Math.floor(100 * progress.done / progress.total)); }); $scope.$emit('ui_height'); @@ -1406,7 +1392,7 @@ angular.module('myApp.directives', ['myApp.filters']) }) - .directive('myLoadGif', function($rootScope, MtpApiFileManager, AppDocsManager) { + .directive('myLoadGif', function(AppDocsManager) { return { link: link, @@ -1418,15 +1404,9 @@ angular.module('myApp.directives', ['myApp.filters']) function link ($scope, element, attrs) { - var downloadPromise = false, - inputFileLocation = { - _: 'inputDocumentFileLocation', - id: $scope.document.id, - access_hash: $scope.document.access_hash - }; + var downloadPromise = false; $scope.isActive = false; - $scope.document.url = MtpApiFileManager.getCachedFile(inputFileLocation); $scope.toggle = function (e) { if (checkClick(e, true)) { @@ -1446,34 +1426,17 @@ angular.module('myApp.directives', ['myApp.filters']) return; } - $scope.document.progress = {enabled: true, percent: 1, total: $scope.document.size}; + downloadPromise = AppDocsManager.downloadDoc($scope.document.id); - downloadPromise = MtpApiFileManager.downloadFile( - $scope.document.dc_id, - inputFileLocation, - $scope.document.size, - null, - {mime: $scope.document.mime_type} - ); - - downloadPromise.then(function (url) { - $scope.document.url = url; + downloadPromise.then(function () { $scope.isActive = true; - delete $scope.document.progress; - console.log('file save done'); $scope.$emit('ui_height'); - }, function () { - $scope.document.progress.enabled = false; - }, function (progress) { - console.log('dl progress', progress); - $scope.document.progress.done = progress.done; - $scope.document.progress.percent = Math.max(1, Math.floor(100 * progress.done / progress.total)); }) } } }) - .directive('myLoadDocument', function($rootScope, MtpApiFileManager, AppDocsManager) { + .directive('myLoadDocument', function(MtpApiFileManager, AppDocsManager) { return { link: link, @@ -1869,7 +1832,7 @@ angular.module('myApp.directives', ['myApp.filters']) }) - .directive('myUserLink', function ($timeout, $rootScope, AppUsersManager) { + .directive('myUserLink', function ($timeout, AppUsersManager) { return { link: link @@ -1885,7 +1848,7 @@ angular.module('myApp.directives', ['myApp.filters']) if (element[0].tagName == 'A') { element.on('click', function () { - $rootScope.openUser(userID, attrs.userOverride && $scope.$eval(attrs.userOverride)); + AppUsersManager.openUser(userID, attrs.userOverride && $scope.$eval(attrs.userOverride)); }); } if (attrs.color && $scope.$eval(attrs.color)) { @@ -1939,7 +1902,7 @@ angular.module('myApp.directives', ['myApp.filters']) }) - .directive('myUserPhotolink', function ($rootScope, AppUsersManager) { + .directive('myUserPhotolink', function (AppUsersManager) { return { link: link, @@ -1958,7 +1921,7 @@ angular.module('myApp.directives', ['myApp.filters']) if (element[0].tagName == 'A') { element.on('click', function (e) { - $rootScope.openUser($scope.userID, attrs.userOverride && $scope.$eval(attrs.userOverride)); + AppUsersManager.openUser($scope.userID, attrs.userOverride && $scope.$eval(attrs.userOverride)); }); } @@ -1969,9 +1932,16 @@ angular.module('myApp.directives', ['myApp.filters']) } }) - .directive('myAudioPlayer', function ($sce, $timeout, $q, FileManager, MtpApiFileManager) { + .directive('myAudioPlayer', function ($timeout, $q, Storage, AppAudioManager, AppDocsManager) { var currentPlayer = false; + var audioVolume = 0.5; + + Storage.get('audio_volume').then(function (newAudioVolume) { + if (newAudioVolume >= 0.0 && newAudioVolume <= 1.0) { + audioVolume = newAudioVolume; + } + }); return { link: link, @@ -2014,12 +1984,12 @@ angular.module('myApp.directives', ['myApp.filters']) $scope.mediaPlayer.player.playPause(); } else if ($scope.audio.progress && $scope.audio.progress.enabled) { - $scope.audio.progress.cancel(); + return; } else { var downloadPromise; if ($scope.audio._ == 'audio') { - downloadPromise = AppAudioManager.downloadDoc($scope.audio.id); + downloadPromise = AppAudioManager.downloadAudio($scope.audio.id); } else { downloadPromise = AppDocsManager.downloadDoc($scope.audio.id); } @@ -2027,6 +1997,7 @@ angular.module('myApp.directives', ['myApp.filters']) downloadPromise.then(function () { onContentLoaded(function () { checkPlayer($scope.mediaPlayer.player); + $scope.mediaPlayer.player.setVolume(audioVolume); $scope.mediaPlayer.player.play(); }) }) @@ -2034,10 +2005,18 @@ angular.module('myApp.directives', ['myApp.filters']) }; $scope.seek = function (position) { - $scope.mediaPlayer.player.seek(position); + if ($scope.mediaPlayer && $scope.mediaPlayer.player) { + $scope.mediaPlayer.player.seek(position); + } else { + $scope.togglePlay(); + } }; $scope.setVolume = function (volume) { - $scope.mediaPlayer.player.setVolume(volume); + audioVolume = volume; + Storage.set({audio_volume: volume}); + if ($scope.mediaPlayer && $scope.mediaPlayer.player) { + $scope.mediaPlayer.player.setVolume(volume); + } }; } }) @@ -2060,7 +2039,7 @@ angular.module('myApp.directives', ['myApp.filters']) var maxValue = $scope.$eval(attrs.sliderMax) || 1.0; var lastUpdValue = false; var lastMinPageX = false; - + var onMouseMove = function (e) { var offsetX = e.pageX - lastMinPageX; offsetX = Math.min(width, Math.max(0 , offsetX)); @@ -2084,10 +2063,16 @@ angular.module('myApp.directives', ['myApp.filters']) $scope.$watch(model, function (newVal) { if (newVal != lastUpdValue) { - var offsetX = width * (newVal - minValue) / (maxValue - minValue); - offsetX = Math.min(width, Math.max(0 , offsetX)); - thumb.css('left', Math.max(0, offsetX - thumbWidth)); - fill.css('width', offsetX); + var percent = Math.max(0, (newVal - minValue) / (maxValue - minValue)); + if (width) { + var offsetX = width * percent; + offsetX = Math.min(width, Math.max(0 , offsetX)); + thumb.css('left', Math.max(0, offsetX - thumbWidth)); + fill.css('width', offsetX); + } else { + thumb.css('left', percent * 100 + '%'); + fill.css('width', percent * 100 + '%'); + } lastUpdValue = false; } }); @@ -2095,6 +2080,13 @@ angular.module('myApp.directives', ['myApp.filters']) element.on('dragstart selectstart', cancelEvent); element.on('mousedown', function (e) { + if (!width) { + width = wrap.width(); + if (!width) { + console.error('empty width'); + return cancelEvent(e); + } + } stopMouseTrack(); lastMinPageX = e.pageX - e.offsetX; diff --git a/app/js/filters.js b/app/js/filters.js index 0ac198c7..8666b6f8 100644 --- a/app/js/filters.js +++ b/app/js/filters.js @@ -56,7 +56,7 @@ angular.module('myApp.filters', ['myApp.i18n']) var cachedDates = {}, dateFilter = $filter('date'); - return function (timestamp) { + return function (timestamp, extended) { if (cachedDates[timestamp]) { return cachedDates[timestamp]; @@ -67,11 +67,12 @@ angular.module('myApp.filters', ['myApp.i18n']) format = 'shortTime'; if (diff > 518400000) { // 6 days - format = 'shortDate'; + format = extended ? 'mediumDate' : 'shortDate'; } else if (diff > 43200000) { // 12 hours - format = 'EEE'; + format = extended ? 'EEEE' : 'EEE'; } + return cachedDates[timestamp] = dateFilter(ticks, format); } }) @@ -120,6 +121,14 @@ angular.module('myApp.filters', ['myApp.i18n']) } }]) + .filter('durationRemains', function($filter) { + var durationFilter = $filter('duration'); + + return function (done, total) { + return '-' + durationFilter(total - done); + } + }) + .filter('phoneNumber', [function() { return function (phoneRaw) { var nbsp = ' '; @@ -140,13 +149,13 @@ angular.module('myApp.filters', ['myApp.i18n']) return size + ' b'; } else if (size < 1048576) { - return (Math.round(size / 1024 * 10) / 10) + ' Kb'; + return Math.round(size / 1024) + ' Kb'; } var mbs = size / 1048576; if (progressing) { mbs = mbs.toFixed(1); } else { - mbs = (Math.round(mbs * 100) / 100); + mbs = (Math.round(mbs * 10) / 10); } return mbs + ' Mb'; } @@ -192,14 +201,14 @@ angular.module('myApp.filters', ['myApp.i18n']) if (diff < 60000) { return _('relative_time_just_now'); } - if (diff < 3000000) { - var minutes = Math.ceil(diff / 60000); + if (diff < 3600000) { + var minutes = Math.floor(diff / 60000); return langMinutesPluralize(minutes); } - if (diff < 10000000) { - var hours = Math.ceil(diff / 3600000); + if (diff < 86400000) { + var hours = Math.floor(diff / 3600000); return langHoursPluralize(hours); } - return dateOrTimeFilter(timestamp); + return dateOrTimeFilter(timestamp, true); } }) diff --git a/app/js/locales/en-us.json b/app/js/locales/en-us.json index b8dbef04..59ee2914 100644 --- a/app/js/locales/en-us.json +++ b/app/js/locales/en-us.json @@ -329,6 +329,7 @@ "message_attach_video_video": "Video", "message_attach_video_download": "Download", + "message_attach_video_save": "Save File", "message_attach_video_play": "Play video", "conversation_select_modal_title": "Select conversation", diff --git a/app/js/services.js b/app/js/services.js index adbea15e..462ceeba 100644 --- a/app/js/services.js +++ b/app/js/services.js @@ -196,7 +196,6 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) windowClass: 'user_modal_window mobile_modal' }); }; - $rootScope.openUser = openUser; function importContact (phone, firstName, lastName) { return MtpApiManager.invokeApi('contacts.importContacts', { @@ -528,9 +527,6 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) }); } - $rootScope.openChat = openChat; - - return { saveApiChats: saveApiChats, saveApiChat: saveApiChat, @@ -1276,7 +1272,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) fileName = 'video.mp4'; } else if (file.type.substr(0, 6) == 'audio/') { attachType = 'audio'; - fileName = 'audio.' + file.type.split('/')[1] || 'mp3'; + fileName = 'audio.' + (file.type.split('/')[1] == 'ogg' ? 'ogg' : 'mp3'); } else { attachType = 'document'; fileName = 'document.' + file.type.split('/')[1]; @@ -2291,7 +2287,6 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) } photo.full = full; - photo.fromUser = AppUsersManager.getUser(photo.user_id); return photo; } @@ -2334,19 +2329,17 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) }; FileManager.chooseSave(fileName, ext, mimeType).then(function (writableFileEntry) { - if (!writableFileEntry) { - return; + if (writableFileEntry) { + MtpApiFileManager.downloadFile( + fullPhotoSize.location.dc_id, inputFileLocation, fullPhotoSize.size, { + mime: mimeType, + toFileEntry: writableFileEntry + }).then(function (url) { + // console.log('file save done'); + }, function (e) { + console.log('photo download failed', e); + }); } - - MtpApiFileManager.downloadFile( - fullPhotoSize.location.dc_id, inputFileLocation, fullPhotoSize.size, { - mime: mimeType, - toFileEntry: writableFileEntry - }).then(function (url) { - // console.log('file save done'); - }, function (e) { - console.log('photo download failed', e); - }); }, function () { MtpApiFileManager.downloadFile( fullPhotoSize.location.dc_id, inputFileLocation, fullPhotoSize.size, {mime: mimeType} @@ -2360,7 +2353,6 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) $rootScope.openPhoto = openPhoto; - return { savePhoto: savePhoto, preloadPhoto: preloadPhoto, @@ -2374,7 +2366,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) }) -.service('AppVideoManager', function ($rootScope, $modal, $window, $timeout, MtpApiFileManager, AppUsersManager, FileManager) { +.service('AppVideoManager', function ($sce, $rootScope, $modal, $window, $timeout, MtpApiFileManager, AppUsersManager, FileManager) { var videos = {}, videosForHistory = {}, windowW = $(window).width(), @@ -2399,8 +2391,8 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) } var video = angular.copy(videos[videoID]), - width = Math.min(windowW - 80, Config.Mobile ? 210 : 200), - height = Math.min(windowH - 100, Config.Mobile ? 210 : 200), + width = Math.min(windowW - 80, Config.Mobile ? 210 : 150), + height = Math.min(windowH - 100, Config.Mobile ? 210 : 150), thumbPhotoSize = video.thumb, thumb = { placeholder: 'img/placeholders/VideoThumbConversation.gif', @@ -2452,7 +2444,6 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) video.fullThumb = angular.copy(video.thumb); video.fullThumb.width = full.width; video.fullThumb.height = full.height; - video.fromUser = AppUsersManager.getUser(video.user_id); return video; } @@ -2462,7 +2453,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) scope.videoID = videoID; scope.messageID = messageID; - var modalInstance = $modal.open({ + return $modal.open({ templateUrl: templateUrl('video_modal'), controller: 'VideoModalController', scope: scope, @@ -2470,79 +2461,93 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) }); } - function downloadVideo (videoID, accessHash, popup) { + function updateVideoDownloaded (videoID) { var video = videos[videoID], historyVideo = videosForHistory[videoID] || video || {}, inputFileLocation = { _: 'inputVideoFileLocation', id: videoID, - access_hash: accessHash || video.access_hash + access_hash: video.access_hash }; - historyVideo.progress = {enabled: true, percent: 1, total: video.size}; + // historyVideo.progress = {enabled: true, percent: 10, total: video.size}; - function updateDownloadProgress (progress) { + if (historyVideo.downloaded === undefined) { + MtpApiFileManager.getDownloadedFile(inputFileLocation, video.size).then(function () { + historyVideo.downloaded = true; + }, function () { + historyVideo.downloaded = false; + }); + } + } + + function downloadVideo (videoID, toFileEntry) { + var video = videos[videoID], + historyVideo = videosForHistory[videoID] || video || {}, + inputFileLocation = { + _: 'inputVideoFileLocation', + id: videoID, + access_hash: video.access_hash + }; + + historyVideo.progress = {enabled: !historyVideo.downloaded, percent: 1, total: video.size}; + + var downloadPromise = MtpApiFileManager.downloadFile(video.dc_id, inputFileLocation, video.size, { + mime: video.mime_type || 'video/ogg', + toFileEntry: toFileEntry + }); + + downloadPromise.then(function (url) { + delete historyVideo.progress; + historyVideo.url = $sce.trustAsResourceUrl(url); + historyVideo.downloaded = true; + console.log('video save done'); + }, function (e) { + console.log('video download failed', e); + historyVideo.progress.enabled = false; + }, function (progress) { console.log('dl progress', progress); + historyVideo.progress.enabled = true; historyVideo.progress.done = progress.done; historyVideo.progress.percent = Math.max(1, Math.floor(100 * progress.done / progress.total)); $rootScope.$broadcast('history_update'); - } + }); - var ext = 'mp4', - mimeType = 'video/mpeg4', - fileName = 'video' + videoID + '.' + ext; + historyVideo.progress.cancel = downloadPromise.cancel; - FileManager.chooseSave(fileName, ext, mimeType).then(function (writableFileEntry) { - if (!writableFileEntry) { - return; - } + return downloadPromise; + } - var downloadPromise = MtpApiFileManager.downloadFile(video.dc_id, inputFileLocation, video.size, { - mime: mimeType, - toFileEntry: writableFileEntry - }); - downloadPromise.then(function (url) { - delete historyVideo.progress; - console.log('file save done'); - }, function (e) { - console.log('video download failed', e); - historyVideo.progress.enabled = false; - }, updateDownloadProgress); + function saveVideoFile (videoID) { + var video = videos[videoID], + mimeType = video.mime_type || 'video/mpeg4', + fileExt = mimeType.split('.')[1] || 'mp4', + fileName = 't_video' + videoID + '.' + fileExt, + historyVideo = videosForHistory[videoID] || video || {}; - historyVideo.progress.cancel = downloadPromise.cancel; + FileManager.chooseSave(fileName, fileExt, mimeType).then(function (writableFileEntry) { + if (writableFileEntry) { + downloadVideo(videoID, writableFileEntry); + } }, function () { - var downloadPromise = MtpApiFileManager.downloadFile(video.dc_id, inputFileLocation, video.size, {mime: mimeType}); - - downloadPromise.then(function (url) { - delete historyVideo.progress; - - if (popup) { - window.open(url, '_blank'); - return - } - + downloadVideo(videoID).then(function (url) { FileManager.download(url, mimeType, fileName); - }, function (e) { - console.log('video download failed', e); - historyVideo.progress.enabled = false; - }, updateDownloadProgress); - - historyVideo.progress.cancel = downloadPromise.cancel; + }); }); - }; - - $rootScope.openVideo = openVideo; - $rootScope.downloadVideo = downloadVideo; + } return { saveVideo: saveVideo, wrapForHistory: wrapForHistory, wrapForFull: wrapForFull, - openVideo: openVideo + openVideo: openVideo, + updateVideoDownloaded: updateVideoDownloaded, + downloadVideo: downloadVideo, + saveVideoFile: saveVideoFile } }) -.service('AppDocsManager', function ($rootScope, $modal, $window, $timeout, $q, MtpApiFileManager, FileManager) { +.service('AppDocsManager', function ($sce, $rootScope, $modal, $window, $timeout, $q, MtpApiFileManager, FileManager) { var docs = {}, docsForHistory = {}, windowW = $(window).width(), @@ -2619,6 +2624,8 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) access_hash: doc.access_hash }; + // historyDoc.progress = {enabled: true, percent: 10, total: doc.size}; + if (historyDoc.downloaded === undefined) { MtpApiFileManager.getDownloadedFile(inputFileLocation, doc.size).then(function () { historyDoc.downloaded = true; @@ -2637,7 +2644,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) access_hash: doc.access_hash }; - historyDoc.progress = {enabled: true, percent: 1, total: doc.size}; + historyDoc.progress = {enabled: !historyDoc.downloaded, percent: 1, total: doc.size}; var downloadPromise = MtpApiFileManager.downloadFile(doc.dc_id, inputFileLocation, doc.size, { mime: doc.mime_type, @@ -2646,7 +2653,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) downloadPromise.then(function (url) { delete historyDoc.progress; - historyDoc.url = url; + historyDoc.url = $sce.trustAsResourceUrl(url); historyDoc.downloaded = true; console.log('file save done'); }, function (e) { @@ -2654,6 +2661,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) historyDoc.progress.enabled = false; }, function (progress) { console.log('dl progress', progress); + historyDoc.progress.enabled = true; historyDoc.progress.done = progress.done; historyDoc.progress.percent = Math.max(1, Math.floor(100 * progress.done / progress.total)); $rootScope.$broadcast('history_update'); @@ -2683,12 +2691,9 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) var ext = (doc.file_name.split('.', 2) || [])[1] || ''; FileManager.chooseSave(doc.file_name, ext, doc.mime_type).then(function (writableFileEntry) { - if (!writableFileEntry) { - return; + if (writableFileEntry) { + downloadDoc(docID, writableFileEntry); } - downloadDoc(docID, writableFileEntry).then(function () { - console.log('file save done'); - }); }, function () { downloadDoc(docID).then(function (url) { FileManager.download(url, doc.mime_type, doc.file_name); @@ -2706,7 +2711,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) } }) -.service('AppAudioManager', function ($rootScope, $modal, $window, $timeout, $sce, MtpApiFileManager, FileManager) { +.service('AppAudioManager', function ($sce, $rootScope, $modal, $window, $timeout, MtpApiFileManager, FileManager) { var audios = {}; var audiosForHistory = {}; @@ -2733,6 +2738,8 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) access_hash: audio.access_hash }; + // historyAudio.progress = {enabled: !historyAudio.downloaded, percent: 10, total: audio.size}; + if (historyAudio.downloaded === undefined) { MtpApiFileManager.getDownloadedFile(inputFileLocation, audio.size).then(function () { historyAudio.downloaded = true; @@ -2751,7 +2758,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) access_hash: audio.access_hash }; - historyAudio.progress = {enabled: true, percent: 1, total: audio.size}; + historyAudio.progress = {enabled: !historyAudio.downloaded, percent: 1, total: audio.size}; var downloadPromise = MtpApiFileManager.downloadFile(audio.dc_id, inputFileLocation, audio.size, { mime: audio.mime_type || 'audio/ogg', @@ -2760,7 +2767,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) downloadPromise.then(function (url) { delete historyAudio.progress; - historyAudio.url = url; + historyAudio.url = $sce.trustAsResourceUrl(url); historyAudio.downloaded = true; console.log('audio save done'); }, function (e) { @@ -2768,6 +2775,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) historyAudio.progress.enabled = false; }, function (progress) { console.log('dl progress', progress); + historyAudio.progress.enabled = true; historyAudio.progress.done = progress.done; historyAudio.progress.percent = Math.max(1, Math.floor(100 * progress.done / progress.total)); $rootScope.$broadcast('history_update'); @@ -2780,18 +2788,18 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) function saveAudioFile (audioID) { var audio = audios[audioID], + mimeType = audio.mime_type || 'audio/ogg', + fileExt = mimeType.split('.')[1] || 'ogg', + fileName = 't_audio' + audioID + '.' + fileExt, historyAudio = audiosForHistory[audioID] || audio || {}; - FileManager.chooseSave(audio.file_name, 'ogg', audio.mime_type || 'audio/ogg').then(function (writableFileEntry) { - if (!writableFileEntry) { - return; + FileManager.chooseSave(fileName, fileExt, mimeType).then(function (writableFileEntry) { + if (writableFileEntry) { + downloadAudio(audioID, writableFileEntry); } - downloadAudio(audioID, writableFileEntry).then(function () { - console.log('file save done'); - }); }, function () { downloadAudio(audioID).then(function (url) { - FileManager.download(url, audio.mime_type, audio.file_name); + FileManager.download(url, mimeType, fileName); }); }); } diff --git a/app/partials/desktop/audio_player.html b/app/partials/desktop/audio_player.html index b54649af..bf755c1c 100644 --- a/app/partials/desktop/audio_player.html +++ b/app/partials/desktop/audio_player.html @@ -1,27 +1,35 @@
- + + +
+
+ + +
-
- - - +
+ +
-
- +
+
-
-
-
-
-
+
+
+ +
+
+
+
+
+
+
diff --git a/app/partials/desktop/full_gif.html b/app/partials/desktop/full_gif.html index 227ab0be..e6476a26 100644 --- a/app/partials/desktop/full_gif.html +++ b/app/partials/desktop/full_gif.html @@ -1,6 +1,6 @@ -
+
@@ -17,7 +17,7 @@
GIF
-
+
diff --git a/app/partials/desktop/full_video.html b/app/partials/desktop/full_video.html index c06f6ad7..b8a72180 100644 --- a/app/partials/desktop/full_video.html +++ b/app/partials/desktop/full_video.html @@ -1,22 +1,22 @@
-
+
-
+
-
+
-
- -
diff --git a/app/partials/desktop/message.html b/app/partials/desktop/message.html index b24250b8..1c0ec2f8 100644 --- a/app/partials/desktop/message.html +++ b/app/partials/desktop/message.html @@ -51,7 +51,7 @@
-
+
diff --git a/app/partials/desktop/message_attach_document.html b/app/partials/desktop/message_attach_document.html index bf539c6a..8e8e7028 100644 --- a/app/partials/desktop/message_attach_document.html +++ b/app/partials/desktop/message_attach_document.html @@ -32,7 +32,7 @@
-
+
diff --git a/app/partials/desktop/message_attach_pending.html b/app/partials/desktop/message_attach_pending.html index 21bb16d9..8f027ea5 100644 --- a/app/partials/desktop/message_attach_pending.html +++ b/app/partials/desktop/message_attach_pending.html @@ -1,14 +1,16 @@
- +
+ +
-
+
-
+
diff --git a/app/partials/desktop/message_attach_video.html b/app/partials/desktop/message_attach_video.html index a184d909..39ea943a 100644 --- a/app/partials/desktop/message_attach_video.html +++ b/app/partials/desktop/message_attach_video.html @@ -1,29 +1,32 @@
- - + +
- - + +
-
- - +
+ + + + +
-
- +
+
-
+
diff --git a/app/partials/desktop/settings_modal.html b/app/partials/desktop/settings_modal.html index 596f298c..93b5b705 100644 --- a/app/partials/desktop/settings_modal.html +++ b/app/partials/desktop/settings_modal.html @@ -97,7 +97,7 @@ -
+
diff --git a/app/partials/mobile/full_gif.html b/app/partials/mobile/full_gif.html index cffc8140..e6476a26 100644 --- a/app/partials/mobile/full_gif.html +++ b/app/partials/mobile/full_gif.html @@ -1,6 +1,6 @@ - + -
+
@@ -17,7 +17,7 @@
GIF
-
+
diff --git a/app/partials/mobile/full_video.html b/app/partials/mobile/full_video.html index c06f6ad7..b8a72180 100644 --- a/app/partials/mobile/full_video.html +++ b/app/partials/mobile/full_video.html @@ -1,22 +1,22 @@
-
+
-
+
-
+
-
- -
diff --git a/app/partials/mobile/message.html b/app/partials/mobile/message.html index 1be7c686..60ff3c7d 100644 --- a/app/partials/mobile/message.html +++ b/app/partials/mobile/message.html @@ -41,7 +41,7 @@
-
+
diff --git a/app/partials/mobile/message_attach_document.html b/app/partials/mobile/message_attach_document.html index 888626ca..8e8e7028 100644 --- a/app/partials/mobile/message_attach_document.html +++ b/app/partials/mobile/message_attach_document.html @@ -1,39 +1,42 @@ -
+
-
+
-
+
-
+
- - -
+ + + + +
- - - + + +
-
- - +
+ + +
-
- +
+
-
+
diff --git a/app/partials/mobile/message_attach_pending.html b/app/partials/mobile/message_attach_pending.html index 21bb16d9..3f23dd68 100644 --- a/app/partials/mobile/message_attach_pending.html +++ b/app/partials/mobile/message_attach_pending.html @@ -5,7 +5,7 @@
-
+
diff --git a/app/partials/mobile/message_attach_video.html b/app/partials/mobile/message_attach_video.html index 7fe315a5..78cac8bd 100644 --- a/app/partials/mobile/message_attach_video.html +++ b/app/partials/mobile/message_attach_video.html @@ -1,11 +1,11 @@
- - + +
\ No newline at end of file diff --git a/app/partials/mobile/photo_modal.html b/app/partials/mobile/photo_modal.html index 13ce2fd0..d51a35f3 100644 --- a/app/partials/mobile/photo_modal.html +++ b/app/partials/mobile/photo_modal.html @@ -12,7 +12,7 @@

- , + ,

diff --git a/app/partials/mobile/slider.html b/app/partials/mobile/slider.html new file mode 120000 index 00000000..0ed70a67 --- /dev/null +++ b/app/partials/mobile/slider.html @@ -0,0 +1 @@ +../desktop/slider.html \ No newline at end of file diff --git a/app/partials/mobile/video_modal.html b/app/partials/mobile/video_modal.html index 62b11703..01e75d60 100644 --- a/app/partials/mobile/video_modal.html +++ b/app/partials/mobile/video_modal.html @@ -12,7 +12,7 @@

- , + ,