Added option to open Feeds in background tab.

Added ability to set custom popup width.
olsh · Aug 3, 2014 · e96b2d6 · e96b2d6
1 parent 6d86e2b
commit e96b2d6
Show file tree

Hide file tree

Showing 11 changed files with 105 additions and 14 deletions.
diff --git a/src/_locales/cs/messages.json b/src/_locales/cs/messages.json
@@ -17,6 +17,9 @@
     "EnableBackgroundMode": {
         "message": "Povolit background mód"
     },
+    "ExpandedPopupWidth": {
+        "message": "Expanded popup width"
+    },
     "ExpandFeeds": {
         "message": "Expand all feeds when popup is opened"
     },
@@ -89,6 +92,9 @@
     "OpenAllFeeds": {
         "message": "Otevřít vše"
     },
+    "OpenFeedsInBackground": {
+        "message": "Open feeds in background tab"
+    },
     "OpenFeedsInSameTab": {
         "message": "Open feeds in the same tab"
     },
@@ -104,6 +110,9 @@
     "PopupFontSize": {
         "message": "Velikost písma v pop-upu"
     },
+    "PopupWidth": {
+        "message": "Popup width"
+    },
     "ResetCounterOnClick": {
         "message": "Vynulovat počitadlo po otevření"
     },

diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
@@ -17,6 +17,9 @@
     "EnableBackgroundMode": {
         "message": "Enable background mode"
     },
+    "ExpandedPopupWidth": {
+        "message": "Expanded popup width"
+    },
     "ExpandFeeds": {
         "message": "Expand all feeds when popup is opened"
     },
@@ -83,6 +86,9 @@
     "OpenAllFeeds": {
         "message": "Open all feeds"
     },
+    "OpenFeedsInBackground": {
+        "message": "Open feeds in background tab"
+    },
     "OpenFeedsInSameTab": {
         "message": "Open feeds in the same tab"
     },
@@ -98,6 +104,9 @@
     "PopupFontSize": {
         "message": "Popup font size in percent"
     },
+    "PopupWidth": {
+        "message": "Popup width"
+    },
     "ResetCounterOnClick": {
         "message": "Reset counter when extension button clicked"
     },

diff --git a/src/_locales/fr/messages.json b/src/_locales/fr/messages.json
@@ -17,6 +17,9 @@
     "EnableBackgroundMode": {
         "message": "Enable background mode"
     },
+    "ExpandedPopupWidth": {
+        "message": "Expanded popup width"
+    },
     "ExpandFeeds": {
         "message": "Expand all feeds when popup is opened"
     },
@@ -83,6 +86,9 @@
     "OpenAllFeeds": {
         "message": "Open all feeds"
     },
+    "OpenFeedsInBackground": {
+        "message": "Open feeds in background tab"
+    },
     "OpenFeedsInSameTab": {
         "message": "Open feeds in the same tab"
     },
@@ -98,6 +104,9 @@
     "PopupFontSize": {
         "message": "Popup font size in percent"
     },
+    "PopupWidth": {
+        "message": "Popup width"
+    },
     "ResetCounterOnClick": {
         "message": "Reset counter when extension button clicked"
     },

diff --git a/src/_locales/it/messages.json b/src/_locales/it/messages.json
@@ -17,6 +17,9 @@
     "EnableBackgroundMode": {
         "message": "Enable background mode"
     },
+    "ExpandedPopupWidth": {
+        "message": "Expanded popup width"
+    },
     "ExpandFeeds": {
         "message": "Expand all feeds when popup is opened"
     },
@@ -83,6 +86,9 @@
     "OpenAllFeeds": {
         "message": "Apri tutti i feed"
     },
+    "OpenFeedsInBackground": {
+        "message": "Open feeds in background tab"
+    },
     "OpenFeedsInSameTab": {
         "message": "Open feeds in the same tab"
     },
@@ -98,6 +104,9 @@
     "PopupFontSize": {
         "message": "Popup font size in percent"
     },
+    "PopupWidth": {
+        "message": "Popup width"
+    },
     "ResetCounterOnClick": {
         "message": "Reset counter when extension button clicked"
     },

diff --git a/src/_locales/pt_BR/messages.json b/src/_locales/pt_BR/messages.json
@@ -17,6 +17,9 @@
     "EnableBackgroundMode": {
         "message": "Enable background mode"
     },
+    "ExpandedPopupWidth": {
+        "message": "Expanded popup width"
+    },
     "ExpandFeeds": {
         "message": "Expand all feeds when popup is opened"
     },
@@ -83,6 +86,9 @@
     "OpenAllFeeds": {
         "message": "Open all feeds"
     },
+    "OpenFeedsInBackground": {
+        "message": "Open feeds in background tab"
+    },
     "OpenFeedsInSameTab": {
         "message": "Open feeds in the same tab"
     },
@@ -98,6 +104,9 @@
     "PopupFontSize": {
         "message": "Popup font size in percent"
     },
+    "PopupWidth": {
+        "message": "Popup width"
+    },
     "ResetCounterOnClick": {
         "message": "Reset counter when extension button clicked"
     },

diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json
@@ -17,6 +17,9 @@
     "EnableBackgroundMode": {
         "message": "Включить фоновый режим"
     },
+    "ExpandedPopupWidth": {
+        "message": "Ширина всплывающего окна в раскрытом режиме"
+    },
     "ExpandFeeds": {
         "message": "Раскрывать все новости при открытии всплывающего окна"
     },
@@ -83,6 +86,9 @@
     "OpenAllFeeds": {
         "message": "Открыть все новости"
     },
+    "OpenFeedsInBackground": {
+        "message": "Открывать новости в фоновой вкладке"
+    },
     "OpenFeedsInSameTab": {
         "message": "Открывать новости в одной вкладке"
     },
@@ -98,6 +104,9 @@
     "PopupFontSize": {
         "message": "Размер шрифта во всплывающем окне в процентах"
     },
+    "PopupWidth": {
+        "message": "Ширина всплывающего окна"
+    },
     "ResetCounterOnClick": {
         "message": "Сбрасывать счетчик при нажатии на иконку расширения"
     },

diff --git a/src/manifest.json b/src/manifest.json
@@ -32,5 +32,5 @@
     "web_accessible_resources": [
         "/images/icon128.png"
     ],
-    "minimum_chrome_version": "22"
+    "minimum_chrome_version": "26"
 }
diff --git a/src/options.html b/src/options.html
@@ -45,6 +45,9 @@ <h3 data-locale-value="Popup"></h3>
                 <span class="label" data-locale-value="OpenSiteOnIconClick"></span>
                 <input type="checkbox" data-option-name="openSiteOnIconClick" /><br>
 
+                <span class="label" data-locale-value="OpenFeedsInBackground"></span>
+                <input type="checkbox" data-disable-parent="openSiteOnIconClick" data-option-name="openFeedsInBackground" /><br>
+
                 <span class="label" data-locale-value="AbilitySaveFeeds"></span>
                 <input type="checkbox" data-disable-parent="openSiteOnIconClick" data-option-name="abilitySaveFeeds" /><br>
 
@@ -57,6 +60,12 @@ <h3 data-locale-value="Popup"></h3>
                 <span class="label" data-locale-value="PopupFontSize"></span>
                 <input type="number" data-disable-parent="openSiteOnIconClick" min="70" max="150" data-option-name="popupFontSize" /><br>
 
+                <span class="label" data-locale-value="PopupWidth"></span>
+                <input type="number" data-disable-parent="openSiteOnIconClick" min="380" max="750" data-option-name="popupWidth" /><br>
+
+                <span class="label" data-locale-value="ExpandedPopupWidth"></span>
+                <input type="number" data-disable-parent="openSiteOnIconClick" min="380" max="750" data-option-name="expandedPopupWidth" /><br>
+
                 <span class="label" data-locale-value="ShowFullFeedContent"></span>
                 <input type="checkbox" data-disable-parent="openSiteOnIconClick" data-option-name="showFullFeedContent" /><br>
 

diff --git a/src/scripts/core.js b/src/scripts/core.js
@@ -10,6 +10,9 @@ var appGlobal = {
     },
     options: {
         _updateInterval: 10, //minutes
+        _popupWidth: 380,
+        _expandedPopupWidth: 650,
+
         markReadOnClick: true,
         accessToken: "",
         refreshToken: "",
@@ -26,18 +29,48 @@ var appGlobal = {
         expandFeeds: false,
         isFiltersEnabled: false,
         openFeedsInSameTab: false,
+        openFeedsInBackground: true,
         filters: [],
         showCounter: true,
         oldestFeedsFirst: false,
         resetCounterOnClick: false,
         popupFontSize: 100, //percent
         showCategories: false,
+
         get updateInterval(){
             var minimumInterval = 10;
             return this._updateInterval >= minimumInterval ? this._updateInterval : minimumInterval;
         },
         set updateInterval(value) {
             return this._updateInterval = value;
+        },
+        get popupWidth() {
+            var maxValue = 750;
+            var minValue = 380;
+            if (this._popupWidth > maxValue ) {
+                return maxValue;
+            }
+            if (this._popupWidth < minValue){
+                return minValue;
+            }
+            return this._popupWidth;
+        },
+        set popupWidth(value) {
+            this._popupWidth = value;
+        },
+        get expandedPopupWidth() {
+            var maxValue = 750;
+            var minValue = 380;
+            if (this._expandedPopupWidth > maxValue ) {
+                return maxValue;
+            }
+            if (this._expandedPopupWidth < minValue){
+                return minValue;
+            }
+            return this._expandedPopupWidth;
+        },
+        set expandedPopupWidth(value) {
+            this._expandedPopupWidth = value;
         }
     },
     //Names of options after changes of which scheduler will be initialized

diff --git a/src/scripts/popup.js b/src/scripts/popup.js
@@ -19,6 +19,8 @@ $(document).ready(function () {
         $("#popup-content").addClass("tabs");
     }
 
+    setPopupExpand(false);
+
     //If we support this localization of timeago, then insert script with it
     if (popupGlobal.supportedTimeAgoLocales.indexOf(window.navigator.language) !== -1) {
         //Trying load localization for jQuery.timeago
@@ -38,7 +40,7 @@ $("#login").click(function () {
 $("#feed, #feed-saved").on("mousedown", "a", function (event) {
     var link = $(this);
     if (event.which === 1 || event.which === 2) {
-        var isActiveTab = !(event.ctrlKey || event.which === 2);
+        var isActiveTab = !(event.ctrlKey || event.which === 2) && !popupGlobal.backgroundPage.appGlobal.options.openFeedsInBackground;
         var isFeed = link.hasClass("title") && $("#feed").is(":visible");
         var url = link.data("link");
 
@@ -321,11 +323,8 @@ function showSavedFeeds() {
 
 function setPopupExpand(isExpand){
     if (isExpand){
-        $(".item").css("width", "700px");
-        $(".article-title, .blog-title").css("width", $("#popup-content").hasClass("tabs") ? "645px" : "660px");
+        $("#feed, #feed-saved").width(popupGlobal.backgroundPage.appGlobal.options.expandedPopupWidth);
     } else {
-        var popupContent = $("#popup-content");
-        $(".item").css("width", popupContent.hasClass("tabs") ? "380px" : "350px");
-        $(".article-title, .blog-title").css("width", popupContent.hasClass("tabs") ? "325px" : "310px");
+        $("#feed, #feed-saved").width(popupGlobal.backgroundPage.appGlobal.options.popupWidth);
     }
 }
diff --git a/src/styles/style.css b/src/styles/style.css
@@ -69,7 +69,7 @@
 }
 
 .item {
-    width: 350px;
+    width: 100%;
     padding: 2px 0 2px 0;
 }
 
@@ -82,10 +82,6 @@
     border-bottom: solid #d2d2d2 1px;
 }
 
-.tabs .item {
-    width: 380px;
-}
-
 .item .content {
     font-size: 1em;
     display: none;
@@ -133,12 +129,12 @@
 
 .article-title,
 .blog-title {
-    width: 310px;
+    width: calc(100% - 45px);
 }
 
 .tabs .article-title,
 .tabs .blog-title {
-    width: 325px;
+    width: calc(100% - 55px);
 }
 
 .article-menu {