Merge pull request #511 from Gared/master
Added cookie to save option showing author colors and fixed some spelling mistakes
This commit is contained in:
commit
fec8f8a142
|
@ -6,7 +6,7 @@
|
|||
|
||||
# Module name conventions
|
||||
|
||||
Module file names starts with a capital letter and uses camelCase
|
||||
Module file names start with a capital letter and uses camelCase
|
||||
|
||||
# Where does it start?
|
||||
|
||||
|
|
|
@ -282,7 +282,7 @@ function handshake()
|
|||
pad.changeViewOption('showLineNumbers', false);
|
||||
}
|
||||
|
||||
// If the noColors value is set to true then we need to hide the backround colors on the ace spans
|
||||
// If the noColors value is set to true then we need to hide the background colors on the ace spans
|
||||
if (settings.noColors == true)
|
||||
{
|
||||
pad.changeViewOption('noColors', true);
|
||||
|
@ -488,6 +488,9 @@ var pad = {
|
|||
chat.stickToScreen(true); // stick it to the screen
|
||||
$('#options-stickychat').prop("checked", true); // set the checkbox to on
|
||||
}
|
||||
if(padcookie.getPref("showAuthorshipColors") == false){
|
||||
pad.changeViewOption('showAuthorColors', false);
|
||||
}
|
||||
}
|
||||
},
|
||||
dispose: function()
|
||||
|
@ -752,6 +755,7 @@ var pad = {
|
|||
|
||||
// pad.determineSidebarVisibility(isConnected && !isInitialConnect);
|
||||
pad.determineChatVisibility(isConnected && !isInitialConnect);
|
||||
pad.determineAuthorshipColorsVisibility();
|
||||
|
||||
},
|
||||
/* determineSidebarVisibility: function(asNowConnectedFeedback)
|
||||
|
@ -781,6 +785,16 @@ var pad = {
|
|||
$('#options-stickychat').prop("checked", false); // set the checkbox for off
|
||||
}
|
||||
},
|
||||
determineAuthorshipColorsVisibility: function(){
|
||||
var authColCookie = padcookie.getPref('showAuthorshipColors');
|
||||
if (authColCookie){
|
||||
pad.changeViewOption('showAuthorColors', true);
|
||||
$('#options-colorscheck').prop("checked", true);
|
||||
}
|
||||
else {
|
||||
$('#options-colorscheck').prop("checked", false);
|
||||
}
|
||||
},
|
||||
handleCollabAction: function(action)
|
||||
{
|
||||
if (action == "commitPerformed")
|
||||
|
|
|
@ -69,6 +69,7 @@ var padeditor = (function()
|
|||
});
|
||||
padutils.bindCheckboxChange($("#options-colorscheck"), function()
|
||||
{
|
||||
padcookie.setPref('showAuthorshipColors', padutils.getCheckbox("#options-colorscheck"));
|
||||
pad.changeViewOption('showAuthorColors', padutils.getCheckbox("#options-colorscheck"));
|
||||
});
|
||||
$("#viewfontmenu").change(function()
|
||||
|
|
|
@ -140,7 +140,7 @@
|
|||
<label for="options-stickychat">Chat always on screen</label>
|
||||
</p>
|
||||
<p>
|
||||
<input type="checkbox" id="options-colorscheck" checked>
|
||||
<input type="checkbox" id="options-colorscheck">
|
||||
<label for="options-colorscheck">Authorship colors</label>
|
||||
</p>
|
||||
<p>
|
||||
|
|
Loading…
Reference in New Issue