From a4db65e21bbbf39deccaeb921efd7dba11c1bc58 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Fri, 21 Mar 2014 14:07:46 +0400 Subject: [PATCH] Fixed margin top --- Makefile | 2 +- app/js/controllers.js | 2 +- app/js/directives.js | 2 +- app/js/lib/mtproto.js | 13 +++++++++++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 6f255af2..6151f003 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ package: cd package_dist && zip -r ../webogram_v$(version).zip . publish: - rm -rf dist/* + ./node_modules/gulp/bin/gulp.js clean cd dist && git pull origin gh-pages ./node_modules/gulp/bin/gulp.js publish cd dist && git add --all . && git commit -am "merged with master" && git push origin gh-pages diff --git a/app/js/controllers.js b/app/js/controllers.js index 47e4832c..68959328 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -444,7 +444,7 @@ angular.module('myApp.controllers', []) if (!hasMore || !offset) { return; } - console.trace('load history'); + // console.trace('load history'); var inputMediaFilter = $scope.mediaType && {_: inputMediaFilters[$scope.mediaType]}, getMessagesPromise = inputMediaFilter diff --git a/app/js/directives.js b/app/js/directives.js index ab928acb..2c7f9a2b 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -278,7 +278,7 @@ angular.module('myApp.directives', ['myApp.filters']) $(scrollable).css({bottom: ''}); scrollableWrap.scrollTop = st + scrollableWrap.scrollHeight - sh; - updateScroller(); + updateBottomizer(); moreNotified = false; $timeout(function () { diff --git a/app/js/lib/mtproto.js b/app/js/lib/mtproto.js index 4d007a71..1d567d7e 100644 --- a/app/js/lib/mtproto.js +++ b/app/js/lib/mtproto.js @@ -1071,7 +1071,11 @@ factory('MtpAuthorizer', function (MtpDcConfigurator, MtpRsaKeysManager, MtpSecu delete $http.defaults.headers.post['Content-Type']; delete $http.defaults.headers.common['Accept']; - return $http.post('http://' + MtpDcConfigurator.chooseServer(dcID) + '/apiw1', resultArray.buffer, { + if (!('ArrayBufferView' in window)) { + resultArray = resultArray.buffer; + } + + return $http.post('http://' + MtpDcConfigurator.chooseServer(dcID) + '/apiw1', resultArray, { responseType: 'arraybuffer', transformRequest: null, transformResponse: function (responseBuffer) { @@ -2028,7 +2032,12 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato delete $http.defaults.headers.post['Content-Type']; delete $http.defaults.headers.common['Accept']; - return $http.post('http://' + MtpDcConfigurator.chooseServer(self.dcID) + '/apiw1', request.getBuffer(), { + var resultArray = request.getArray(); + if (!('ArrayBufferView' in window)) { + resultArray = resultArray.buffer; + } + + return $http.post('http://' + MtpDcConfigurator.chooseServer(self.dcID) + '/apiw1', resultArray, { responseType: 'arraybuffer', transformRequest: null });