Merge branch 'master' of https://github.com/miguelfreitas/twister-html into visual_fixes

11 years ago · 30e6aeb576
9 changed files with 19 additions and 2 deletions
--- a/following.html
+++ b/following.html
@ -27,6 +27,8 @@
				@@ -27,6 +27,8 @@
           initInterfaceFollowing();
        });
    </script>
+
+    <link rel="icon" type="image/png" href="img/twister_mini.png" />
  </head>

  <body>
--- a/home.html
+++ b/home.html
@ -22,6 +22,8 @@
				@@ -22,6 +22,8 @@
    <script src="twister_directmsg.js"></script>
    <script src="interface_common.js"></script>
    <script src="interface_home.js"></script>
+
+    <link rel="icon" type="image/png" href="img/twister_mini.png" />
  </head>

  <body>
--- a/index.html
+++ b/index.html
@ -23,7 +23,7 @@
				@@ -23,7 +23,7 @@
  </script>
  <script src="jquery.mobile-1.3.2.min.js"></script>

-
+  <link rel="icon" type="image/png" href="img/twister_mini.png" />
 </head> 
 <body> 

--- a/interface_common.js
+++ b/interface_common.js
@ -447,7 +447,7 @@ var retweetSubmit = function(e)
				@@ -447,7 +447,7 @@ var retweetSubmit = function(e)


 function initInterfaceCommon() {
-    $( "body, .cancel, .modal-blackout" ).on( "click", function() { closeModal($(this)); } );
+    $( "body" ).on( "click", ".cancel" , function() { closeModal($(this)); } );
    $( ".post-reply" ).bind( "click", postReplyClick );
    $( ".post-propagate" ).bind( "click", reTwistPopup );
    $( ".userMenu-config-dropdown" ).bind( "click", dropDownMenu );
--- a/login.html
+++ b/login.html
@ -22,6 +22,8 @@
				@@ -22,6 +22,8 @@
           initInterfaceLogin();
        });
    </script>
+
+    <link rel="icon" type="image/png" href="img/twister_mini.png" />
  </head>

  <body>
--- a/network.html
+++ b/network.html
@ -24,6 +24,8 @@
				@@ -24,6 +24,8 @@
           initInterfaceNetwork();
        });
    </script>
+
+    <link rel="icon" type="image/png" href="img/twister_mini.png" />
  </head>

  <body>
--- a/profile-edit.html
+++ b/profile-edit.html
@ -24,6 +24,8 @@
				@@ -24,6 +24,8 @@
           initProfileEdit();
        });
    </script>
+
+    <link rel="icon" type="image/png" href="img/twister_mini.png" />
  </head>

  <body>
--- a/tmobile.html
+++ b/tmobile.html
@ -40,6 +40,8 @@
				@@ -40,6 +40,8 @@
    <script src="interface_common.js?vr=9"></script>
    <script src="tmobile.js?vr=9"></script>
    <script src="jpeg_encoder_basic.js"></script>
+
+  <link rel="icon" type="image/png" href="img/twister_mini.png" />
 </head> 
 <body> 

--- a/twister_following.js
+++ b/twister_following.js
@ -355,6 +355,11 @@ function closeSearchDialog()
				@@ -355,6 +355,11 @@ function closeSearchDialog()

 function userSearchKeypress(item) {
    var partialName = $(".userMenu-search-field").val().toLowerCase();
+
+    if ( partialName.substr( 0, 1 ) == '@' ) {
+        partialName = partialName.substr( 1 );
+    }
+
    //var partialName = item.val();

    if( !partialName.length ) {