Browse Source

Fixed margin top

master
Igor Zhukov 11 years ago
parent
commit
a4db65e21b
  1. 2
      Makefile
  2. 2
      app/js/controllers.js
  3. 2
      app/js/directives.js
  4. 13
      app/js/lib/mtproto.js

2
Makefile

@ -16,7 +16,7 @@ package:
cd package_dist && zip -r ../webogram_v$(version).zip . cd package_dist && zip -r ../webogram_v$(version).zip .
publish: publish:
rm -rf dist/* ./node_modules/gulp/bin/gulp.js clean
cd dist && git pull origin gh-pages cd dist && git pull origin gh-pages
./node_modules/gulp/bin/gulp.js publish ./node_modules/gulp/bin/gulp.js publish
cd dist && git add --all . && git commit -am "merged with master" && git push origin gh-pages cd dist && git add --all . && git commit -am "merged with master" && git push origin gh-pages

2
app/js/controllers.js

@ -444,7 +444,7 @@ angular.module('myApp.controllers', [])
if (!hasMore || !offset) { if (!hasMore || !offset) {
return; return;
} }
console.trace('load history'); // console.trace('load history');
var inputMediaFilter = $scope.mediaType && {_: inputMediaFilters[$scope.mediaType]}, var inputMediaFilter = $scope.mediaType && {_: inputMediaFilters[$scope.mediaType]},
getMessagesPromise = inputMediaFilter getMessagesPromise = inputMediaFilter

2
app/js/directives.js

@ -278,7 +278,7 @@ angular.module('myApp.directives', ['myApp.filters'])
$(scrollable).css({bottom: ''}); $(scrollable).css({bottom: ''});
scrollableWrap.scrollTop = st + scrollableWrap.scrollHeight - sh; scrollableWrap.scrollTop = st + scrollableWrap.scrollHeight - sh;
updateScroller(); updateBottomizer();
moreNotified = false; moreNotified = false;
$timeout(function () { $timeout(function () {

13
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.post['Content-Type'];
delete $http.defaults.headers.common['Accept']; 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', responseType: 'arraybuffer',
transformRequest: null, transformRequest: null,
transformResponse: function (responseBuffer) { transformResponse: function (responseBuffer) {
@ -2028,7 +2032,12 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
delete $http.defaults.headers.post['Content-Type']; delete $http.defaults.headers.post['Content-Type'];
delete $http.defaults.headers.common['Accept']; 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', responseType: 'arraybuffer',
transformRequest: null transformRequest: null
}); });

Loading…
Cancel
Save