Skip to content

Commit

Permalink
Added private browsing permission
Browse files Browse the repository at this point in the history
Fixed support popup typo
Minor fixes to clear AMO full review
  • Loading branch information
CptFoobar committed Feb 15, 2016
1 parent 9a67c56 commit b16aae3
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 39 deletions.
22 changes: 11 additions & 11 deletions data/markup/help.html
Expand Up @@ -18,7 +18,7 @@
</div>
<div class="media">
<div class="media-left media-middle">
<img class="media-object" src="resource://blink/data/img/blink_options_zoom.png" style="width: 200px; height: auto">
<img class="media-object" src="resource://blink/data/img/blink_options_zoom.png" style="width: 200px; height: auto" />
</div>
<div class="media-body">
<br /> The Content section allows you to manage your feed sources and choose where you feed comes from. From here you can select your favorite rss feeds and blogs indexed by
Expand All @@ -32,7 +32,7 @@
<span class="help-body-title" id="addContent">
Add Content Sources
</span>
<hr class="help-panel-divider"> You can add content to your feed with the following steps:
<hr class="help-panel-divider" /> You can add content to your feed with the following steps:
<ol>
<li>
Click the Add Content button (<i class="fa fa-plus fa-fw"></i>) on the bottom-right of the Content page.
Expand All @@ -44,12 +44,12 @@
When you find something you like, just click it or hit enter after selecting it.
</li>
</ol>
<img style="margin: 0px auto; width: 400px; height: auto" src="resource://blink/data/img/blink_add_content.png" class="media-object">
<img style="margin: 0px auto; width: 400px; height: auto" src="resource://blink/data/img/blink_add_content.png" class="media-object" />
<br />
<span class="help-body-title" id="removeContent">
Remove Content sources
</span>
<hr class="help-panel-divider"> If you no longer wish to see content from a particular feed source, you can remove it from Blink with these steps:
<hr class="help-panel-divider" /> If you no longer wish to see content from a particular feed source, you can remove it from Blink with these steps:
<ol>
<li>
First, locate the feed source you want to remove in the content list.
Expand All @@ -66,7 +66,7 @@
<span class="help-body-title" id="disableContent">
Disable Content sources
</span>
<hr class="help-panel-divider"> If you wish to temporarily disable feed from a particular source, without actually removing it from your list, you can do so in the following way:
<hr class="help-panel-divider" /> If you wish to temporarily disable feed from a particular source, without actually removing it from your list, you can do so in the following way:
<ol>
<li>
First, locate the feed source you want to disable in the content list.
Expand All @@ -89,7 +89,7 @@
</div>
<div class="media">
<div class="media-left media-middle">
<img class="media-object" src="resource://blink/data/img/blink_options_zoom.png" style="width: 200px; height: auto">
<img class="media-object" src="resource://blink/data/img/blink_options_zoom.png" style="width: 200px; height: auto" />
</div>
<div class="media-body">
<br />
Expand All @@ -103,21 +103,21 @@
<span class="help-body-title" id="username">
Changing Username
</span>
<hr class="help-panel-divider">
<hr class="help-panel-divider" />
<p>
To change the User name shown in the Greeting message, change the Greeting Name field in the Settings section.
</p>
<span class="help-body-title" id="greeting">
Disable Home screen greeting
</span>
<hr class="help-panel-divider">
<hr class="help-panel-divider" />
<p>
You can also disable the greeting message on the home screen by unchecking the 'Show Greeting' option in the settings.
</p>
<span class="help-body-title" id="feedRatio">
Feed content ratio
</span>
<hr class="help-panel-divider"> Blink gives you the option to choose the type of feed you want to see. You can choose from three modes,
<hr class="help-panel-divider" /> Blink gives you the option to choose the type of feed you want to see. You can choose from three modes,
<code>Latest</code>,
<code>Balanced</code> and
<code>Trending</code>.
Expand All @@ -132,8 +132,8 @@
<br />
<div class="alert alert-info">
<p>
<i class="fa fa-exclamation-circle fa-fw"></i> Don't forget to save your settings by clicking the Save button (&nbsp;
<i class="fa fa-floppy-o fa-fw"></i>&nbsp;) on the bottom-right.
<i class="fa fa-exclamation-circle fa-fw"></i> Don't forget to save your settings by clicking the Save button (
<i class="fa fa-floppy-o fa-fw" style="padding: 0 3px 0 3px;"></i>) on the bottom-right.
</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion data/markup/home.html
@@ -1,4 +1,4 @@
<div class="container" ng-cloak>
<div class="container ng-cloak">
<div class="space"></div>
<div class="space"></div>
<div class="space"></div>
Expand Down
2 changes: 1 addition & 1 deletion data/markup/showYourLove.html
@@ -1,6 +1,6 @@
<div class="modal-header text-center">
<span class="modal-title delete-confirm-title">
<i class="fa fa-heart fa-fw" style="color: #f7403a"></i> &nbsp; Show you love &nbsp;
<i class="fa fa-heart fa-fw" style="color: #f7403a"></i> &nbsp; Show your love &nbsp;
<i class="fa fa-heart fa-fw" style="color: #f7403a"></i>
</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion data/markup/suggestedSource.html
@@ -1,7 +1,7 @@
<a>
<div class="media">
<div class="media-left">
<img class="media-object" ng-src="{{match.model.visualUrl}}" style=" width: 64px; padding-top: 2px">
<img class="media-object" ng-src="{{match.model.visualUrl}}" style=" width: 64px; padding-top: 2px" />
</div>
<div class="media-body" style="cursor: pointer;">
<span class="media-heading suggestion-title">{{ match.model.title }}</span><br />
Expand Down
5 changes: 4 additions & 1 deletion index.js
Expand Up @@ -19,7 +19,7 @@ const MigrationHandler = require(data.url("js/MigrationHandler"));

var oldNewTab;
var blinkEnable = prefSet.prefs.blinkEnable;
var devlogs = true; // set true to enable logging
var devlogs = false; // set true to enable logging
var feedList = [];
var bookmarksTree = [];
var bookmarks = [];
Expand All @@ -44,6 +44,9 @@ unload(function() {
clearSettings();
});

if (self.loadReason == "install" || self.loadReason == "upgrade")
tabs.open(data.url("blink_shell.html#/blink/help"));

/* Clear settings on disable/uninstall.
But due to bug https://bugzilla.mozilla.org/show_bug.cgi?id=627432#c12,
uninstall is never called */
Expand Down
49 changes: 25 additions & 24 deletions package.json
@@ -1,26 +1,27 @@
{
"title": "Blink",
"name": "blink",
"version": "0.9.5",
"description": "A beautiful New Tab replacement add-on.",
"main": "index.js",
"author": "Sidhant Sharma [:tk]",
"icon": {
"48": "resource://@blink/data/img/blink-48.png",
"64": "resource://@blink/data/img/blink-64.png"
},
"engines": {
"firefox": ">=38.0a1"
},
"permissions": {
"cross-domain-content": ["https://cloud.feedly.com/"]
},
"preferences": [{
"name": "blinkEnable",
"title": "Make Blink my default New Tab",
"description": "Checking this makes Blink your default New Tab.",
"type": "bool",
"value": true
}],
"license": "MIT"
"title": "Blink",
"name": "blink",
"version": "1.0.1",
"description": "A beautiful New Tab replacement add-on.",
"main": "index.js",
"author": "Sidhant Sharma [:tk]",
"icon": {
"48": "resource://@blink/data/img/blink-48.png",
"64": "resource://@blink/data/img/blink-64.png"
},
"engines": {
"firefox": ">=38.0a1"
},
"permissions": {
"cross-domain-content": ["https://cloud.feedly.com/"],
"private-browsing": true
},
"preferences": [{
"name": "blinkEnable",
"title": "Make Blink my default New Tab",
"description": "Checking this makes Blink your default New Tab.",
"type": "bool",
"value": true
}],
"license": "MIT"
}

0 comments on commit b16aae3

Please sign in to comment.