Browse Source

Audio player fixes

Reverted IM not loaded label
Fixed mobile edit action buttons
Disabled i18n for mobile
master
Igor Zhukov 10 years ago
parent
commit
c07b22a4b4
  1. 5
      app/css/app.css
  2. 3
      app/js/filters.js
  3. 2
      app/js/init.js
  4. 2
      app/partials/desktop/audio_player.html
  5. 10
      app/partials/desktop/im.html
  6. 5
      app/partials/mobile/im.html
  7. 2
      app/webogram.appcache
  8. 2
      package.json

5
app/css/app.css

@ -1457,13 +1457,16 @@ img.im_message_document_thumb { @@ -1457,13 +1457,16 @@ img.im_message_document_thumb {
background-position: -15px -924px;
}
.audio_player_btn_icon_cancel {
background-position: -15px -948px;
background-position: -15px -924px;
/*background-position: -15px -948px;*/
}
.audio_player_title_wrap {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
padding: 0 0 1px;
line-height: 18px;
height: 19px;
}
.audio_player_title {
color: #222;

3
app/js/filters.js

@ -105,6 +105,9 @@ angular.module('myApp.filters', ['myApp.i18n']) @@ -105,6 +105,9 @@ angular.module('myApp.filters', ['myApp.i18n'])
.filter('duration', [function() {
return function (duration) {
duration = parseInt(duration);
if (isNaN(duration)) {
duration = 0;
}
var secs = duration % 60,
mins = Math.floor((duration - secs) / 60.0);

2
app/js/init.js

@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
locale = (navigator.language || '').toLowerCase();
locale = Config.I18n.aliases[locale] || locale;
}
if (Config.I18n.supported.indexOf(locale) != -1) {
if (!Config.Mobile && Config.I18n.supported.indexOf(locale) != -1) {
Config.I18n.locale = locale;
}
bootReady.i18n_ng = Config.I18n.locale == defaultLocale; // Already included

2
app/partials/desktop/audio_player.html

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
<button class="btn btn-primary pull-left audio_player_button" ng-click="togglePlay()">
<i class="icon audio_player_btn_icon" ng-class="{audio_player_btn_icon_pause: mediaPlayer.player.playing, audio_player_btn_icon_cancel: audio.progress.enabled}"></i>
</button>
<div class="audio_player_title_wrap clearfix">
<div class="audio_player_title_wrap">
<a ng-click="download()" class="audio_player_title" ng-switch="::audio.file_name.length > 0">
<span ng-switch-when="true" ng-bind="::audio.file_name"></span>
<span ng-switch-default my-i18n="message_attach_audio_message"></span>

10
app/partials/desktop/im.html

@ -83,6 +83,16 @@ @@ -83,6 +83,16 @@
</div>
<div class="im_history_col_wrap" ng-controller="AppImHistoryController">
<div ng-show="state.notSelected" ng-switch="isEmpty.contacts &amp;&amp; isEmpty.dialogs">
<div ng-switch-when="true" class="im_history_no_dialogs_wrap">
<h3 class="im_dialogs_empty_header" my-i18n="im_get_started"></h3>
<p class="im_dialogs_empty_lead" my-i18n="im_welcome_text"></p>
<button type="button" class="btn btn-primary btn-sm" ng-click="openSettings()" my-i18n="im_open_settings"></button>
</div>
<div ng-switch-default class="im_history_not_selected" my-vertical-position="0.35" padding="true" my-i18n="im_select_a_chat"></div>
</div>
<div ng-show="!state.notSelected &amp;&amp; !state.loaded" class="im_history_not_selected" my-vertical-position="0.35" padding="true">
<my-i18n msgid="im_loading_history"></my-i18n><span my-loading-dots></span>
</div>

5
app/partials/mobile/im.html

@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
<div class="im_dialogs_empty_wrap" ng-if="isEmpty.contacts" my-vertical-position="0.4">
<h3 class="im_dialogs_empty_header" my-i18n="im_no_contacts"></h3>
<p class="im_dialogs_empty_lead" my-i18n="im_get_started_long"></p>
<button type="button" class="btn btn-primary btn-block im_dialogs_add_contact" ng-click="importContact()" my-i18n="im_add_contact"> </button>
<button type="button" class="btn btn-primary btn-block im_dialogs_add_contact" ng-click="importContact()" my-i18n="im_add_contact"></button>
<button ng-if="phonebookAvailable" type="button" class="btn btn-primary btn-block im_dialogs_import_phonebook" ng-click="importPhonebook()" my-i18n="im_import_phonebook"></button>
</div>
@ -99,8 +99,7 @@ @@ -99,8 +99,7 @@
<div class="im_edit_panel_wrap clearfix" ng-show="historyState.selectActions">
<div class="im_edit_selected_actions" my-i18n>
<a class="btn btn-primary im_edit_forward_btn" ng-click="selectedForward()" ng-class="{disabled: !selectedCount}" ng-disabled="!selectedCount" my-i18n-format="im_forward"></a>
<a class="btn btn-danger im_edit_delete_btn" ng-click="selectedDelete()" ng-class="{disabled: !selectedCount}" ng-disabled="!selectedCount" my-i18n-format="im_delete"></a>
<a class="btn btn-primary im_edit_forward_btn" ng-click="selectedForward()" ng-class="{disabled: !selectedCount}" ng-disabled="!selectedCount" my-i18n-format="im_forward"></a><a class="btn btn-danger im_edit_delete_btn" ng-click="selectedDelete()" ng-class="{disabled: !selectedCount}" ng-disabled="!selectedCount" my-i18n-format="im_delete"></a>
<my-i18n-param name="count"><strong class="im_selected_count" ng-show="selectedCount > 0" ng-bind="selectedCount"></strong></my-i18n-param>
</div>
</div>

2
app/webogram.appcache

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
CACHE MANIFEST
# 34
# 36
NETWORK:
*

2
package.json

@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
"bugs": {
"url": "https://github.com/zhukov/webogram/issues"
},
"locales": ["en-us", "es-es", "de-de"],
"locales": ["en-us", "es-es", "de-de", "it-it", "ru-ru"],
"homepage": "http://zhukov.github.io/webogram",
"devDependencies": {
"gulp": "~3.5.5",

Loading…
Cancel
Save