diff --git a/home.html b/home.html
index 0a751b3..961e26b 100644
--- a/home.html
+++ b/home.html
@@ -13,6 +13,7 @@
+
@@ -29,14 +30,11 @@
-
@@ -44,8 +42,7 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/img/wrapperBg.png b/img/wrapperBg.png
new file mode 100644
index 0000000..82331e7
Binary files /dev/null and b/img/wrapperBg.png differ
diff --git a/js/calm.js b/js/calm.js
index b6884f7..0309b2c 100644
--- a/js/calm.js
+++ b/js/calm.js
@@ -1,10 +1,15 @@
$(function(){
$('.post-text, #descWrap').on('click', 'a', function(e){e.stopPropagation();});
+
$('#showqr').on('click', function(){
- if($('#qrcode img')[0]) return;
+ if($('#qrcode img')[0]) {
+ $('#qrcode').empty();
+ return;
+ };
var skey = document.getElementById('skey').innerText;
new QRCode(document.getElementById("qrcode"), skey);
});
+
$('.tox-ctc').on('click', function(){
window.prompt('Press Ctrl/Cmd+C to copy then Enter to close', $(this).attr('data'))
})
diff --git a/js/interface_common.js b/js/interface_common.js
index 92d3c71..aadfabe 100644
--- a/js/interface_common.js
+++ b/js/interface_common.js
@@ -400,7 +400,7 @@ var unfocusThis = function()
}
function replyTextKeypress(e) {
- e = e || event;
+ var e = e || event;
var $this = $( this );
var tweetForm = $this.parents("form");
if( tweetForm != undefined ) {
@@ -418,21 +418,29 @@ function replyTextKeypress(e) {
} else {
$.MAL.disableButton(tweetAction);
}
+ }
+}
- if(localStorage['keysSend'] == 1 && $('.dropdown-menu').css('display') == 'none'){
- if (e.keyCode === 13 && (!e.metaKey && !e.ctrlKey)) {
- $this.val($this.val().trim());
- if( !tweetAction.hasClass("disabled")) {
- tweetAction.click();
- }
+var replyTextSendKeys = function(e) {
+ var $this = $(this);
+ var tweetAction = $this.parents("form").find('.post-submit');
+
+ if($.Options.getOption('keysSend', 2) === 1){
+ if (!(e.metaKey || e.ctrlKey) && e.keyCode === 13) {
+ $this.val($this.val().trim());
+ if( !tweetAction.hasClass("disabled")) {
+ tweetAction.click();
+ }
+ }else if((e.metaKey || e.ctrlKey) && e.keyCode === 13){
+ e.preventDefault();
+ var val = $this.val();
+ $this.val(val += '\r')
}
- }else if(localStorage['keysSend'] == 2){
- if (e.keyCode === 13 && (e.metaKey || e.ctrlKey)) {
-
- $this.val($this.val().trim());
- if( !tweetAction.hasClass("disabled") ) {
- tweetAction.click();
- }
+ }else if($.Options.getOption('keysSend', 2) === 2){
+ if ((e.metaKey || e.ctrlKey) && e.keyCode === 13) {
+ $this.val($this.val().trim());
+ if( !tweetAction.hasClass("disabled") ) {
+ tweetAction.click();
}
}
}
@@ -499,7 +507,8 @@ function initInterfaceCommon() {
$( ".modal-propagate").click( retweetSubmit );
var $replyText = $( ".post-area-new textarea" );
- $replyText.on("keyup", replyTextKeypress );
+ $replyText.on('keyup', replyTextKeypress );
+ $replyText.on('keydown', replyTextSendKeys);
$( ".open-profile-modal").bind( "click", openProfileModal );
$( ".open-hashtag-modal").bind( "click", openHashtagModal );
diff --git a/js/interface_localization.js b/js/interface_localization.js
index 9738c2d..57576f2 100644
--- a/js/interface_localization.js
+++ b/js/interface_localization.js
@@ -6,8 +6,7 @@
// translators: add your language code here such as "es" for Spanish, "ru" for Russian
var knownLanguages = ["en","es","nl","it","fr","ru","de","zh","ja","pt-BR","tr","uk"], preferredLanguage;
-if(!localStorage['locLang'] || localStorage['locLang'] == 'auto'){
- if(!localStorage['locLang']) localStorage['locLang'] = 'auto';
+if($.Options.getOption('locLang', 'auto') === 'auto'){
// detect language with JavaScript
preferredLanguage = window.navigator.userLanguage || window.navigator.language || "en";
if(knownLanguages.indexOf(preferredLanguage) > -1){
@@ -23,7 +22,7 @@ if(!localStorage['locLang'] || localStorage['locLang'] == 'auto'){
preferredLanguage = "en";
}
}else{
- preferredLanguage = localStorage['locLang'];
+ preferredLanguage = $.Options.getOption('locLang', 'en');
}
// set up Polyglot
polyglot = new Polyglot();
diff --git a/js/mobile_abstract.js b/js/mobile_abstract.js
index 40c3bfc..d8dc8ef 100644
--- a/js/mobile_abstract.js
+++ b/js/mobile_abstract.js
@@ -94,7 +94,7 @@ var MAL = function()
newTweetsBar.text("Refresh");
}
} else {
- var newTweetsBar = $(".postboard-news");
+ var newTweetsBar = $(".wrapper").find(".postboard-news");
if( newPosts ) {
document.title = "(" + String(newPosts) + ") twister";
newTweetsBar.text(String(newPosts) + " new posts");
@@ -338,7 +338,7 @@ var MAL = function()
$button.addClass("disabled");
$button.attr("disabled","true");
}
- }
+ }
this.changedUser = function() {
if( $.hasOwnProperty("mobile") ) {
@@ -351,6 +351,20 @@ var MAL = function()
window.location.href = "home.html";
}
}
+
+ this.soundNotifyMentions = function() {
+ if( $.hasOwnProperty("mobile") ) {
+ } else {
+ $.Options.mensNotif();
+ }
+ }
+
+ this.soundNotifyDM = function() {
+ if( $.hasOwnProperty("mobile") ) {
+ } else {
+ $.Options.DMsNotif();
+ }
+ }
}
jQuery.MAL = new MAL;
diff --git a/js/options.js b/js/options.js
index 46c8365..91050b4 100644
--- a/js/options.js
+++ b/js/options.js
@@ -1,147 +1,146 @@
-$(function() {
-
-});
+var TwisterOptions = function()
+{
+ this.getOption = function(optionName, defaultValue) {
+ var keyName = 'options:' + optionName;
+ if ($.localStorage.isSet(keyName)) {
+ return $.localStorage.get(keyName);
+ }else{
+ return defaultValue;
+ }
+ };
-function soundNotifOptions() {
- if(!localStorage['sndDM']) localStorage['sndDM'] = false;
- if(!localStorage['sndMention']) localStorage['sndMention'] = false;
- $('.sndOpt').each(function(){
- this.value = localStorage[this.id];
- });
+ this.setOption = function(optionName, value) {
+ var keyName = 'options:' + optionName;
+ $.localStorage.set(keyName, value);
+ };
- var player = $('#player');
- player[0].pause();
- $('#player').empty();
+ this.soundNotifOptions = function() {
+ $('.sndOpt').each(function(){
+ this.value = $.Options.getOption(this.id, 'false');
+ });
- $('.sndOpt').on('change',function(){
- localStorage.setItem(this.id, this.value);
+ var player = $('#player');
+ player[0].pause();
+ $('#player').empty();
- if(this.value == false) {player[0].pause(); return;}
- if (player[0].canPlayType('audio/mpeg;')) {
- player.attr('type', 'audio/mpeg');
- player.attr('src', 'sound/'+this.value+'.mp3');
- } else {
- player.attr('type', 'audio/ogg');
- player.attr('src', 'sound/'+this.value+'.ogg');
- }
-
- player[0].play();
- });
-}
-function volumeControl () {
- var playerVol = $('#playerVol');
- if(!localStorage[playerVol[0].id]) localStorage[playerVol[0].id] = 1;
- playerVol[0].value = localStorage[playerVol[0].id];
- $('.volValue').text((localStorage[playerVol[0].id] * 100).toFixed());
-
- playerVol.on('change',function(){
- localStorage.setItem(this.id, this.value);
- $('#player')[0].volume = (this.value);
- $('.volValue').text((this.value * 100).toFixed());
- });
-}
+ $('.sndOpt').on('change',function(){
+ $.Options.setOption(this.id, this.value);
-function DMsNotif() {
- if(localStorage['sndDM'] == "false") return;
- var player = $('#player');
- $('#player').empty();
-
- if (player[0].canPlayType('audio/mpeg;')) {
- player.attr('type', 'audio/mpeg');
- player.attr('src', 'sound/'+localStorage['sndDM']+'.mp3');
- } else {
- player.attr('type', 'audio/ogg');
- player.attr('src', 'sound/'+localStorage['sndDM']+'.ogg');
- }
- player[0].volume = localStorage['playerVol'];
- player[0].play();
-}
+ if(this.value == false) {player[0].pause(); return;}
+ if (player[0].canPlayType('audio/mpeg;')) {
+ player.attr('type', 'audio/mpeg');
+ player.attr('src', 'sound/'+this.value+'.mp3');
+ } else {
+ player.attr('type', 'audio/ogg');
+ player.attr('src', 'sound/'+this.value+'.ogg');
+ }
+
+ player[0].play();
+ });
+ }
-function mensNotif() {
- if(localStorage['sndMention'] == "false") return;
- var player = $('#player');
- $('#playerSec').empty();
-
- if (player[0].canPlayType('audio/mpeg;')) {
- player.attr('type', 'audio/mpeg');
- player.attr('src', 'sound/'+localStorage['sndMention']+'.mp3');
- } else {
- player.attr('type', 'audio/ogg');
- player.attr('src', 'sound/'+localStorage['sndMention']+'.ogg');
- }
- player[0].volume = localStorage['playerVol'];
- player[0].play();
-};
+ this.volumeControl = function() {
+ var playerVol = $('#playerVol');
-function keysSend() {
- if(!localStorage['keysSend']) localStorage['keysSend'] = 1;
- $('#keysSend')[0].value = localStorage['keysSend'];
-
- $('#keysSend').on('change', function(){
- localStorage[this.id] = this.value;
-
- })
-}
+ playerVol[0].value = $.Options.getOption(playerVol[0].id, 1)
+
+ $('.volValue').text((playerVol[0].value * 100).toFixed());
+
+ playerVol.on('change',function(){
+ $.Options.setOption(this.id, this.value)
+ $('#player')[0].volume = (this.value);
+ $('.volValue').text((this.value * 100).toFixed());
+ });
+ }
-function setLang() {
+ this.DMsNotif = function() {
+ if($.Options.getOption('sndDM', 'false') === "false") return;
+ var player = $('#player');
+ $('#player').empty();
- $('#language').val(localStorage['locLang'] || 'auto')
- $('#language').on('change', function(){
- localStorage['locLang'] = $(this).val();
- location.reload();
- })
-}
+ if (player[0].canPlayType('audio/mpeg;')) {
+ player.attr('type', 'audio/mpeg');
+ player.attr('src', 'sound/'+localStorage['sndDM']+'.mp3');
+ } else {
+ player.attr('type', 'audio/ogg');
+ player.attr('src', 'sound/'+localStorage['sndDM']+'.ogg');
+ }
+ player[0].volume = $.Options.getOption('playerVol', 1);
+ player[0].play();
+ }
-function setTheme() {
- if(!localStorage['theme']) localStorage['theme'] = 'calm';
- $('#theme').val(localStorage['theme']).on('change', function(){
- localStorage['theme'] = $(this).val();
- location.reload();
- });
+ this.mensNotif = function() {
+ if($.Options.getOption('sndMention', 'false' === 'false')) return;
-}
+ var player = $('#player');
+ $('#playerSec').empty();
-function setShowPreviewOpt(){
- if(!localStorage['imagesPreview']) localStorage['imagesPreview'] = 'enable';
- if(!localStorage['imagesPreviewGif']) localStorage['imagesPreviewGif'] = 'true';
- if(!localStorage['youtubePreview']) localStorage['youtubePreview'] = 'enable';
- if(!localStorage['vimeoPreview']) localStorage['vimeoPreview'] = 'enable';
+ if (player[0].canPlayType('audio/mpeg;')) {
+ player.attr('type', 'audio/mpeg');
+ player.attr('src', 'sound/'+localStorage['sndMention']+'.mp3');
+ } else {
+ player.attr('type', 'audio/ogg');
+ player.attr('src', 'sound/'+localStorage['sndMention']+'.ogg');
+ }
+ player[0].volume = $.Options.getOption('playerVol', 1);
+ player[0].play();
+ };
- $('.previewOpt').each(function() {
- this.value = localStorage[this.id];
- })
-
- $('.gifCheckBox').prop('checked', localStorage['imagesPreviewGif'] === 'true')
+ this.keysSend = function() {
+
+ $('#keysSend')[0].value = $.Options.getOption('keysSend', 2)
+
+ $('#keysSend').on('change', function(){
+ $.Options.setOption(this.id, this.value);
- if(localStorage['imagesPreview'] == 'disable'){
- $('input[type="checkbox"]').prop('disabled', localStorage['imagesPreviewGif'])
+ })
}
-
- $('.previewOpt').on('change', function(){
- localStorage[this.id] = $(this).val();
- if (this.id === 'imagesPreview'){
- switch($(this).val()){
- case 'enable': $('.gifCheckBox').prop('disabled', false); break;
- case 'disable': $('.gifCheckBox').prop('disabled', true); break;
- }
+
+ this.locLang = function() {
+ $('#locLang').val($.Options.getOption('locLang', 'auto'))
+ $('#locLang').on('change', function(){
+ $.Options.setOption(this.id, this.value);
+ location.reload();
+ })
+ }
+
+ this.showPreviewOpt = function() {
+
+ $('.previewOpt').each(function() {
+ this.value = $.Options.getOption(this.id, 'enable');
+ })
+
+ $('.gifCheckBox').prop('checked', $.Options.getOption('imagesPreviewGif', 'true'))
+
+ if($.Options.getOption('imagesPreview', 'enable') === 'disable'){
+ $('input[type="checkbox"]').prop('disabled', 'true')
}
- })
-
- $('input[type="checkbox"]').on('click', function(){
- localStorage[$(this).attr('name')] = $(this).prop('checked')
- })
-}
+
+ $('.previewOpt').on('change', function(){
+ $.Options.setOption(this.id, this.value)
+ if (this.id === 'imagesPreview'){
+ switch(this.value){
+ case 'enable': $('.gifCheckBox').prop('disabled', false); break;
+ case 'disable': $('.gifCheckBox').prop('disabled', true); break;
+ }
+ }
+ })
+
+ $('input[type="checkbox"]').on('click', function(){
+ $.Options.setOption(this.name, this.checked)
+ })
+ }
+
+ this.initOptions = function() {
+ this.soundNotifOptions();
+ this.volumeControl();
+ this.keysSend();
+ this.locLang();
+ this.showPreviewOpt();
+ }
-function InitOptions() {
- soundNotifOptions();
- volumeControl();
- keysSend();
- setLang();
- setTheme();
- setShowPreviewOpt();
}
-function InitOptionsforHome() {
- setShowPreviewOpt();
-}
\ No newline at end of file
+
+jQuery.Options = new TwisterOptions;
\ No newline at end of file
diff --git a/js/twister_formatpost.js b/js/twister_formatpost.js
index 096b3ae..e70552e 100644
--- a/js/twister_formatpost.js
+++ b/js/twister_formatpost.js
@@ -107,15 +107,15 @@ function postToElem( post, kind ) {
var ytRegExp = /(?:https?:\/\/)?(?:www\.)?(?:youtu\.be\/|youtube\.com\/(?:embed\/|v\/|watch\?v=|watch\?.+&v=))((\w|-){11})(?:\S+)?/i;
var vimeoRegExp = /http[s]?:\/\/(www\.)?vimeo.com\/(\d+)($|\/)/i;
- if (postLink && localStorage['imagesPreview'] == 'enable' && (/(\.jpg)|(\.gif)|(\.png)|(\.jpeg)|(\.jpe)/i.test(postLink) || /https:\/\/img.bi/i.test(postLink))){
+ if (postLink && $.Options.getOption('imagesPreview', 'enable') === 'enable' && (/(\.jpg)|(\.gif)|(\.png)|(\.jpeg)|(\.jpe)/i.test(postLink) || /https:\/\/img.bi/i.test(postLink))){
previewContainer.show();
previewContainer.append(imagePreview(postLink));
- }else if(postLink && ytRegExp.test(postLink) && localStorage['youtubePreview'] === 'enable'){
+ }else if(postLink && ytRegExp.test(postLink) && $.Options.getOption('youtubePreview', 'enable') === 'enable'){
var ytid = postLink.match(ytRegExp) ? RegExp.$1 : false;
previewContainer.show();
previewContainer.attr('data-youtube-id', ytid);
previewContainer.append(getYoutubePreview(postLink, ytid));
- }else if(postLink && vimeoRegExp.test(postLink) && localStorage['vimeoPreview'] === 'enable'){
+ }else if(postLink && vimeoRegExp.test(postLink) && $.Options.getOptions('vimeoPreview', 'enable') === 'enable'){
var vimid = postLink.match(vimeoRegExp) ? RegExp.$2 : false;
previewContainer.show();
previewContainer.attr('data-vimeo-id', vimid);
@@ -314,8 +314,9 @@ function imagePreview(link) {
return '![]()
';
//imgBiJS();
}else{
- var cleanLink = link.replace(/^http[s]?:\/\//i, '');
- if(/\.gif\b/i.test(cleanLink) && localStorage['imagesPreviewGif'] == 'false') return;
+ var cleanLink;
+ if(/\.gif\b/i.test(cleanLink) && $.Options.getOption('imagesPreviewGif', 'true') === 'false') return;
+ cleanLink = link.replace(/^http[s]?:\/\//i, '');
return '
';
}
}
diff --git a/js/twister_newmsgs.js b/js/twister_newmsgs.js
index 5eb714f..c021187 100644
--- a/js/twister_newmsgs.js
+++ b/js/twister_newmsgs.js
@@ -18,17 +18,21 @@ function processMention(user, mentionTime, data) {
if( mentionTime > curTime + 3600 ) {
console.log("mention from the future will be ignored");
} else {
+ var newMentionsUpdated = false;
if( !(key in _knownMentions) ) {
- mensNotif(); // sound notification
// mention must be somewhat recent compared to last known one to be considered new
if( mentionTime + 3600 > _lastMentionTime ) {
_newMentions++;
+ newMentionsUpdated = true;
_lastMentionTime = mentionTime;
}
_knownMentions[key] = {mentionTime:mentionTime, data:data};
purgeOldMentions();
saveMentionsToStorage();
}
+ if(newMentionsUpdated){
+ $.MAL.soundNotifyMentions();
+ }
}
}
@@ -158,7 +162,7 @@ function getNewDMsCount() {
}
}
for (key in _newDMsPerUser){if(_newDMsPerUser[key] * 1)reslt = true};
- if(newDMs > 0 && reslt) DMsNotif(); //sound notification
+ if(newDMs > 0 && reslt) $.MAL.soundNotifyDM();
return newDMs;
}
diff --git a/login.html b/login.html
index 072a58f..e401fa5 100644
--- a/login.html
+++ b/login.html
@@ -11,6 +11,7 @@
+
@@ -19,7 +20,6 @@
-
+
@@ -33,8 +34,7 @@
-
-
-
-
-
-
-
+
diff --git a/options.html b/options.html
index e36e7f2..cb07fd9 100644
--- a/options.html
+++ b/options.html
@@ -11,6 +11,7 @@
+
@@ -20,17 +21,17 @@
-
-
-
-
-
-
-
+