tobast/glowingbear-mainbox
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #473 from glowing-bear/hide-nsfw

Browse source 
Don't automatically show NSFW content
This commit is contained in:
David Cormier 2014-10-16 10:17:09 -04:00
commit 967aac5dba
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
css/glowingbear.css
View file

@ -535,6 +535,12 @@ li.buffer.indent.private a {
padding-right: -15px;
}
.settings-help {
display: block;
margin: -5px 0 -3px 19px;
font-size: small;
}
/* */
/* Mobile layout */
/* */

2
index.html
View file

@ -348,7 +348,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
<div class="checkbox">
<label>
<input type="checkbox" ng-model="noembed">
Hide embedded content by default
Hide embedded content by default<span class="text-muted settings-help">NSFW content will be hidden</small>
</label>
</div>
</form>

3
js/plugin-directive.js
View file

@ -19,7 +19,8 @@ weechat.directive('plugin', ['$rootScope', function($rootScope) {
$scope.displayedContent = "";
$scope.plugin.visible = $rootScope.auto_display_embedded_content;
// Auto-display embedded content only if it isn't NSFW
$scope.plugin.visible = $rootScope.auto_display_embedded_content && !$scope.plugin.nsfw;
// user-accessible hash key that is a valid CSS class name
$scope.plugin.className = "embed_" + $scope.plugin.$$hashKey.replace(':','_');