From e96db6e7ac4fd1b0cfd79308e6ddb1c33249767a Mon Sep 17 00:00:00 2001
From: Michael Lazar <lazar.michael22@gmail.com>
Date: Mon, 31 Oct 2016 13:56:08 -0700
Subject: [PATCH] Making a few things more clear.

---
 rtv/content.py         | 10 +++++-----
 rtv/page.py            |  4 ++--
 rtv/submission_page.py |  4 ++--
 tests/test_content.py  |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/rtv/content.py b/rtv/content.py
index 5609716..d79ff64 100644
--- a/rtv/content.py
+++ b/rtv/content.py
@@ -340,15 +340,15 @@ class SubmissionContent(Content):
             data['split_title'] = self.wrap_text(data['title'], width=n_cols-2)
             data['split_text'] = self.wrap_text(data['text'], width=n_cols-2)
             data['n_rows'] = len(data['split_title'] + data['split_text']) + 5
-            data['offset'] = 0
+            data['h_offset'] = 0
 
         else:
             data = self._comment_data[index]
             indent_level = min(data['level'], self.max_indent_level)
-            data['offset'] = indent_level * self.indent_size
+            data['h_offset'] = indent_level * self.indent_size
 
             if data['type'] == 'Comment':
-                width = min(n_cols - data['offset'], self._max_comment_cols)
+                width = min(n_cols - data['h_offset'], self._max_comment_cols)
                 data['split_body'] = self.wrap_text(data['body'], width=width)
                 data['n_rows'] = len(data['split_body']) + 1
             else:
@@ -626,7 +626,7 @@ class SubredditContent(Content):
             data['split_title'] = data['split_title'][:self.max_title_rows-1]
             data['split_title'].append('(Not enough space to display)')
         data['n_rows'] = len(data['split_title']) + 3
-        data['offset'] = 0
+        data['h_offset'] = 0
 
         return data
 
@@ -700,6 +700,6 @@ class SubscriptionContent(Content):
         data = self._subscription_data[index]
         data['split_title'] = self.wrap_text(data['title'], width=n_cols)
         data['n_rows'] = len(data['split_title']) + 1
-        data['offset'] = 0
+        data['h_offset'] = 0
 
         return data
diff --git a/rtv/page.py b/rtv/page.py
index fbaf773..7e784c2 100644
--- a/rtv/page.py
+++ b/rtv/page.py
@@ -455,10 +455,10 @@ class Page(object):
                 subwin_n_rows = min(subwin_n_rows, top_item_height)
                 subwin_inverted = True
                 top_item_height = None
-            subwin_n_cols = win_n_cols - data['offset']
+            subwin_n_cols = win_n_cols - data['h_offset']
             start = current_row - subwin_n_rows + 1 if inverted else current_row
             subwindow = window.derwin(
-                subwin_n_rows, subwin_n_cols, start, data['offset'])
+                subwin_n_rows, subwin_n_cols, start, data['h_offset'])
             attr = self._draw_item(subwindow, data, subwin_inverted)
             self._subwindows.append((subwindow, attr))
             available_rows -= (subwin_n_rows + 1)  # Add one for the blank line
diff --git a/rtv/submission_page.py b/rtv/submission_page.py
index b64678c..3512088 100644
--- a/rtv/submission_page.py
+++ b/rtv/submission_page.py
@@ -162,9 +162,9 @@ class SubmissionPage(Page):
     @SubmissionController.register(Command('DELETE'))
     @logged_in
     def delete_comment(self):
-        "Delete a comment as long as it is not the current submission"
+        "Delete the selected comment"
 
-        if self.nav.absolute_index != -1:
+        if self.get_selected_item()['type'] == 'Comment':
             self.delete_item()
         else:
             self.term.flash()
diff --git a/tests/test_content.py b/tests/test_content.py
index 523c826..bf73065 100644
--- a/tests/test_content.py
+++ b/tests/test_content.py
@@ -178,7 +178,7 @@ def test_content_submission(reddit, terminal):
     assert content.get(40)['type'] == 'Comment'
 
     for data in content.iterate(-1, 1):
-        assert all(k in data for k in ('object', 'n_rows', 'offset', 'type',
+        assert all(k in data for k in ('object', 'n_rows', 'h_offset', 'type',
                                        'hidden'))
         # All text should be converted to unicode by this point
         for val in data.values():
@@ -278,7 +278,7 @@ def test_content_subreddit(reddit, terminal):
 
     for data in content.iterate(0, 1):
         assert all(k in data for k in (
-            'object', 'n_rows', 'offset', 'type', 'index', 'title',
+            'object', 'n_rows', 'h_offset', 'type', 'index', 'title',
             'split_title', 'hidden'))
         # All text should be converted to unicode by this point
         for val in data.values():
@@ -300,7 +300,7 @@ def test_content_subreddit_load_more(reddit, terminal):
     assert content.range == (0, 50)
 
     for i, data in enumerate(islice(content.iterate(0, 1), 0, 50)):
-        assert all(k in data for k in ('object', 'n_rows', 'offset', 'type',
+        assert all(k in data for k in ('object', 'n_rows', 'h_offset', 'type',
                                        'index', 'title', 'split_title'))
         # All text should be converted to unicode by this point
         for val in data.values():
@@ -424,7 +424,7 @@ def test_content_subscription(reddit, terminal):
 
     # Validate content
     for data in islice(content.iterate(0, 1), 20):
-        assert all(k in data for k in ('object', 'n_rows', 'offset', 'type',
+        assert all(k in data for k in ('object', 'n_rows', 'h_offset', 'type',
                                        'title', 'split_title'))
         # All text should be converted to unicode by this point
         for val in data.values():