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

Start button draft

Browse Source
This commit is contained in:
Igor Zhukov 2015-07-02 23:53:44 +03:00
parent 74da0c8f55
commit a25619bf19
4 changed files with 66 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
app/js/controllers.js
View File

@ -407,9 +407,12 @@ angular.module('myApp.controllers', ['myApp.i18n'])
$scope.$on('$routeUpdate', updateCurDialog);
var pendingParams = false;
$scope.$on('history_focus', function (e, peerData) {
$modalStack.dismissAll();
if (peerData.peerString == $scope.curDialog.peer && peerData.messageID == $scope.curDialog.messageID) {
if (peerData.peerString == $scope.curDialog.peer &&
peerData.messageID == $scope.curDialog.messageID &&
!peerData.startParam) {
$scope.$broadcast(peerData.messageID ? 'ui_history_change_scroll' : 'ui_history_focus');
} else {
var peerID = AppPeersManager.getPeerID(peerData.peerString);
@ -420,7 +423,19 @@ angular.module('myApp.controllers', ['myApp.i18n'])
peer = '@' + username;
}
}
$location.url('/im?p=' + peer + (peerData.messageID ? '&m=' + peerData.messageID : ''));
if (peerData.messageID || peerData.startParam) {
pendingParams = {
messageID: peerData.messageID,
startParam: peerData.startParam
};
} else {
pendingParams = false;
}
if ($routeParams.p != peer) {
$location.url('/im?p=' + peer);
} else {
updateCurDialog();
}
}
});
@ -568,21 +583,24 @@ angular.module('myApp.controllers', ['myApp.i18n'])
} else {
lastSearch = false;
}
var addParams = pendingParams || {};
pendingParams = false;
addParams.messageID = parseInt(addParams.messageID) || false;
addParams.startParam = addParams.startParam || false;
if ($routeParams.p && $routeParams.p.charAt(0) == '@') {
if ($scope.curDialog === undefined) {
$scope.curDialog = {};
}
AppUsersManager.resolveUsername($routeParams.p.substr(1)).then(function (userID) {
$scope.curDialog = {
peer: AppUsersManager.getUserString(userID),
messageID: parseInt($routeParams.m) || false
};
$scope.curDialog = angular.extend({
peer: AppUsersManager.getUserString(userID)
}, addParams);
});
} else {
$scope.curDialog = {
peer: $routeParams.p || false,
messageID: parseInt($routeParams.m) || false
};
$scope.curDialog = angular.extend({
peer: $routeParams.p || false
}, addParams);
}
}
@ -740,8 +758,7 @@ angular.module('myApp.controllers', ['myApp.i18n'])
$location.url(
'/im' +
($scope.curDialog.peer
? '?p=' + $scope.curDialog.peer +
($scope.curDialog.messageID ? '&m=' + $scope.curDialog.messageID : '')
? '?p=' + $scope.curDialog.peer
: ''
)
);
@ -1016,8 +1033,9 @@ angular.module('myApp.controllers', ['myApp.i18n'])
var newPeer = newDialog.peer || $scope.curDialog.peer || '';
peerID = AppPeersManager.getPeerID(newPeer);
if (peerID == $scope.curDialog.peerID && oldDialog.messageID == newDialog.messageID) {
if (peerID == $scope.curDialog.peerID &&
oldDialog.messageID == newDialog.messageID &&
oldDialog.startParam == newDialog.startParam) {
return false;
}
@ -1025,10 +1043,13 @@ angular.module('myApp.controllers', ['myApp.i18n'])
$scope.curDialog.peerID = peerID;
$scope.curDialog.inputPeer = AppPeersManager.getInputPeer(newPeer);
$scope.historyFilter.mediaType = false;
$scope.historyState.startBot = newDialog.startParam ? 1 : false;
selectedCancel(true);
if (oldDialog.peer && oldDialog.peer == newDialog.peer && newDialog.messageID) {
if (oldDialog.peer &&
oldDialog.peer == newDialog.peer &&
newDialog.messageID) {
messageFocusHistory();
}
else if (peerID) {
@ -1319,11 +1340,29 @@ angular.module('myApp.controllers', ['myApp.i18n'])
AppMessagesManager.readHistory($scope.curDialog.inputPeer);
if (!$scope.curDialog.messageID &&
!inputMediaFilter &&
peerID > 0 &&
AppUsersManager.isBot(peerID) &&
(!peerHistory.ids.length || peerHistory.ids.length == 1 && peerHistory.ids[0] < 0)
) {
$scope.historyState.startBot = 2;
}
}, function () {
safeReplaceObject($scope.state, {error: true});
});
}
$scope.botStartCancel = function () {
delete $scope.curDialog.startParam;
}
$scope.botStart = function () {
AppMessagesManager.startBot(peerID, 0, $scope.curDialog.startParam);
delete $scope.curDialog.startParam;
}
function showEmptyHistory () {
jump++;
safeReplaceObject($scope.historyPeer, {});

2
app/js/directives.js
View File

@ -395,7 +395,7 @@ angular.module('myApp.directives', ['myApp.filters'])
var peerID = AppMessagesManager.getMessagePeer(message);
var peerString = AppPeersManager.getPeerString(peerID);
$rootScope.$broadcast('history_focus', {peerString: peerString, messageID: message.id});
$rootScope.$broadcast('history_focus', {peerString: peerString, messageID: message.id});
})
}

1
app/js/locales/en-us.json
View File

@ -398,6 +398,7 @@
"im_delete": "Delete {count}",
"im_forward": "Forward {count}",
"im_reply": "Reply",
"im_start": "Start",
"im_reply_loading": "Loading{dots}",
"im_photos_drop_text": "Drop photos here to send",
"im_message_field_placeholder": "Write a message...",

12
app/partials/desktop/im.html
View File

@ -140,7 +140,7 @@
<div class="im_bottom_panel_wrap">
<div class="im_edit_panel_wrap clearfix" ng-show="historyState.selectActions">
<div class="im_edit_panel_wrap clearfix" ng-show="historyState.selectActions &amp;&amp; !historyState.startBot">
<div class="im_edit_panel_border"></div>
<a class="btn btn-md btn-md-primary im_edit_cancel_link" ng-click="selectedCancel()" my-i18n="modal_cancel"></a>
<div class="im_edit_selected_actions" my-i18n>
@ -151,7 +151,15 @@
</div>
</div>
<div class="im_send_panel_wrap" ng-hide="historyState.selectActions">
<div class="im_start_panel_wrap clearfix" ng-show="historyState.startBot">
<div class="im_edit_panel_border"></div>
<a ng-show="historyState.startBot == 1" class="btn btn-md btn-md-primary im_edit_cancel_link" ng-click="botStartCancel()" my-i18n="modal_cancel"></a>
<div class="im_edit_selected_actions" my-i18n>
<a class="btn btn-primary im_start_btn" ng-click="botStart()" my-i18n-format="im_start"></a>
</div>
</div>
<div class="im_send_panel_wrap" ng-show="!historyState.selectActions &amp;&amp; !historyState.startBot">
<div class="im_send_form_wrap1">