twisterarmy/twister-html
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-html.git synced 2025-02-04 11:04:29 +00:00
Code Issues Projects Releases Wiki Activity

merge more calm code into interface_common.js so we may remove dependency on calm.js

Browse Source
This commit is contained in:
Miguel Freitas 2014-04-10 18:57:49 -03:00
parent 2f3321bb21
commit bcc51d9613
8 changed files with 60 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
following.html
View File

@ -23,7 +23,6 @@
<script src="js/twister_directmsg.js"></script>
<script src="js/twister_actions.js"></script>
<script src="js/interface_common.js"></script>
<script src="js/calm.js"></script>
<script>
$(document).ready(function()

1
home.html
View File

@ -26,7 +26,6 @@
<script src="js/interface_common.js"></script>
<script src="js/interface_home.js"></script>
<script src="js/jquery.textcomplete.js"></script>
<script src="js/calm.js"></script>
<script>
$(function(){setTimeout(mensAutocomplete, 800);})
changeStyle();

65
js/calm.js
View File

@ -1,11 +1,4 @@
$(function(){
$('.dropdown-menu').on('keydown', function(e){
e = event || window.event;
e.stopPropagation();
})
$('.post-text').on('click', 'a', function(e){
e.stopPropagation();
});
$('#showqr').on('click', function(){
if($('#qrcode img')[0]) return;
var skey = document.getElementById('skey').innerText;
@ -36,65 +29,7 @@ $(function(){
setTimeout(dhtIndicatorBg, 300);
setTimeout(function() {setInterval(dhtIndicatorBg, 2000)}, 400);
function modalDMIntr() {
$(".cancel").on('click', function(event){
if(!$(event.target).hasClass("cancel")) return;
if($(".modal-content").attr("style") != undefined){$(".modal-content").removeAttr("style")};
$('.modal-back').css('display', 'none');
});
$('.modal-back').on('click', function(){
if($('.modal-content .direct-messages-list')[0]) return;
directMessagesPopup();
$(".modal-content").removeAttr("style");
});
};
function mensAutocomplete() {
var suggests = [];
for(var i = 0; i < followingUsers.length; i++){
if(followingUsers[i] == localStorage.defaultScreenName) continue;
suggests.push(followingUsers[i]);
}
suggests.reverse();
$('textarea').textcomplete([
{ // html
mentions: suggests,
match: /\B@(\w*)$/,
search: function (term, callback) {
callback($.map(this.mentions, function (mention) {
return mention.indexOf(term) === 0 ? mention : null;
}));
},
index: 1,
replace: function (mention) {
return '@' + mention + ' ';
}
}
])
}
function changeStyle() {
var style, profile, menu;
var theme = $.Options.getTheme();
if(theme == 'original')
{
style = 'css/style.css';
profile = 'css/profile.css';
menu = '.original_menu';
$(".userMenu-dhtindicator").hide();
}else
{
style = 'theme_calm/css/style.css';
profile = 'theme_calm/css/profile.css';
menu = '.calm_menu';
}
$('#stylecss').attr('href', style);
$('#profilecss').attr('href', profile);
setTimeout(function(){$(menu).removeAttr('style')}, 0);
}
function homeIntInit () {
modalDMIntr ();
setTimeout(mensAutocomplete, 800);
}

60
js/interface_common.js
View File

@ -974,12 +974,72 @@ var retweetSubmit = function(e)
closeModal($this);
}
function changeStyle() {
var style, profile, menu;
var theme = $.Options.getTheme();
if(theme == 'original')
{
style = 'css/style.css';
profile = 'css/profile.css';
menu = '.original_menu';
$(".userMenu-dhtindicator").hide();
}else
{
style = 'theme_calm/css/style.css';
profile = 'theme_calm/css/profile.css';
menu = '.calm_menu';
}
$('#stylecss').attr('href', style);
$('#profilecss').attr('href', profile);
setTimeout(function(){$(menu).removeAttr('style')}, 0);
}
function mensAutocomplete() {
var suggests = [];
for(var i = 0; i < followingUsers.length; i++){
if(followingUsers[i] == localStorage.defaultScreenName) continue;
suggests.push(followingUsers[i]);
}
suggests.reverse();
$('textarea').textcomplete([
{ // html
mentions: suggests,
match: /\B@(\w*)$/,
search: function (term, callback) {
callback($.map(this.mentions, function (mention) {
return mention.indexOf(term) === 0 ? mention : null;
}));
},
index: 1,
replace: function (mention) {
return '@' + mention + ' ';
}
}
])
}
function initInterfaceCommon() {
$( "body" ).on( "click", function(event) {
if($(event.target).hasClass('cancel')) closeModal($(this));
});
$(".cancel").on('click', function(event){
if(!$(event.target).hasClass("cancel")) return;
if($(".modal-content").attr("style") != undefined){$(".modal-content").removeAttr("style")};
$('.modal-back').css('display', 'none');
});
$('.modal-back').on('click', function(){
if($('.modal-content .direct-messages-list')[0]) return;
directMessagesPopup();
$(".modal-content").removeAttr("style");
});
$('.dropdown-menu').on('keydown', function(e){
e = event || window.event;
e.stopPropagation();
})
$('.post-text').on('click', 'a', function(e){
e.stopPropagation();
});
$( ".post-reply" ).bind( "click", postReplyClick );
$( ".post-propagate" ).bind( "click", reTwistPopup );
$( ".userMenu-config-dropdown" ).bind( "click", dropDownMenu );

1
login.html
View File

@ -18,7 +18,6 @@
<script src="js/interface_login.js"></script>
<script src="js/polyglot.min.js"></script>
<script src="js/interface_localization.js"></script>
<script src="js/calm.js"></script>
<script>
$(document).ready(function()

1
network.html
View File

@ -20,7 +20,6 @@
<script src="js/interface_localization.js"></script>
<script src="js/twister_network.js"></script>
<script src="js/interface_common.js"></script>
<script src="js/calm.js"></script>
<script>
$(document).ready(function()

1
options.html
View File

@ -18,7 +18,6 @@
<script src="js/interface_login.js"></script>
<script src="js/polyglot.min.js"></script>
<script src="js/interface_localization.js"></script>
<script src="js/calm.js"></script>
<script>$(function(){
initInterfaceCommon();
$.Options.InitOptions();})

1
profile-edit.html
View File

@ -20,7 +20,6 @@
<script src="js/twister_newmsgs.js"></script>
<script src="js/interface_common.js"></script>
<script src="js/interface_profile-edit.js"></script>
<script src="js/calm.js"></script>
<script>
$(document).ready(function()