Merge pull request #295 from slr/tasty-fixes-13

#letsfixeverythin

AUTHORS

@@ -11,7 +11,7 @@ Msjoinder
     Polyglot support (internationalization), multiple fixes
 
 erkan yüksel
-    Image preview, automatic unicode conversion, split long posts, hiding posts with mentions and more.
+    Image preview, automatic unicode conversion, split long posts, hiding posts with mentions, retwists with comment and more.
 
 Hedgehog
     Calm theme, CSS + artwork and more.
@@ -38,5 +38,5 @@ Julian Steinwachs
     UI navigation overhaul with proper browser's back button support
 
 Сёма Мрачный
-    Desktop notifications, language filtering, ~markdown, ton of fixes.
+    Desktop notifications, language filtering, twistday observation, Markout markup, post preview, retwists with comment, ton of fixes.
 

css/style.css

@@ -652,6 +652,7 @@ textarea.splited-post {
     background-color: #F2FFBA;
     border: solid 1px #B4C669;
     font-size: 11px;
+    line-height: normal;
     margin: 4px 0;
     padding: 4px;
     word-wrap: break-word;
@@ -1294,10 +1295,7 @@ ol.toptrends-list {
     font-size: 13px;
     list-style: circle;
 }
-.network.singleBlock button
+
-{
-    padding: 3px 10px;
-}
 .network.singleBlock ul li > span
 {
     font-weight: bold;
@@ -1335,10 +1333,9 @@ ol.toptrends-list {
 {
     border: 2px solid green;
 }
-.character-limit
+
-{
+.network .post-area-extras {
-    float: right;
+    margin-right: 20px;
-    margin-right: 18px;
 }
 
 /*************************************

js/options.js

@@ -377,13 +377,7 @@ function tickOptionsPostPreview() {
 
     if ($.Options.displayPreview.val === 'enable') {
         imgPreviewCont.empty();
-        var links = elem.children().first().find('a[rel="nofollow"]');
+        setPostImagePreview(elem, elem.children().first().find('a'));
-        if (links.length) {
-            setPostImagePreview(elem, links);
-            imgPreviewCont.show();
-        } else {
-            imgPreviewCont.hide();
-        }
     } else {
         imgPreviewCont.hide();
     }

js/twister_formatpost.js

@@ -402,14 +402,19 @@ function htmlFormatMsg(msg) {
 
                 if (i !== 0) {
                     l = kindOfL(i - 1);
+                } else {
+                    l = 0;
                 }
                 if (j !== msg.str.length) {
                     r = kindOfR(j);
+                } else {
+                    r = 0;
                 }
-                if (i === 0 || l === -10) {
+
+                if ((i === 0 && r < 0) || l === -10) {
                     p.push({i: i, k: j - i, t: -1, w: w, a: -1, p: -1});
                     w = false;
-                } else if (j === msg.str.length || r === -10) {
+                } else if ((j === msg.str.length && l < 0) || r === -10) {
                     p.push({i: i, k: j - i, t: 1, w: w, a: -1, p: -1});
                     w = false;
                 } else {
@@ -807,5 +812,9 @@ function setPostImagePreview(elem, links) {
                 }
             }
         }
+        if (previewContainer.children().length)
+            previewContainer.show();
+        else
+            previewContainer.hide();
     }
 }

js/twister_network.js

@@ -244,17 +244,20 @@ function getSpamMsg() {
                }, {});
 }
 
-function setSpamMsg() {
+function setSpamMsg(event) {
-    var $postArea = $(".spam-msg");
+    event.stopPropagation();
-    var $localUsersList = $("select.local-usernames.spam-user");
+    event.preventDefault();
-    var params = [$localUsersList.val(), $postArea.val()]
+
+    var btnUpdate = $(event.target);
+    $.MAL.disableButton(btnUpdate);
+
+    var params = [$("select.local-usernames.spam-user").val(),
+        btnUpdate.closest('.post-area-new').find('textarea.spam-msg').val().trim()];
+
     twisterRpc("setspammsg", params,
-               function(args, ret) {
+        function(args, ret) {console.log("setspammsg updated");}, {},
-                   console.log("setspammsg updated");
+        function(args, ret) {console.log("setspammsg error");}, {}
-               }, {},
+    );
-               function(args, ret) {
-                   console.log("setspammsg error");
-               }, {});
 }
 
 function exitDaemon() {
@@ -286,7 +289,9 @@ function interfaceNetworkHandlers() {
     $( ".add-dns").bind( "click", addDNSClick );
     $( "select.genblock").change( setGenerate );
     $( ".genproclimit").change( setGenerate );
-    $( ".update-spam-msg").bind( "click", setSpamMsg );
+    $('.network .post-area-new').off('click').on('click',
+        function (e) {e.stopPropagation(); $(this).addClass('open'); usePostSpliting = false;});
+    $('.post-submit.update-spam-msg').off('click').on('click', setSpamMsg);
     $( ".terminate-daemon").bind( "click", exitDaemon )
 }
 

network.html

@@ -191,17 +191,22 @@
           </li>
           <li>
               <label> Post to promote: </label>
-              <textarea class="spam-msg" placeholder="Type message here"></textarea>
+            <div class="post-area">
+              <form class="post-area-new open">
+                <textarea class="spam-msg" placeholder="Type message here"></textarea>
+                <div class="post-area-extras">
+                  <span class="post-area-remaining">140</span>
+                  <button class="undo-unicode disabled" disabled="true">undo</button>
+                  <button class="post-submit update-spam-msg disabled" disabled="true">Update</button>
+                </div>
+              </form>
+            </div>
           </li>
           <li>
               <label> Send post with username </label>
               <select class="local-usernames spam-user">
                   <option value="nobody">nobody</option>
               </select>
-              <div class="character-limit">
-                <span class="post-area-remaining">140</span>
-                <button class="update-spam-msg enabled">Update</button>
-              </div>
           </li>
         </ul>
 
@@ -218,6 +223,20 @@
 
   </div>
 
+  <div id="templates" style="display:none;">
+    <div id="post-preview-template">
+        <div id="post-preview" class="post-text">
+        </div>
+    </div>
+
+    <!-- template for user links in message (open profile modal) -->
+    <a id="msg-user-link-template" class="open-profile-modal"></a>
+    <!-- template for user links in message (open profile modal) -->
+    <a id="external-page-link-template" rel="nofollow" target="_blank"></a>
+    <!-- template for user links in message (open profile modal) -->
+    <a id="hashtag-link-template" class="open-hashtag-modal"></a>
+  </div>
+
   <audio id="player"></audio>
   <audio id="playerSec"></audio>
   </body>

options.html

@@ -99,9 +99,6 @@
                   <option value="nin">Nin</option>
                 </select>
               </form>
-              <span class="label selectable_theme theme_calm">
-                For new features check <a href="https://github.com/iHedgehog/twister-calm">twister-calm repository</a>!
-              </span>
             </div>
           </div>
         </div>

theme_calm/css/style.css

@@ -781,6 +781,7 @@ textarea.splited-post {
     background-color: #F2FFBA;
     border: solid 1px #B4C669;
     font-size: 11px;
+    line-height: normal;
     margin: 4px 0;
     padding: 4px;
     word-wrap: break-word;
@@ -1659,10 +1660,7 @@ textarea.splited-post {
     font-size: 13px;
     list-style: circle;
 }
-.network.singleBlock button
+
-{
-    padding: 3px 10px;
-}
 .network.singleBlock ul li > span
 {
     font-weight: bold;
@@ -1699,10 +1697,9 @@ textarea.splited-post {
 {
     border: 2px solid #b2d67b;
 }
-.character-limit
+
-{
+.network .post-area-extras {
-    float: right;
+    margin-right: 20px;
-    margin-right: 18px;
 }
 
 /*************************************

theme_nin/css/style.css

@@ -1501,10 +1501,8 @@ span.connection-status.connected:before {
   background: #B4C669;
 }
 
-/* line 61, ../sass/_network.sass */
+.network .post-area-extras {
-.character-limit {
+    margin-right: 20px;
-  float: right;
-  margin-right: 18px;
 }
 
 /* line 65, ../sass/_network.sass */
@@ -2275,6 +2273,7 @@ textarea.splited-post {
     background-color: #FCFFF3;
     border: solid 1px #ECEFE3;
     font-size: 12px;
+    line-height: normal;
     margin: 4px 0;
     padding: 4px;
     word-wrap: break-word;

theme_nin/sass/_network.sass

@@ -58,9 +58,8 @@ span.connection-status
   &.connected:before
     background: $main-color-color
 
-.character-limit
+.network .post-area-extras
-  float: right
+  margin-right: 20px
-  margin-right: 18px
 
 .connections span, .known-peers, .dht-nodes, .blocks, .last-block-time, .mining-difficulty
   color: #333

theme_nin/sass/style.sass

@@ -358,6 +358,7 @@ ul.userMenu-search-profiles
   background-color: #FCFFF3
   border: solid 1px #ECEFE3
   font-size: 12px
+  line-height: normal
   margin: 4px 0
   padding: 4px
   word-wrap: break-word