must go first:
text = text.replace(/([\W_]|^)(\*\*|__)(?=\S)([^\r]*?\S[\*_]*)\2([\W_]|$)/g,
- "$1$3$4");
+ '$1$3$4');
text = text.replace(/([\W_]|^)(\*|_)(?=\S)([^\r\*_]*?\S)\2([\W_]|$)/g,
- "$1$3$4");
+ '$1$3$4');
return text;
}
- function _DoBlockQuotes(text) {
-
+ function _DoBlockQuotes(text) {
/*
text = text.replace(/
( // Wrap whole match in $1
@@ -1075,33 +1069,33 @@ else
*/
text = text.replace(/((^[ \t]*>[ \t]?.+\n(.+\n)*\n*)+)/gm,
- function (wholeMatch, m1) {
+ function(wholeMatch, m1) {
var bq = m1;
// attacklab: hack around Konqueror 3.5.4 bug:
// "----------bug".replace(/^-/g,"") == "bug"
- bq = bq.replace(/^[ \t]*>[ \t]?/gm, "~0"); // trim one level of quoting
+ bq = bq.replace(/^[ \t]*>[ \t]?/gm, '~0'); // trim one level of quoting
// attacklab: clean up hack
- bq = bq.replace(/~0/g, "");
+ bq = bq.replace(/~0/g, '');
- bq = bq.replace(/^[ \t]+$/gm, ""); // trim whitespace-only lines
+ bq = bq.replace(/^[ \t]+$/gm, ''); // trim whitespace-only lines
bq = _RunBlockGamut(bq); // recurse
- bq = bq.replace(/(^|\n)/g, "$1 ");
+ bq = bq.replace(/(^|\n)/g, '$1 ');
// These leading spaces screw with content, so we need to fix that:
bq = bq.replace(
/(\s*[^\r]+?<\/pre>)/gm,
- function (wholeMatch, m1) {
+ function(wholeMatch, m1) {
var pre = m1;
// attacklab: hack around Konqueror 3.5.4 bug:
- pre = pre.replace(/^ /mg, "~0");
- pre = pre.replace(/~0/g, "");
+ pre = pre.replace(/^ /mg, '~0');
+ pre = pre.replace(/~0/g, '');
return pre;
});
- return hashBlock("\n" + bq + "\n
");
+ return hashBlock('\n' + bq + '\n
');
}
);
return text;
@@ -1114,12 +1108,12 @@ else
//
// Strip leading and trailing lines:
- text = text.replace(/^\n+/g, "");
- text = text.replace(/\n+$/g, "");
+ text = text.replace(/^\n+/g, '');
+ text = text.replace(/\n+$/g, '');
var grafs = text.split(/\n{2,}/g);
var grafsOut = [];
-
+
var markerRe = /~K(\d+)K/;
//
@@ -1135,11 +1129,10 @@ else
}
else if (/\S/.test(str)) {
str = _RunSpanGamut(str);
- str = str.replace(/^([ \t]*)/g, "");
- str += "
"
+ str = str.replace(/^([ \t]*)/g, '');
+ str += '
';
grafsOut.push(str);
- }
-
+ }
}
//
// Unhashify HTML blocks
@@ -1150,14 +1143,14 @@ else
var foundAny = true;
while (foundAny) { // we may need several runs, since the data may be nested
foundAny = false;
- grafsOut[i] = grafsOut[i].replace(/~K(\d+)K/g, function (wholeMatch, id) {
+ grafsOut[i] = grafsOut[i].replace(/~K(\d+)K/g, function(wholeMatch, id) {
foundAny = true;
return g_html_blocks[id];
});
}
}
}
- return grafsOut.join("\n\n");
+ return grafsOut.join('\n\n');
}
function _EncodeAmpsAndAngles(text) {
@@ -1165,10 +1158,10 @@ else
// Ampersand-encoding based entirely on Nat Irons's Amputator MT plugin:
// http://bumppo.net/projects/amputator/
- text = text.replace(/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/g, "&");
+ text = text.replace(/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/g, '&');
// Encode naked <'s
- text = text.replace(/<(?![a-z\/?\$!])/gi, "<");
+ text = text.replace(/<(?![a-z\/?\$!])/gi, '<');
return text;
}
@@ -1194,18 +1187,17 @@ else
return text;
}
- function _DoAutoLinks(text) {
-
+ function _DoAutoLinks(text) {
// note that at this point, all other URL in the text are already hyperlinked as
// *except* for the case
// automatically add < and > around unadorned raw hyperlinks
// must be preceded by space/BOF and followed by non-word/EOF character
- text = text.replace(/(^|\s)(https?|ftp)(:\/\/[-A-Z0-9+&@#\/%?=~_|\[\]\(\)!:,\.;]*[-A-Z0-9+&@#\/%=~_|\[\]])($|\W)/gi, "$1<$2$3>$4");
+ text = text.replace(/(^|\s)(https?|ftp)(:\/\/[-A-Z0-9+&@#\/%?=~_|\[\]\(\)!:,\.;]*[-A-Z0-9+&@#\/%=~_|\[\]])($|\W)/gi, '$1<$2$3>$4');
// autolink anything like
-
- var replacer = function (wholematch, m1) { return "" + pluginHooks.plainLinkText(m1) + ""; }
+
+ var replacer = function(wholematch, m1) { return '' + pluginHooks.plainLinkText(m1) + ''; };
text = text.replace(/<((https?|ftp):[^'">\s]+)>/gi, replacer);
// Email addresses:
@@ -1237,7 +1229,7 @@ else
// Swap back in all the special characters we've hidden.
//
text = text.replace(/~E(\d+)E/g,
- function (wholeMatch, m1) {
+ function(wholeMatch, m1) {
var charCodeToReplace = parseInt(m1);
return String.fromCharCode(charCodeToReplace);
}
@@ -1253,10 +1245,10 @@ else
// attacklab: hack around Konqueror 3.5.4 bug:
// "----------bug".replace(/^-/g,"") == "bug"
- text = text.replace(/^(\t|[ ]{1,4})/gm, "~0"); // attacklab: g_tab_width
+ text = text.replace(/^(\t|[ ]{1,4})/gm, '~0'); // attacklab: g_tab_width
// attacklab: clean up hack
- text = text.replace(/~0/g, "")
+ text = text.replace(/~0/g, '');
return text;
}
@@ -1265,12 +1257,12 @@ else
if (!/\t/.test(text))
return text;
- var spaces = [" ", " ", " ", " "],
- skew = 0,
- v;
+ var spaces = [' ', ' ', ' ', ' '],
+ skew = 0,
+ v;
- return text.replace(/[\n\t]/g, function (match, offset) {
- if (match === "\n") {
+ return text.replace(/[\n\t]/g, function(match, offset) {
+ if (match === '\n') {
skew = offset + 1;
return match;
}
@@ -1287,20 +1279,20 @@ else
// Replacing encodeProblemUrlChars with attributeSafeUrl. See more at https://code.google.com/p/pagedown/source/detail?r=016a78c093843e203de5364117d34d406a09e8c0
function attributeSafeUrl(url) {
url = attributeEncode(url);
- url = escapeCharacters(url, "*_:()[]")
+ url = escapeCharacters(url, '*_:()[]');
return url;
}
function escapeCharacters(text, charsToEscape, afterBackslash) {
// First we have to escape the escape characters so that
// we can build a character class out of them
- var regexString = "([" + charsToEscape.replace(/([\[\]\\])/g, "\\$1") + "])";
+ var regexString = '([' + charsToEscape.replace(/([\[\]\\])/g, '\\$1') + '])';
if (afterBackslash) {
- regexString = "\\\\" + regexString;
+ regexString = '\\\\' + regexString;
}
- var regex = new RegExp(regexString, "g");
+ var regex = new RegExp(regexString, 'g');
text = text.replace(regex, escapeCharacters_callback);
return text;
@@ -1309,9 +1301,7 @@ else
function escapeCharacters_callback(wholeMatch, m1) {
var charCodeToEscape = m1.charCodeAt(0);
- return "~E" + charCodeToEscape + "E";
- }
-
- }; // end of the Markdown.Converter constructor
-
+ return '~E' + charCodeToEscape + 'E';
+ }
+ }; // end of the Markdown.Converter constructor
})();
diff --git a/lms/static/js/Markdown.Editor.js b/lms/static/js/Markdown.Editor.js
index 491d0f30ff..95e45a4464 100644
--- a/lms/static/js/Markdown.Editor.js
+++ b/lms/static/js/Markdown.Editor.js
@@ -1,14 +1,13 @@
// needs Markdown.Converter.js at the moment
-(function () {
-
+(function() {
var util = {},
position = {},
ui = {},
doc = window.document,
re = window.RegExp,
nav = window.navigator,
- SETTINGS = { lineLength: 72 },
+ SETTINGS = {lineLength: 72},
// Used to work around some browser bugs where we can't use feature testing.
uaSniffed = {
@@ -26,30 +25,30 @@
// -------------------------------------------------------------------
// The text that appears on the dialog box when entering links.
- var linkDialogText = gettext("Insert Hyperlink"),
+ var linkDialogText = gettext('Insert Hyperlink'),
linkUrlHelpText = gettext("e.g. 'http://google.com/'"),
- linkDestinationLabel = gettext("Link Description"),
+ linkDestinationLabel = gettext('Link Description'),
linkDestinationHelpText = gettext("e.g. 'google'"),
- linkDestinationError = gettext("Please provide a description of the link destination."),
- linkDefaultText = "http://"; // The default text that appears in input
+ linkDestinationError = gettext('Please provide a description of the link destination.'),
+ linkDefaultText = 'http://'; // The default text that appears in input
// The text that appears on the dialog box when entering Images.
- var imageDialogText = gettext("Insert Image (upload file or type URL)"),
+ var imageDialogText = gettext('Insert Image (upload file or type URL)'),
imageUrlHelpText = gettext("Type in a URL or use the \"Choose File\" button to upload a file from your machine. (e.g. 'http://example.com/img/clouds.jpg')"), // eslint-disable-line max-len
- imageDescriptionLabel = gettext("Image Description"),
- imageDefaultText = "http://", // The default text that appears in input
+ imageDescriptionLabel = gettext('Image Description'),
+ imageDefaultText = 'http://', // The default text that appears in input
imageDescError = gettext('Please describe this image or agree that it has no contextual value by checking the checkbox.'), // eslint-disable-line max-len
imageDescriptionHelpText = gettext("e.g. 'Sky with clouds'. The description is helpful for users who cannot see the image."), // eslint-disable-line max-len
imageDescriptionHelpLink = {
href: 'http://www.w3.org/TR/html5/embedded-content-0.html#alt',
- text: gettext("How to create useful text alternatives.")
+ text: gettext('How to create useful text alternatives.')
},
imageIsDecorativeLabel = gettext('This image is for decorative purposes only and does not require a description.'); // eslint-disable-line max-len
// Text that is shared between both link and image dialog boxes.
- var defaultHelpHoverTitle = gettext("Markdown Editing Help"),
- urlLabel = gettext("URL"),
- urlError = gettext("Please provide a valid URL.");
+ var defaultHelpHoverTitle = gettext('Markdown Editing Help'),
+ urlLabel = gettext('URL'),
+ urlError = gettext('Please provide a valid URL.');
// -------------------------------------------------------------------
// END OF YOUR CHANGES
@@ -63,55 +62,53 @@
// - getConverter() returns the markdown converter object that was passed to the constructor
// - run() actually starts the editor; should be called after all necessary plugins are registered. Calling this more than once is a no-op.
// - refreshPreview() forces the preview to be updated. This method is only available after run() was called.
- Markdown.Editor = function (markdownConverter, idPostfix, help, imageUploadHandler) {
-
- idPostfix = idPostfix || "";
+ Markdown.Editor = function(markdownConverter, idPostfix, help, imageUploadHandler) {
+ idPostfix = idPostfix || '';
var hooks = this.hooks = new Markdown.HookCollection();
- hooks.addNoop("onPreviewPush"); // called with no arguments after the preview has been refreshed
- hooks.addNoop("postBlockquoteCreation"); // called with the user's selection *after* the blockquote was created; should return the actual to-be-inserted text
- hooks.addFalse("insertImageDialog"); /* called with one parameter: a callback to be called with the URL of the image. If the application creates
+ hooks.addNoop('onPreviewPush'); // called with no arguments after the preview has been refreshed
+ hooks.addNoop('postBlockquoteCreation'); // called with the user's selection *after* the blockquote was created; should return the actual to-be-inserted text
+ hooks.addFalse('insertImageDialog'); /* called with one parameter: a callback to be called with the URL of the image. If the application creates
* its own image insertion dialog, this hook should return true, and the callback should be called with the chosen
* image url (or null if the user cancelled). If this hook returns false, the default dialog will be used.
*/
this.util = util;
- this.getConverter = function () { return markdownConverter; }
+ this.getConverter = function() { return markdownConverter; };
var that = this,
panels;
- this.run = function () {
+ this.run = function() {
if (panels)
return; // already initialized
panels = new PanelCollection(idPostfix);
var commandManager = new CommandManager(hooks);
- var previewManager = new PreviewManager(markdownConverter, panels, function (text, previewSet) { hooks.onPreviewPush(text, previewSet); });
+ var previewManager = new PreviewManager(markdownConverter, panels, function(text, previewSet) { hooks.onPreviewPush(text, previewSet); });
var undoManager, uiManager;
if (!/\?noundo/.test(doc.location.href)) {
- undoManager = new UndoManager(function () {
+ undoManager = new UndoManager(function() {
previewManager.refresh();
if (uiManager) // not available on the first call
uiManager.setUndoRedoButtonStates();
}, panels);
- this.textOperation = function (f) {
+ this.textOperation = function(f) {
undoManager.setCommandMode();
f();
that.refreshPreview();
- }
+ };
}
uiManager = new UIManager(idPostfix, panels, undoManager, previewManager, commandManager, help, imageUploadHandler);
uiManager.setUndoRedoButtonStates();
- var forceRefresh = that.refreshPreview = function () { previewManager.refresh(true); };
+ var forceRefresh = that.refreshPreview = function() { previewManager.refresh(true); };
forceRefresh();
- };
-
- }
+ };
+ };
// before: contains all the text in the input box BEFORE the selection.
// after: contains all the text in the input box AFTER the selection.
@@ -119,46 +116,43 @@
// startRegex: a regular expression to find the start tag
// endRegex: a regular expresssion to find the end tag
- Chunks.prototype.findTags = function (startRegex, endRegex) {
-
+ Chunks.prototype.findTags = function(startRegex, endRegex) {
var chunkObj = this;
var regex;
- if (startRegex) {
-
- regex = util.extendRegExp(startRegex, "", "$");
+ if (startRegex) {
+ regex = util.extendRegExp(startRegex, '', '$');
this.before = this.before.replace(regex,
- function (match) {
+ function(match) {
chunkObj.startTag = chunkObj.startTag + match;
- return "";
+ return '';
});
- regex = util.extendRegExp(startRegex, "^", "");
+ regex = util.extendRegExp(startRegex, '^', '');
this.selection = this.selection.replace(regex,
- function (match) {
+ function(match) {
chunkObj.startTag = chunkObj.startTag + match;
- return "";
+ return '';
});
}
- if (endRegex) {
-
- regex = util.extendRegExp(endRegex, "", "$");
+ if (endRegex) {
+ regex = util.extendRegExp(endRegex, '', '$');
this.selection = this.selection.replace(regex,
- function (match) {
+ function(match) {
chunkObj.endTag = match + chunkObj.endTag;
- return "";
+ return '';
});
- regex = util.extendRegExp(endRegex, "^", "");
+ regex = util.extendRegExp(endRegex, '^', '');
this.after = this.after.replace(regex,
- function (match) {
+ function(match) {
chunkObj.endTag = match + chunkObj.endTag;
- return "";
+ return '';
});
}
};
@@ -167,21 +161,20 @@
// to the before/after regions.
//
// If remove is true, the whitespace disappears.
- Chunks.prototype.trimWhitespace = function (remove) {
+ Chunks.prototype.trimWhitespace = function(remove) {
var beforeReplacer, afterReplacer, that = this;
if (remove) {
- beforeReplacer = afterReplacer = "";
+ beforeReplacer = afterReplacer = '';
} else {
- beforeReplacer = function (s) { that.before += s; return ""; }
- afterReplacer = function (s) { that.after = s + that.after; return ""; }
+ beforeReplacer = function(s) { that.before += s; return ''; };
+ afterReplacer = function(s) { that.after = s + that.after; return ''; };
}
this.selection = this.selection.replace(/^(\s*)/, beforeReplacer).replace(/(\s*)$/, afterReplacer);
};
- Chunks.prototype.skipLines = function (nLinesBefore, nLinesAfter, findExtraNewlines) {
-
+ Chunks.prototype.skipLines = function(nLinesBefore, nLinesAfter, findExtraNewlines) {
if (nLinesBefore === undefined) {
nLinesBefore = 1;
}
@@ -198,48 +191,46 @@
// chrome bug ... documented at: http://meta.stackoverflow.com/questions/63307/blockquote-glitch-in-editor-in-chrome-6-and-7/65985#65985
if (navigator.userAgent.match(/Chrome/)) {
- "X".match(/()./);
+ 'X'.match(/()./);
}
- this.selection = this.selection.replace(/(^\n*)/, "");
+ this.selection = this.selection.replace(/(^\n*)/, '');
this.startTag = this.startTag + re.$1;
- this.selection = this.selection.replace(/(\n*$)/, "");
+ this.selection = this.selection.replace(/(\n*$)/, '');
this.endTag = this.endTag + re.$1;
- this.startTag = this.startTag.replace(/(^\n*)/, "");
+ this.startTag = this.startTag.replace(/(^\n*)/, '');
this.before = this.before + re.$1;
- this.endTag = this.endTag.replace(/(\n*$)/, "");
+ this.endTag = this.endTag.replace(/(\n*$)/, '');
this.after = this.after + re.$1;
- if (this.before) {
-
- regexText = replacementText = "";
+ if (this.before) {
+ regexText = replacementText = '';
while (nLinesBefore--) {
- regexText += "\\n?";
- replacementText += "\n";
+ regexText += '\\n?';
+ replacementText += '\n';
}
if (findExtraNewlines) {
- regexText = "\\n*";
+ regexText = '\\n*';
}
- this.before = this.before.replace(new re(regexText + "$", ""), replacementText);
+ this.before = this.before.replace(new re(regexText + '$', ''), replacementText);
}
- if (this.after) {
-
- regexText = replacementText = "";
+ if (this.after) {
+ regexText = replacementText = '';
while (nLinesAfter--) {
- regexText += "\\n?";
- replacementText += "\n";
+ regexText += '\\n?';
+ replacementText += '\n';
}
if (findExtraNewlines) {
- regexText = "\\n*";
+ regexText = '\\n*';
}
- this.after = this.after.replace(new re(regexText, ""), replacementText);
+ this.after = this.after.replace(new re(regexText, ''), replacementText);
}
};
@@ -262,10 +253,10 @@
// and 8) and ONLY on button clicks. Keyboard shortcuts work
// normally since the focus never leaves the textarea.
function PanelCollection(postfix) {
- this.buttonBar = doc.getElementById("wmd-button-bar" + postfix);
- this.preview = doc.getElementById("wmd-preview" + postfix);
- this.input = doc.getElementById("wmd-input" + postfix);
- };
+ this.buttonBar = doc.getElementById('wmd-button-bar' + postfix);
+ this.preview = doc.getElementById('wmd-preview' + postfix);
+ this.input = doc.getElementById('wmd-input' + postfix);
+ }
util.isValidUrl = function(url) {
return /^((?:http|https|ftp):\/{2}|\/)[^]+$/.test(url);
@@ -273,25 +264,24 @@
// Returns true if the DOM element is visible, false if it's hidden.
// Checks if display is anything other than none.
- util.isVisible = function (elem) {
-
+ util.isVisible = function(elem) {
if (window.getComputedStyle) {
// Most browsers
- return window.getComputedStyle(elem, null).getPropertyValue("display") !== "none";
+ return window.getComputedStyle(elem, null).getPropertyValue('display') !== 'none';
}
else if (elem.currentStyle) {
// IE
- return elem.currentStyle["display"] !== "none";
+ return elem.currentStyle['display'] !== 'none';
}
};
// Adds a listener callback to a DOM element which is fired on a specified
// event.
- util.addEvent = function (elem, event, listener) {
+ util.addEvent = function(elem, event, listener) {
if (elem.attachEvent) {
// IE only. The "on" is mandatory.
- elem.attachEvent("on" + event, listener);
+ elem.attachEvent('on' + event, listener);
}
else {
// Other browsers.
@@ -302,10 +292,10 @@
// Removes a listener callback from a DOM element which is fired on a specified
// event.
- util.removeEvent = function (elem, event, listener) {
+ util.removeEvent = function(elem, event, listener) {
if (elem.detachEvent) {
// IE only. The "on" is mandatory.
- elem.detachEvent("on" + event, listener);
+ elem.detachEvent('on' + event, listener);
}
else {
// Other browsers.
@@ -314,9 +304,9 @@
};
// Converts \r\n and \r to \n.
- util.fixEolChars = function (text) {
- text = text.replace(/\r\n/g, "\n");
- text = text.replace(/\r/g, "\n");
+ util.fixEolChars = function(text) {
+ text = text.replace(/\r\n/g, '\n');
+ text = text.replace(/\r/g, '\n');
return text;
};
@@ -328,35 +318,34 @@
// The flags are unchanged.
//
// regex is a RegExp, pre and post are strings.
- util.extendRegExp = function (regex, pre, post) {
-
+ util.extendRegExp = function(regex, pre, post) {
if (pre === null || pre === undefined) {
- pre = "";
+ pre = '';
}
if (post === null || post === undefined) {
- post = "";
+ post = '';
}
var pattern = regex.toString();
var flags;
// Replace the flags with empty space and store them.
- pattern = pattern.replace(/\/([gim]*)$/, function (wholeMatch, flagsPart) {
+ pattern = pattern.replace(/\/([gim]*)$/, function(wholeMatch, flagsPart) {
flags = flagsPart;
- return "";
+ return '';
});
// Remove the slash delimiters on the regular expression.
- pattern = pattern.replace(/(^\/|\/$)/g, "");
+ pattern = pattern.replace(/(^\/|\/$)/g, '');
pattern = pre + pattern + post;
return new re(pattern, flags);
- }
+ };
// UNFINISHED
// The assignment in the while loop makes jslint cranky.
// I'll change it to a better loop later.
- position.getTop = function (elem, isInner) {
+ position.getTop = function(elem, isInner) {
var result = elem.offsetTop;
if (!isInner) {
while (elem = elem.offsetParent) {
@@ -366,16 +355,15 @@
return result;
};
- position.getHeight = function (elem) {
+ position.getHeight = function(elem) {
return elem.offsetHeight || elem.scrollHeight;
};
- position.getWidth = function (elem) {
+ position.getWidth = function(elem) {
return elem.offsetWidth || elem.scrollWidth;
};
- position.getPageSize = function () {
-
+ position.getPageSize = function() {
var scrollWidth, scrollHeight;
var innerWidth, innerHeight;
@@ -416,18 +404,17 @@
// Handles pushing and popping TextareaStates for undo/redo commands.
// I should rename the stack variables to list.
- function UndoManager(callback, panels) {
-
+ function UndoManager(callback, panels) {
var undoObj = this;
var undoStack = []; // A stack of undo states
var stackPtr = 0; // The index of the current state
- var mode = "none";
+ var mode = 'none';
var lastState; // The last state
var timer; // The setTimeout handle for cancelling the timer
var inputStateObj;
// Set the mode for later logic steps.
- var setMode = function (newMode, noSave) {
+ var setMode = function(newMode, noSave) {
if (mode != newMode) {
mode = newMode;
if (!noSave) {
@@ -435,7 +422,7 @@
}
}
- if (!uaSniffed.isIE || mode != "moving") {
+ if (!uaSniffed.isIE || mode != 'moving') {
timer = setTimeout(refreshState, 1);
}
else {
@@ -443,22 +430,22 @@
}
};
- var refreshState = function (isInitialState) {
+ var refreshState = function(isInitialState) {
inputStateObj = new TextareaState(panels, isInitialState);
timer = undefined;
};
- this.setCommandMode = function () {
- mode = "command";
+ this.setCommandMode = function() {
+ mode = 'command';
saveState();
timer = setTimeout(refreshState, 0);
};
- this.canUndo = function () {
+ this.canUndo = function() {
return stackPtr > 1;
};
- this.canRedo = function () {
+ this.canRedo = function() {
if (undoStack[stackPtr + 1]) {
return true;
}
@@ -466,8 +453,7 @@
};
// Removes the last state and restores it.
- this.undo = function () {
-
+ this.undo = function() {
if (undoObj.canUndo()) {
if (lastState) {
// What about setting state -1 to null or checking for undefined?
@@ -484,16 +470,14 @@
}
}
- mode = "none";
+ mode = 'none';
panels.input.focus();
refreshState();
};
// Redo an action.
- this.redo = function () {
-
- if (undoObj.canRedo()) {
-
+ this.redo = function() {
+ if (undoObj.canRedo()) {
undoStack[++stackPtr].restore();
if (callback) {
@@ -501,19 +485,19 @@
}
}
- mode = "none";
+ mode = 'none';
panels.input.focus();
refreshState();
};
// Push the input area state to the stack.
- var saveState = function () {
+ var saveState = function() {
var currState = inputStateObj || new TextareaState(panels);
if (!currState) {
return false;
}
- if (mode == "moving") {
+ if (mode == 'moving') {
if (!lastState) {
lastState = currState;
}
@@ -532,32 +516,30 @@
}
};
- var handleCtrlYZ = function (event) {
-
+ var handleCtrlYZ = function(event) {
var handled = false;
- if (event.ctrlKey || event.metaKey) {
-
+ if (event.ctrlKey || event.metaKey) {
// IE and Opera do not support charCode.
var keyCode = event.charCode || event.keyCode;
var keyCodeChar = String.fromCharCode(keyCode);
switch (keyCodeChar) {
- case "y":
- undoObj.redo();
- handled = true;
- break;
+ case 'y':
+ undoObj.redo();
+ handled = true;
+ break;
- case "z":
- if (!event.shiftKey) {
- undoObj.undo();
- }
- else {
- undoObj.redo();
- }
- handled = true;
- break;
+ case 'z':
+ if (!event.shiftKey) {
+ undoObj.undo();
+ }
+ else {
+ undoObj.redo();
+ }
+ handled = true;
+ break;
}
}
@@ -573,43 +555,41 @@
};
// Set the mode depending on what is going on in the input area.
- var handleModeChange = function (event) {
-
- if (!event.ctrlKey && !event.metaKey) {
-
+ var handleModeChange = function(event) {
+ if (!event.ctrlKey && !event.metaKey) {
var keyCode = event.keyCode;
if ((keyCode >= 33 && keyCode <= 40) || (keyCode >= 63232 && keyCode <= 63235)) {
// 33 - 40: page up/dn and arrow keys
// 63232 - 63235: page up/dn and arrow keys on safari
- setMode("moving");
+ setMode('moving');
}
else if (keyCode == 8 || keyCode == 46 || keyCode == 127) {
// 8: backspace
// 46: delete
// 127: delete
- setMode("deleting");
+ setMode('deleting');
}
else if (keyCode == 13) {
// 13: Enter
- setMode("newlines");
+ setMode('newlines');
}
else if (keyCode == 27) {
// 27: escape
- setMode("escape");
+ setMode('escape');
}
else if ((keyCode < 16 || keyCode > 20) && keyCode != 91) {
// 16-20 are shift, etc.
// 91: left window key
// I think this might be a little messed up since there are
// a lot of nonprinting keys above 20.
- setMode("typing");
+ setMode('typing');
}
}
};
- var setEventHandlers = function () {
- util.addEvent(panels.input, "keypress", function (event) {
+ var setEventHandlers = function() {
+ util.addEvent(panels.input, 'keypress', function(event) {
// keyCode 89: y
// keyCode 90: z
if ((event.ctrlKey || event.metaKey) && (event.keyCode == 89 || event.keyCode == 90)) {
@@ -617,27 +597,27 @@
}
});
- var handlePaste = function () {
+ var handlePaste = function() {
if (uaSniffed.isIE || (inputStateObj && inputStateObj.text != panels.input.value)) {
if (timer == undefined) {
- mode = "paste";
+ mode = 'paste';
saveState();
refreshState();
}
}
};
- util.addEvent(panels.input, "keydown", handleCtrlYZ);
- util.addEvent(panels.input, "keydown", handleModeChange);
- util.addEvent(panels.input, "mousedown", function () {
- setMode("moving");
+ util.addEvent(panels.input, 'keydown', handleCtrlYZ);
+ util.addEvent(panels.input, 'keydown', handleModeChange);
+ util.addEvent(panels.input, 'mousedown', function() {
+ setMode('moving');
});
panels.input.onpaste = handlePaste;
panels.input.ondrop = handlePaste;
};
- var init = function () {
+ var init = function() {
setEventHandlers();
refreshState(true);
saveState();
@@ -650,12 +630,11 @@
// The input textarea state/contents.
// This is used to implement undo/redo by the undo manager.
- function TextareaState(panels, isInitialState) {
-
+ function TextareaState(panels, isInitialState) {
// Aliases
var stateObj = this;
var inputArea = panels.input;
- this.init = function () {
+ this.init = function() {
if (!util.isVisible(inputArea)) {
return;
}
@@ -667,50 +646,43 @@
this.scrollTop = inputArea.scrollTop;
if (!this.text && inputArea.selectionStart || inputArea.selectionStart === 0) {
this.text = inputArea.value;
- }
-
- }
+ }
+ };
// Sets the selected text in the input box after we've performed an
// operation.
- this.setInputAreaSelection = function () {
-
+ this.setInputAreaSelection = function() {
if (!util.isVisible(inputArea)) {
return;
}
- if (inputArea.selectionStart !== undefined && !uaSniffed.isOpera) {
-
+ if (inputArea.selectionStart !== undefined && !uaSniffed.isOpera) {
inputArea.focus();
inputArea.selectionStart = stateObj.start;
inputArea.selectionEnd = stateObj.end;
inputArea.scrollTop = stateObj.scrollTop;
}
- else if (doc.selection) {
-
+ else if (doc.selection) {
if (doc.activeElement && doc.activeElement !== inputArea) {
return;
}
inputArea.focus();
var range = inputArea.createTextRange();
- range.moveStart("character", -inputArea.value.length);
- range.moveEnd("character", -inputArea.value.length);
- range.moveEnd("character", stateObj.end);
- range.moveStart("character", stateObj.start);
+ range.moveStart('character', -inputArea.value.length);
+ range.moveEnd('character', -inputArea.value.length);
+ range.moveEnd('character', stateObj.end);
+ range.moveStart('character', stateObj.start);
range.select();
}
};
- this.setInputAreaSelectionStartEnd = function () {
-
- if (!panels.ieCachedRange && (inputArea.selectionStart || inputArea.selectionStart === 0)) {
-
+ this.setInputAreaSelectionStartEnd = function() {
+ if (!panels.ieCachedRange && (inputArea.selectionStart || inputArea.selectionStart === 0)) {
stateObj.start = inputArea.selectionStart;
stateObj.end = inputArea.selectionEnd;
}
- else if (doc.selection) {
-
+ else if (doc.selection) {
stateObj.text = util.fixEolChars(inputArea.value);
// IE loses the selection in the textarea when buttons are
@@ -719,12 +691,12 @@
var range = panels.ieCachedRange || doc.selection.createRange();
var fixedRange = util.fixEolChars(range.text);
- var marker = "\x07";
+ var marker = '\x07';
var markedRange = marker + fixedRange + marker;
range.text = markedRange;
var inputText = util.fixEolChars(inputArea.value);
- range.moveStart("character", -markedRange.length);
+ range.moveStart('character', -markedRange.length);
range.text = fixedRange;
stateObj.start = inputText.indexOf(marker);
@@ -733,9 +705,9 @@
var len = stateObj.text.length - util.fixEolChars(inputArea.value).length;
if (len) {
- range.moveStart("character", -fixedRange.length);
+ range.moveStart('character', -fixedRange.length);
while (len--) {
- fixedRange += "\n";
+ fixedRange += '\n';
stateObj.end += 1;
}
range.text = fixedRange;
@@ -751,8 +723,7 @@
};
// Restore this state into the input area.
- this.restore = function () {
-
+ this.restore = function() {
if (stateObj.text != undefined && stateObj.text != inputArea.value) {
inputArea.value = stateObj.text;
}
@@ -761,13 +732,12 @@
};
// Gets a collection of HTML chunks from the inptut textarea.
- this.getChunks = function () {
-
+ this.getChunks = function() {
var chunk = new Chunks();
chunk.before = util.fixEolChars(stateObj.text.substring(0, stateObj.start));
- chunk.startTag = "";
+ chunk.startTag = '';
chunk.selection = util.fixEolChars(stateObj.text.substring(stateObj.start, stateObj.end));
- chunk.endTag = "";
+ chunk.endTag = '';
chunk.after = util.fixEolChars(stateObj.text.substring(stateObj.end));
chunk.scrollTop = stateObj.scrollTop;
@@ -775,8 +745,7 @@
};
// Sets the TextareaState properties given a chunk of markdown.
- this.setChunks = function (chunk) {
-
+ this.setChunks = function(chunk) {
chunk.before = chunk.before + chunk.startTag;
chunk.after = chunk.endTag + chunk.after;
@@ -786,30 +755,27 @@
this.scrollTop = chunk.scrollTop;
};
this.init();
- };
-
- function PreviewManager(converter, panels, previewPushCallback) {
+ }
+ function PreviewManager(converter, panels, previewPushCallback) {
var managerObj = this;
var timeout;
var elapsedTime;
var oldInputText;
var maxDelay = 3000;
- var startType = "delayed"; // The other legal value is "manual"
+ var startType = 'delayed'; // The other legal value is "manual"
// Adds event listeners to elements
- var setupEvents = function (inputElem, listener) {
-
- util.addEvent(inputElem, "input", listener);
+ var setupEvents = function(inputElem, listener) {
+ util.addEvent(inputElem, 'input', listener);
inputElem.onpaste = listener;
inputElem.ondrop = listener;
- util.addEvent(inputElem, "keypress", listener);
- util.addEvent(inputElem, "keydown", listener);
+ util.addEvent(inputElem, 'keypress', listener);
+ util.addEvent(inputElem, 'keydown', listener);
};
- var getDocScrollTop = function () {
-
+ var getDocScrollTop = function() {
var result = 0;
if (window.innerHeight) {
@@ -827,8 +793,7 @@
return result;
};
- var makePreviewHtml = function () {
-
+ var makePreviewHtml = function() {
// If there is no registered preview panel
// there is nothing to do.
if (!panels.preview)
@@ -856,18 +821,16 @@
};
// setTimeout is already used. Used as an event listener.
- var applyTimeout = function () {
-
+ var applyTimeout = function() {
if (timeout) {
clearTimeout(timeout);
timeout = undefined;
}
- if (startType !== "manual") {
-
+ if (startType !== 'manual') {
var delay = 0;
- if (startType === "delayed") {
+ if (startType === 'delayed') {
delay = elapsedTime;
}
@@ -878,23 +841,22 @@
}
};
- var getScaleFactor = function (panel) {
+ var getScaleFactor = function(panel) {
if (panel.scrollHeight <= panel.clientHeight) {
return 1;
}
return panel.scrollTop / (panel.scrollHeight - panel.clientHeight);
};
- var setPanelScrollTops = function () {
+ var setPanelScrollTops = function() {
if (panels.preview) {
panels.preview.scrollTop = (panels.preview.scrollHeight - panels.preview.clientHeight) * getScaleFactor(panels.preview);
}
};
- this.refresh = function (requiresRefresh) {
-
+ this.refresh = function(requiresRefresh) {
if (requiresRefresh) {
- oldInputText = "";
+ oldInputText = '';
makePreviewHtml();
}
else {
@@ -902,7 +864,7 @@
}
};
- this.processingTime = function () {
+ this.processingTime = function() {
return elapsedTime;
};
@@ -911,7 +873,7 @@
// IE doesn't let you use innerHTML if the element is contained somewhere in a table
// (which is the case for inline editing) -- in that case, detach the element, set the
// value, and reattach. Yes, that *is* ridiculous.
- var ieSafePreviewSet = function (text) {
+ var ieSafePreviewSet = function(text) {
var preview = panels.preview;
var parent = preview.parentNode;
var sibling = preview.nextSibling;
@@ -921,15 +883,15 @@
parent.appendChild(preview);
else
parent.insertBefore(preview, sibling);
- }
+ };
- var nonSuckyBrowserPreviewSet = function (text) {
+ var nonSuckyBrowserPreviewSet = function(text) {
panels.preview.innerHTML = text;
- }
+ };
var previewSetter;
- var previewSet = function (text) {
+ var previewSet = function(text) {
if (previewSetter)
return previewSetter(text);
@@ -942,8 +904,7 @@
}
};
- var pushPreviewHtml = function (text) {
-
+ var pushPreviewHtml = function(text) {
var emptyTop = position.getTop(panels.input) - getDocScrollTop();
if (panels.preview) {
@@ -960,7 +921,7 @@
var fullTop = position.getTop(panels.input) - getDocScrollTop();
if (uaSniffed.isIE) {
- setTimeout(function () {
+ setTimeout(function() {
window.scrollBy(0, fullTop - emptyTop);
}, 0);
}
@@ -969,8 +930,7 @@
}
};
- var init = function () {
-
+ var init = function() {
setupEvents(panels.input, applyTimeout);
makePreviewHtml();
@@ -980,41 +940,40 @@
};
init();
- };
+ }
// Creates the background behind the hyperlink text entry box.
// And download dialog
// Most of this has been moved to CSS but the div creation and
// browser-specific hacks remain here.
- ui.createBackground = function () {
-
- var background = doc.createElement("div"),
+ ui.createBackground = function() {
+ var background = doc.createElement('div'),
style = background.style;
- background.className = "wmd-prompt-background";
+ background.className = 'wmd-prompt-background';
- style.position = "absolute";
- style.top = "0";
+ style.position = 'absolute';
+ style.top = '0';
- style.zIndex = "1000";
+ style.zIndex = '1000';
if (uaSniffed.isIE) {
- style.filter = "alpha(opacity=50)";
+ style.filter = 'alpha(opacity=50)';
}
else {
- style.opacity = "0.5";
+ style.opacity = '0.5';
}
var pageSize = position.getPageSize();
- style.height = pageSize[1] + "px";
+ style.height = pageSize[1] + 'px';
if (uaSniffed.isIE) {
style.left = doc.documentElement.scrollLeft;
style.width = doc.documentElement.clientWidth;
}
else {
- style.left = "0";
- style.width = "100%";
+ style.left = '0';
+ style.width = '100%';
}
doc.body.appendChild(background);
@@ -1029,7 +988,7 @@
// callback: The function which is executed when the prompt is dismissed, either via OK or Cancel.
// It receives a single argument; either the entered text (if OK was chosen) or null (if Cancel
// was chosen).
- ui.prompt = function (title,
+ ui.prompt = function(title,
urlLabel,
urlHelp,
urlError,
@@ -1040,8 +999,7 @@
defaultInputText,
callback,
imageIsDecorativeLabel,
- imageUploadHandler) {
-
+ imageUploadHandler) {
// These variables need to be declared at this level since they are used
// in multiple functions.
var dialog, // The dialog box.
@@ -1054,14 +1012,14 @@
// Used as a keydown event handler. Esc dismisses the prompt.
// Key code 27 is ESC.
- var checkEscape = function (key) {
+ var checkEscape = function(key) {
var code = (key.charCode || key.keyCode);
if (code === 27) {
close(true);
}
};
- var clearFormErrorMessages = function () {
+ var clearFormErrorMessages = function() {
urlInput.classList.remove('has-error');
urlErrorMsg.style.display = 'none';
descInput.classList.remove('has-error');
@@ -1071,8 +1029,8 @@
// Dismisses the hyperlink input box.
// isCancel is true if we don't care about the input text.
// isCancel is false if we are going to keep the text.
- var close = function (isCancel) {
- util.removeEvent(doc.body, "keydown", checkEscape);
+ var close = function(isCancel) {
+ util.removeEvent(doc.body, 'keydown', checkEscape);
var url = urlInput.value.trim();
var description = descInput.value.trim();
@@ -1130,66 +1088,66 @@
};
// Create the text input box form/window.
- var createDialog = function () {
+ var createDialog = function() {
// The main dialog box.
- dialog = doc.createElement("div");
+ dialog = doc.createElement('div');
dialog.innerHTML = _.template(
- document.getElementById("customwmd-prompt-template").innerHTML)({
- title: title,
- uploadFieldClass: (imageUploadHandler ? 'file-upload' : ''),
- urlLabel: urlLabel,
- urlError: urlError,
- urlHelp: urlHelp,
- urlDescLabel: urlDescLabel,
- descError: urlDescError,
- urlDescHelp: urlDescHelp,
- urlDescHelpLink: urlDescHelpLink,
- okText: gettext("OK"),
- cancelText: gettext("Cancel"),
- chooseFileText: gettext("Choose File"),
- imageIsDecorativeLabel: imageIsDecorativeLabel,
- imageUploadHandler: imageUploadHandler
- });
- dialog.setAttribute("role", "dialog");
- dialog.setAttribute("tabindex", "-1");
- dialog.setAttribute("aria-labelledby", "editorDialogTitle");
- dialog.className = "wmd-prompt-dialog";
- dialog.style.padding = "10px;";
- dialog.style.position = "fixed";
- dialog.style.width = "500px";
- dialog.style.zIndex = "1001";
+ document.getElementById('customwmd-prompt-template').innerHTML)({
+ title: title,
+ uploadFieldClass: (imageUploadHandler ? 'file-upload' : ''),
+ urlLabel: urlLabel,
+ urlError: urlError,
+ urlHelp: urlHelp,
+ urlDescLabel: urlDescLabel,
+ descError: urlDescError,
+ urlDescHelp: urlDescHelp,
+ urlDescHelpLink: urlDescHelpLink,
+ okText: gettext('OK'),
+ cancelText: gettext('Cancel'),
+ chooseFileText: gettext('Choose File'),
+ imageIsDecorativeLabel: imageIsDecorativeLabel,
+ imageUploadHandler: imageUploadHandler
+ });
+ dialog.setAttribute('role', 'dialog');
+ dialog.setAttribute('tabindex', '-1');
+ dialog.setAttribute('aria-labelledby', 'editorDialogTitle');
+ dialog.className = 'wmd-prompt-dialog';
+ dialog.style.padding = '10px;';
+ dialog.style.position = 'fixed';
+ dialog.style.width = '500px';
+ dialog.style.zIndex = '1001';
doc.body.appendChild(dialog);
// This has to be done AFTER adding the dialog to the form if you
// want it to be centered.
- util.addEvent(doc.body, "keydown", checkEscape);
- dialog.style.top = "50%";
- dialog.style.left = "50%";
- dialog.style.display = "block";
+ util.addEvent(doc.body, 'keydown', checkEscape);
+ dialog.style.top = '50%';
+ dialog.style.left = '50%';
+ dialog.style.display = 'block';
if (uaSniffed.isIE_5or6) {
- dialog.style.position = "absolute";
- dialog.style.top = doc.documentElement.scrollTop + 200 + "px";
- dialog.style.left = "50%";
+ dialog.style.position = 'absolute';
+ dialog.style.top = doc.documentElement.scrollTop + 200 + 'px';
+ dialog.style.left = '50%';
}
- dialog.style.marginTop = -(position.getHeight(dialog) / 2) + "px";
- dialog.style.marginLeft = -(position.getWidth(dialog) / 2) + "px";
+ dialog.style.marginTop = -(position.getHeight(dialog) / 2) + 'px';
+ dialog.style.marginLeft = -(position.getWidth(dialog) / 2) + 'px';
- urlInput = document.getElementById("new-url-input");
- urlErrorMsg = document.getElementById("new-url-input-field-message");
- descInput = document.getElementById("new-url-desc-input");
- descErrorMsg = document.getElementById("new-url-desc-input-field-message");
+ urlInput = document.getElementById('new-url-input');
+ urlErrorMsg = document.getElementById('new-url-input-field-message');
+ descInput = document.getElementById('new-url-desc-input');
+ descErrorMsg = document.getElementById('new-url-desc-input-field-message');
urlInput.value = defaultInputText;
- okButton = document.getElementById("new-link-image-ok");
- cancelButton = document.getElementById("new-link-image-cancel");
+ okButton = document.getElementById('new-link-image-ok');
+ cancelButton = document.getElementById('new-link-image-cancel');
- okButton.onclick = function () { return close(false); };
- cancelButton.onclick = function () { return close(true); };
+ okButton.onclick = function() { return close(false); };
+ cancelButton.onclick = function() { return close(true); };
- if(imageUploadHandler) {
- var startUploadHandler = function () {
- document.getElementById("file-upload").onchange = function() {
+ if (imageUploadHandler) {
+ var startUploadHandler = function() {
+ document.getElementById('file-upload').onchange = function() {
imageUploadHandler(this, urlInput);
urlInput.focus();
@@ -1198,17 +1156,17 @@
};
};
startUploadHandler();
- document.getElementById("file-upload-proxy").onclick = function () {
- document.getElementById("file-upload").click();
+ document.getElementById('file-upload-proxy').onclick = function() {
+ document.getElementById('file-upload').click();
return false;
};
- document.getElementById("img-is-decorative").onchange = function () {
+ document.getElementById('img-is-decorative').onchange = function() {
descInput.required = !descInput.required;
};
}
// trap focus in the dialog box
- $(dialog).on("keydown", function (event) {
+ $(dialog).on('keydown', function(event) {
// On tab backward from the first tabbable item in the prompt
if (event.which === 9 && event.shiftKey && event.target === urlInput) {
event.preventDefault();
@@ -1225,8 +1183,7 @@
// Why is this in a zero-length timeout?
// Is it working around a browser bug?
- setTimeout(function () {
-
+ setTimeout(function() {
createDialog();
var defTextLen = defaultInputText.length;
@@ -1237,8 +1194,8 @@
else if (urlInput.createTextRange) {
var range = urlInput.createTextRange();
range.collapse(false);
- range.moveStart("character", -defTextLen);
- range.moveEnd("character", defTextLen);
+ range.moveStart('character', -defTextLen);
+ range.moveEnd('character', defTextLen);
range.select();
}
@@ -1246,70 +1203,67 @@
}, 0);
};
- function UIManager(postfix, panels, undoManager, previewManager, commandManager, helpOptions, imageUploadHandler) {
-
+ function UIManager(postfix, panels, undoManager, previewManager, commandManager, helpOptions, imageUploadHandler) {
var inputBox = panels.input,
buttons = {}; // buttons.undo, buttons.link, etc. The actual DOM elements.
makeSpritedButtonRow();
- var keyEvent = "keydown";
+ var keyEvent = 'keydown';
if (uaSniffed.isOpera) {
- keyEvent = "keypress";
+ keyEvent = 'keypress';
}
- util.addEvent(inputBox, keyEvent, function (key) {
-
+ util.addEvent(inputBox, keyEvent, function(key) {
// Check to see if we have a button key and, if so execute the callback.
- if ((key.ctrlKey || key.metaKey) && !key.altKey && !key.shiftKey) {
-
+ if ((key.ctrlKey || key.metaKey) && !key.altKey && !key.shiftKey) {
var keyCode = key.charCode || key.keyCode;
var keyCodeStr = String.fromCharCode(keyCode).toLowerCase();
switch (keyCodeStr) {
- case "b":
- doClick(buttons.bold);
- break;
- case "i":
- doClick(buttons.italic);
- break;
- case "l":
- doClick(buttons.link);
- break;
- case "q":
- doClick(buttons.quote);
- break;
- case "k":
- doClick(buttons.code);
- break;
- case "g":
- doClick(buttons.image);
- break;
- case "o":
- doClick(buttons.olist);
- break;
- case "u":
- doClick(buttons.ulist);
- break;
- case "h":
- doClick(buttons.heading);
- break;
- case "r":
- doClick(buttons.hr);
- break;
- case "y":
+ case 'b':
+ doClick(buttons.bold);
+ break;
+ case 'i':
+ doClick(buttons.italic);
+ break;
+ case 'l':
+ doClick(buttons.link);
+ break;
+ case 'q':
+ doClick(buttons.quote);
+ break;
+ case 'k':
+ doClick(buttons.code);
+ break;
+ case 'g':
+ doClick(buttons.image);
+ break;
+ case 'o':
+ doClick(buttons.olist);
+ break;
+ case 'u':
+ doClick(buttons.ulist);
+ break;
+ case 'h':
+ doClick(buttons.heading);
+ break;
+ case 'r':
+ doClick(buttons.hr);
+ break;
+ case 'y':
+ doClick(buttons.redo);
+ break;
+ case 'z':
+ if (key.shiftKey) {
doClick(buttons.redo);
- break;
- case "z":
- if (key.shiftKey) {
- doClick(buttons.redo);
- }
- else {
- doClick(buttons.undo);
- }
- break;
- default:
- return;
+ }
+ else {
+ doClick(buttons.undo);
+ }
+ break;
+ default:
+ return;
}
@@ -1324,13 +1278,13 @@
});
// Auto-indent on shift-enter
- util.addEvent(inputBox, "keyup", function (key) {
+ util.addEvent(inputBox, 'keyup', function(key) {
if (key.shiftKey && !key.ctrlKey && !key.metaKey) {
var keyCode = key.charCode || key.keyCode;
// Character 13 is Enter
if (keyCode === 13) {
var fakeButton = {};
- fakeButton.textOp = bindCommand("doAutoindent");
+ fakeButton.textOp = bindCommand('doAutoindent');
doClick(fakeButton);
}
}
@@ -1338,7 +1292,7 @@
// special handler because IE clears the context of the textbox on ESC
if (uaSniffed.isIE) {
- util.addEvent(inputBox, "keydown", function (key) {
+ util.addEvent(inputBox, 'keydown', function(key) {
var code = key.keyCode;
if (code === 27) {
return false;
@@ -1348,12 +1302,10 @@
// Perform the button's action.
- function doClick(button) {
-
+ function doClick(button) {
inputBox.focus();
- if (button.textOp) {
-
+ if (button.textOp) {
if (undoManager) {
undoManager.setCommandMode();
}
@@ -1383,8 +1335,7 @@
// Yes this is awkward and I think it sucks, but there's
// no real workaround. Only the image and link code
// create dialogs and require the function pointers.
- var fixupInputArea = function () {
-
+ var fixupInputArea = function() {
inputBox.focus();
if (chunks) {
@@ -1399,36 +1350,34 @@
if (!noCleanup) {
fixupInputArea();
- }
-
+ }
}
if (button.execute) {
button.execute(undoManager);
}
- };
+ }
- function setupButton(button, isEnabled) {
-
- var normalYShift = "0px";
- var disabledYShift = "-20px";
- var highlightYShift = "-40px";
- var image = button.getElementsByTagName("span")[0];
+ function setupButton(button, isEnabled) {
+ var normalYShift = '0px';
+ var disabledYShift = '-20px';
+ var highlightYShift = '-40px';
+ var image = button.getElementsByTagName('span')[0];
if (isEnabled) {
- image.style.backgroundPosition = button.XShift + " " + normalYShift;
- button.onmouseover = function () {
- image.style.backgroundPosition = this.XShift + " " + highlightYShift;
+ image.style.backgroundPosition = button.XShift + ' ' + normalYShift;
+ button.onmouseover = function() {
+ image.style.backgroundPosition = this.XShift + ' ' + highlightYShift;
};
- button.onmouseout = function () {
- image.style.backgroundPosition = this.XShift + " " + normalYShift;
+ button.onmouseout = function() {
+ image.style.backgroundPosition = this.XShift + ' ' + normalYShift;
};
// IE tries to select the background image "button" text (it's
// implemented in a list item) so we have to cache the selection
// on mousedown.
if (uaSniffed.isIE) {
- button.onmousedown = function () {
+ button.onmousedown = function() {
if (doc.activeElement && doc.activeElement !== panels.input) { // we're not even in the input box, so there's no selection
return;
}
@@ -1438,14 +1387,14 @@
}
if (!button.isHelp) {
- button.onclick = function () {
+ button.onclick = function() {
if (this.onmouseout) {
this.onmouseout();
}
doClick(this);
return false;
- }
- util.addEvent(button, "keydown", function(event) {
+ };
+ util.addEvent(button, 'keydown', function(event) {
var keyCode = event.charCode || event.keyCode;
if (keyCode == 32 || keyCode == 13) {
if (event.preventDefault) {
@@ -1456,43 +1405,42 @@
}
doClick(button);
}
- })
+ });
}
}
else {
- image.style.backgroundPosition = button.XShift + " " + disabledYShift;
- button.onmouseover = button.onmouseout = button.onclick = function () { };
+ image.style.backgroundPosition = button.XShift + ' ' + disabledYShift;
+ button.onmouseover = button.onmouseout = button.onclick = function() { };
}
}
function bindCommand(method) {
- if (typeof method === "string")
+ if (typeof method === 'string')
method = commandManager[method];
- return function () { method.apply(commandManager, arguments); }
+ return function() { method.apply(commandManager, arguments); };
}
- function makeSpritedButtonRow() {
-
+ function makeSpritedButtonRow() {
var buttonBar = panels.buttonBar;
- var normalYShift = "0px";
- var disabledYShift = "-20px";
- var highlightYShift = "-40px";
+ var normalYShift = '0px';
+ var disabledYShift = '-20px';
+ var highlightYShift = '-40px';
- var buttonRow = document.createElement("div");
- buttonRow.setAttribute("role", "toolbar");
- buttonRow.id = "wmd-button-row" + postfix;
+ var buttonRow = document.createElement('div');
+ buttonRow.setAttribute('role', 'toolbar');
+ buttonRow.id = 'wmd-button-row' + postfix;
buttonRow.className = 'wmd-button-row';
buttonRow = buttonBar.appendChild(buttonRow);
var xPosition = 0;
- var makeButton = function (id, title, XShift, textOp) {
- var button = document.createElement("span");
- button.setAttribute("role", "button");
+ var makeButton = function(id, title, XShift, textOp) {
+ var button = document.createElement('span');
+ button.setAttribute('role', 'button');
button.tabIndex = 0;
- button.className = "wmd-button";
- button.style.left = xPosition + "px";
+ button.className = 'wmd-button';
+ button.style.left = xPosition + 'px';
xPosition += 25;
- var buttonImage = document.createElement("span");
+ var buttonImage = document.createElement('span');
button.id = id + postfix;
button.appendChild(buttonImage);
button.title = title;
@@ -1503,55 +1451,55 @@
buttonRow.appendChild(button);
return button;
};
- var makeSpacer = function (num) {
- var spacer = document.createElement("span");
- spacer.setAttribute("role", "separator");
- spacer.className = "wmd-spacer wmd-spacer" + num;
- spacer.id = "wmd-spacer" + num + postfix;
+ var makeSpacer = function(num) {
+ var spacer = document.createElement('span');
+ spacer.setAttribute('role', 'separator');
+ spacer.className = 'wmd-spacer wmd-spacer' + num;
+ spacer.id = 'wmd-spacer' + num + postfix;
buttonRow.appendChild(spacer);
xPosition += 25;
- }
+ };
- buttons.bold = makeButton("wmd-bold-button", gettext("Bold (Ctrl+B)"), "0px", bindCommand("doBold"));
- buttons.italic = makeButton("wmd-italic-button", gettext("Italic (Ctrl+I)"), "-20px", bindCommand("doItalic"));
+ buttons.bold = makeButton('wmd-bold-button', gettext('Bold (Ctrl+B)'), '0px', bindCommand('doBold'));
+ buttons.italic = makeButton('wmd-italic-button', gettext('Italic (Ctrl+I)'), '-20px', bindCommand('doItalic'));
makeSpacer(1);
- buttons.link = makeButton("wmd-link-button", gettext("Hyperlink (Ctrl+L)"), "-40px", bindCommand(function (chunk, postProcessing) {
+ buttons.link = makeButton('wmd-link-button', gettext('Hyperlink (Ctrl+L)'), '-40px', bindCommand(function(chunk, postProcessing) {
return this.doLinkOrImage(chunk, postProcessing, false);
}));
- buttons.quote = makeButton("wmd-quote-button", gettext("Blockquote (Ctrl+Q)"), "-60px", bindCommand("doBlockquote"));
- buttons.code = makeButton("wmd-code-button", gettext("Code Sample (Ctrl+K)"), "-80px", bindCommand("doCode"));
- buttons.image = makeButton("wmd-image-button", gettext("Image (Ctrl+G)"), "-100px", bindCommand(function (chunk, postProcessing) {
+ buttons.quote = makeButton('wmd-quote-button', gettext('Blockquote (Ctrl+Q)'), '-60px', bindCommand('doBlockquote'));
+ buttons.code = makeButton('wmd-code-button', gettext('Code Sample (Ctrl+K)'), '-80px', bindCommand('doCode'));
+ buttons.image = makeButton('wmd-image-button', gettext('Image (Ctrl+G)'), '-100px', bindCommand(function(chunk, postProcessing) {
return this.doLinkOrImage(chunk, postProcessing, true, imageUploadHandler);
}));
makeSpacer(2);
- buttons.olist = makeButton("wmd-olist-button", gettext("Numbered List (Ctrl+O)"), "-120px", bindCommand(function (chunk, postProcessing) {
+ buttons.olist = makeButton('wmd-olist-button', gettext('Numbered List (Ctrl+O)'), '-120px', bindCommand(function(chunk, postProcessing) {
this.doList(chunk, postProcessing, true);
}));
- buttons.ulist = makeButton("wmd-ulist-button", gettext("Bulleted List (Ctrl+U)"), "-140px", bindCommand(function (chunk, postProcessing) {
+ buttons.ulist = makeButton('wmd-ulist-button', gettext('Bulleted List (Ctrl+U)'), '-140px', bindCommand(function(chunk, postProcessing) {
this.doList(chunk, postProcessing, false);
}));
- buttons.heading = makeButton("wmd-heading-button", gettext("Heading (Ctrl+H)"), "-160px", bindCommand("doHeading"));
- buttons.hr = makeButton("wmd-hr-button", gettext("Horizontal Rule (Ctrl+R)"), "-180px", bindCommand("doHorizontalRule"));
+ buttons.heading = makeButton('wmd-heading-button', gettext('Heading (Ctrl+H)'), '-160px', bindCommand('doHeading'));
+ buttons.hr = makeButton('wmd-hr-button', gettext('Horizontal Rule (Ctrl+R)'), '-180px', bindCommand('doHorizontalRule'));
makeSpacer(3);
- buttons.undo = makeButton("wmd-undo-button", gettext("Undo (Ctrl+Z)"), "-200px", null);
- buttons.undo.execute = function (manager) { if (manager) manager.undo(); };
+ buttons.undo = makeButton('wmd-undo-button', gettext('Undo (Ctrl+Z)'), '-200px', null);
+ buttons.undo.execute = function(manager) { if (manager) manager.undo(); };
var redoTitle = /win/.test(nav.platform.toLowerCase()) ?
- gettext("Redo (Ctrl+Y)") :
- gettext("Redo (Ctrl+Shift+Z)"); // mac and other non-Windows platforms
+ gettext('Redo (Ctrl+Y)') :
+ gettext('Redo (Ctrl+Shift+Z)'); // mac and other non-Windows platforms
- buttons.redo = makeButton("wmd-redo-button", redoTitle, "-220px", null);
- buttons.redo.execute = function (manager) { if (manager) manager.redo(); };
+ buttons.redo = makeButton('wmd-redo-button', redoTitle, '-220px', null);
+ buttons.redo.execute = function(manager) { if (manager) manager.redo(); };
if (helpOptions) {
- var helpButton = document.createElement("span");
- var helpButtonImage = document.createElement("span");
+ var helpButton = document.createElement('span');
+ var helpButtonImage = document.createElement('span');
helpButton.appendChild(helpButtonImage);
- helpButton.className = "wmd-button wmd-help-button";
- helpButton.id = "wmd-help-button" + postfix;
- helpButton.XShift = "-240px";
+ helpButton.className = 'wmd-button wmd-help-button';
+ helpButton.id = 'wmd-help-button' + postfix;
+ helpButton.XShift = '-240px';
helpButton.isHelp = true;
- helpButton.style.right = "0px";
+ helpButton.style.right = '0px';
helpButton.title = helpOptions.title || defaultHelpHoverTitle;
helpButton.onclick = helpOptions.handler;
@@ -1568,10 +1516,9 @@
setupButton(buttons.undo, undoManager.canUndo());
setupButton(buttons.redo, undoManager.canRedo());
}
- };
-
- this.setUndoRedoButtonStates = setUndoRedoButtonStates;
+ }
+ this.setUndoRedoButtonStates = setUndoRedoButtonStates;
}
function CommandManager(pluginHooks) {
@@ -1581,45 +1528,44 @@
var commandProto = CommandManager.prototype;
// The markdown symbols - 4 spaces = code, > = blockquote, etc.
- commandProto.prefixes = "(?:\\s{4,}|\\s*>|\\s*-\\s+|\\s*\\d+\\.|=|\\+|-|_|\\*|#|\\s*\\[[^\n]]+\\]:)";
+ commandProto.prefixes = '(?:\\s{4,}|\\s*>|\\s*-\\s+|\\s*\\d+\\.|=|\\+|-|_|\\*|#|\\s*\\[[^\n]]+\\]:)';
// Remove markdown symbols from the chunk selection.
- commandProto.unwrap = function (chunk) {
- var txt = new re("([^\\n])\\n(?!(\\n|" + this.prefixes + "))", "g");
- chunk.selection = chunk.selection.replace(txt, "$1 $2");
+ commandProto.unwrap = function(chunk) {
+ var txt = new re('([^\\n])\\n(?!(\\n|' + this.prefixes + '))', 'g');
+ chunk.selection = chunk.selection.replace(txt, '$1 $2');
};
- commandProto.wrap = function (chunk, len) {
+ commandProto.wrap = function(chunk, len) {
this.unwrap(chunk);
- var regex = new re("(.{1," + len + "})( +|$\\n?)", "gm"),
+ var regex = new re('(.{1,' + len + '})( +|$\\n?)', 'gm'),
that = this;
- chunk.selection = chunk.selection.replace(regex, function (line, marked) {
- if (new re("^" + that.prefixes, "").test(line)) {
+ chunk.selection = chunk.selection.replace(regex, function(line, marked) {
+ if (new re('^' + that.prefixes, '').test(line)) {
return line;
}
- return marked + "\n";
+ return marked + '\n';
});
- chunk.selection = chunk.selection.replace(/\s+$/, "");
+ chunk.selection = chunk.selection.replace(/\s+$/, '');
};
- commandProto.doBold = function (chunk, postProcessing) {
- return this.doBorI(chunk, postProcessing, 2, gettext("strong text"));
+ commandProto.doBold = function(chunk, postProcessing) {
+ return this.doBorI(chunk, postProcessing, 2, gettext('strong text'));
};
- commandProto.doItalic = function (chunk, postProcessing) {
- return this.doBorI(chunk, postProcessing, 1, gettext("emphasized text"));
+ commandProto.doItalic = function(chunk, postProcessing) {
+ return this.doBorI(chunk, postProcessing, 1, gettext('emphasized text'));
};
// chunk: The selected region that will be enclosed with */**
// nStars: 1 for italics, 2 for bold
// insertText: If you just click the button without highlighting text, this gets inserted
- commandProto.doBorI = function (chunk, postProcessing, nStars, insertText) {
-
+ commandProto.doBorI = function(chunk, postProcessing, nStars, insertText) {
// Get rid of whitespace and fixup newlines.
chunk.trimWhitespace();
- chunk.selection = chunk.selection.replace(/\n{2,}/g, "\n");
+ chunk.selection = chunk.selection.replace(/\n{2,}/g, '\n');
// Look for stars before and after. Is the chunk already marked up?
// note that these regex matches cannot fail
@@ -1630,19 +1576,18 @@
// Remove stars if we have to since the button acts as a toggle.
if ((prevStars >= nStars) && (prevStars != 2 || nStars != 1)) {
- chunk.before = chunk.before.replace(re("[*]{" + nStars + "}$", ""), "");
- chunk.after = chunk.after.replace(re("^[*]{" + nStars + "}", ""), "");
+ chunk.before = chunk.before.replace(re('[*]{' + nStars + '}$', ''), '');
+ chunk.after = chunk.after.replace(re('^[*]{' + nStars + '}', ''), '');
}
else if (!chunk.selection && starsAfter) {
// It's not really clear why this code is necessary. It just moves
// some arbitrary stuff around.
- chunk.after = chunk.after.replace(/^([*_]*)/, "");
- chunk.before = chunk.before.replace(/(\s?)$/, "");
+ chunk.after = chunk.after.replace(/^([*_]*)/, '');
+ chunk.before = chunk.before.replace(/(\s?)$/, '');
var whitespace = re.$1;
chunk.before = chunk.before + starsAfter + whitespace;
}
- else {
-
+ else {
// In most cases, if you don't have any selected text and click the button
// you'll get a selected, marked up region with the default text inserted.
if (!chunk.selection && !starsAfter) {
@@ -1650,7 +1595,7 @@
}
// Add the true markup.
- var markup = nStars <= 1 ? "*" : "**"; // shouldn't the test be = ?
+ var markup = nStars <= 1 ? '*' : '**'; // shouldn't the test be = ?
chunk.before = chunk.before + markup;
chunk.after = markup + chunk.after;
}
@@ -1658,24 +1603,22 @@
return;
};
- commandProto.stripLinkDefs = function (text, defsToAdd) {
-
+ commandProto.stripLinkDefs = function(text, defsToAdd) {
text = text.replace(/^[ ]{0,3}\[(\d+)\]:[ \t]*\n?[ \t]*?[ \t]*\n?[ \t]*(?:(\n*)["(](.+?)[")][ \t]*)?(?:\n+|$)/gm,
- function (totalMatch, id, link, newlines, title) {
- defsToAdd[id] = totalMatch.replace(/\s*$/, "");
+ function(totalMatch, id, link, newlines, title) {
+ defsToAdd[id] = totalMatch.replace(/\s*$/, '');
if (newlines) {
// Strip the title and return that separately.
- defsToAdd[id] = totalMatch.replace(/["(](.+?)[")]$/, "");
+ defsToAdd[id] = totalMatch.replace(/["(](.+?)[")]$/, '');
return newlines + title;
}
- return "";
+ return '';
});
return text;
};
- commandProto.addLinkDef = function (chunk, linkDef) {
-
+ commandProto.addLinkDef = function(chunk, linkDef) {
var refNumber = 0; // The current reference number
var defsToAdd = {}; //
// Start with a clean slate by removing all previous link definitions.
@@ -1683,13 +1626,13 @@
chunk.selection = this.stripLinkDefs(chunk.selection, defsToAdd);
chunk.after = this.stripLinkDefs(chunk.after, defsToAdd);
- var defs = "";
+ var defs = '';
var regex = /(\[)((?:\[[^\]]*\]|[^\[\]])*)(\][ ]?(?:\n[ ]*)?\[)(\d+)(\])/g;
- var addDefNumber = function (def) {
+ var addDefNumber = function(def) {
refNumber++;
- def = def.replace(/^[ ]{0,3}\[(\d+)\]:/, " [" + refNumber + "]:");
- defs += "\n" + def;
+ def = def.replace(/^[ ]{0,3}\[(\d+)\]:/, ' [' + refNumber + ']:');
+ defs += '\n' + def;
};
// note that
@@ -1697,7 +1640,7 @@
// of regex, inner is always a proper substring of wholeMatch, and
// b) more than one level of nesting is neither supported by the regex
// nor making a lot of sense (the only use case for nesting is a linked image)
- var getLink = function (wholeMatch, before, inner, afterInner, id, end) {
+ var getLink = function(wholeMatch, before, inner, afterInner, id, end) {
inner = inner.replace(regex, getLink);
if (defsToAdd[id]) {
addDefNumber(defsToAdd[id]);
@@ -1720,13 +1663,13 @@
chunk.after = chunk.after.replace(regex, getLink);
if (chunk.after) {
- chunk.after = chunk.after.replace(/\n*$/, "");
+ chunk.after = chunk.after.replace(/\n*$/, '');
}
if (!chunk.after) {
- chunk.selection = chunk.selection.replace(/\n*$/, "");
+ chunk.selection = chunk.selection.replace(/\n*$/, '');
}
- chunk.after += "\n\n" + defs;
+ chunk.after += '\n\n' + defs;
return refOut;
};
@@ -1734,42 +1677,39 @@
// takes the line as entered into the add link/as image dialog and makes
// sure the URL and the optinal title are "nice".
function properlyEncoded(linkdef) {
- return linkdef.replace(/^\s*(.*?)(?:\s+"(.+)")?\s*$/, function (wholematch, link, title) {
- link = link.replace(/\?.*$/, function (querypart) {
- return querypart.replace(/\+/g, " "); // in the query string, a plus and a space are identical
+ return linkdef.replace(/^\s*(.*?)(?:\s+"(.+)")?\s*$/, function(wholematch, link, title) {
+ link = link.replace(/\?.*$/, function(querypart) {
+ return querypart.replace(/\+/g, ' '); // in the query string, a plus and a space are identical
});
link = decodeURIComponent(link); // unencode first, to prevent double encoding
link = encodeURI(link).replace(/'/g, '%27').replace(/\(/g, '%28').replace(/\)/g, '%29');
- link = link.replace(/\?.*$/, function (querypart) {
- return querypart.replace(/\+/g, "%2b"); // since we replaced plus with spaces in the query part, all pluses that now appear where originally encoded
+ link = link.replace(/\?.*$/, function(querypart) {
+ return querypart.replace(/\+/g, '%2b'); // since we replaced plus with spaces in the query part, all pluses that now appear where originally encoded
});
if (title) {
- title = title.trim ? title.trim() : title.replace(/^\s*/, "").replace(/\s*$/, "");
- title = $.trim(title).replace(/"/g, "quot;").replace(/\(/g, "(").replace(/\)/g, ")").replace(//g, ">");
+ title = title.trim ? title.trim() : title.replace(/^\s*/, '').replace(/\s*$/, '');
+ title = $.trim(title).replace(/"/g, 'quot;').replace(/\(/g, '(').replace(/\)/g, ')').replace(//g, '>');
}
return title ? link + ' "' + title + '"' : link;
});
}
- commandProto.doLinkOrImage = function (chunk, postProcessing, isImage, imageUploadHandler) {
+ commandProto.doLinkOrImage = function(chunk, postProcessing, isImage, imageUploadHandler) {
chunk.trimWhitespace();
chunk.findTags(/\s*!?\[/, /\][ ]?(?:\n[ ]*)?(\[.*?\])?/);
var background;
- if (chunk.endTag.length > 1 && chunk.startTag.length > 0) {
-
- chunk.startTag = chunk.startTag.replace(/!?\[/, "");
- chunk.endTag = "";
- this.addLinkDef(chunk, null);
-
+ if (chunk.endTag.length > 1 && chunk.startTag.length > 0) {
+ chunk.startTag = chunk.startTag.replace(/!?\[/, '');
+ chunk.endTag = '';
+ this.addLinkDef(chunk, null);
}
- else {
-
+ else {
// We're moving start and end tag back into the selection, since (as we're in the else block) we're not
// *removing* a link, but *adding* one, so whatever findTags() found is now back to being part of the
// link text. linkEnteredCallback takes care of escaping any brackets.
chunk.selection = chunk.startTag + chunk.selection + chunk.endTag;
- chunk.startTag = chunk.endTag = "";
+ chunk.startTag = chunk.endTag = '';
if (/\n\n/.test(chunk.selection)) {
this.addLinkDef(chunk, null);
@@ -1778,7 +1718,7 @@
var that = this;
// The function to be executed when you enter a link and press OK or Cancel.
// Marks up the link and adds the ref.
- var linkEnteredCallback = function (link, description) {
+ var linkEnteredCallback = function(link, description) {
background.parentNode.removeChild(background);
if (link !== null) {
@@ -1800,20 +1740,20 @@
// this by anchoring with ^, because in the case that the selection starts with two brackets, this
// would mean a zero-width match at the start. Since zero-width matches advance the string position,
// the first bracket could then not act as the "not a backslash" for the second.
- chunk.selection = (" " + chunk.selection).replace(/([^\\](?:\\\\)*)(?=[[\]])/g, "$1\\").substr(1);
+ chunk.selection = (' ' + chunk.selection).replace(/([^\\](?:\\\\)*)(?=[[\]])/g, '$1\\').substr(1);
- var linkDef = " [999]: " + properlyEncoded(link);
+ var linkDef = ' [999]: ' + properlyEncoded(link);
var num = that.addLinkDef(chunk, linkDef);
- chunk.startTag = isImage ? "![" : "[";
- chunk.endTag = "][" + num + "]";
+ chunk.startTag = isImage ? '![' : '[';
+ chunk.endTag = '][' + num + ']';
if (!chunk.selection) {
if (isImage) {
- chunk.selection = description ? description : "";
+ chunk.selection = description ? description : '';
}
else {
- chunk.selection = description ? description : gettext("enter link description here");
+ chunk.selection = description ? description : gettext('enter link description here');
}
}
}
@@ -1860,23 +1800,22 @@
// When making a list, hitting shift-enter will put your cursor on the next line
// at the current indent level.
- commandProto.doAutoindent = function (chunk, postProcessing) {
-
+ commandProto.doAutoindent = function(chunk, postProcessing) {
var commandMgr = this,
fakeSelection = false;
- chunk.before = chunk.before.replace(/(\n|^)[ ]{0,3}([*+-]|\d+[.])[ \t]*\n$/, "\n\n");
- chunk.before = chunk.before.replace(/(\n|^)[ ]{0,3}>[ \t]*\n$/, "\n\n");
- chunk.before = chunk.before.replace(/(\n|^)[ \t]+\n$/, "\n\n");
+ chunk.before = chunk.before.replace(/(\n|^)[ ]{0,3}([*+-]|\d+[.])[ \t]*\n$/, '\n\n');
+ chunk.before = chunk.before.replace(/(\n|^)[ ]{0,3}>[ \t]*\n$/, '\n\n');
+ chunk.before = chunk.before.replace(/(\n|^)[ \t]+\n$/, '\n\n');
// There's no selection, end the cursor wasn't at the end of the line:
// The user wants to split the current list item / code line / blockquote line
// (for the latter it doesn't really matter) in two. Temporarily select the
// (rest of the) line to achieve this.
if (!chunk.selection && !/^[ \t]*(?:\n|$)/.test(chunk.after)) {
- chunk.after = chunk.after.replace(/^[^\n]*/, function (wholeMatch) {
+ chunk.after = chunk.after.replace(/^[^\n]*/, function(wholeMatch) {
chunk.selection = wholeMatch;
- return "";
+ return '';
});
fakeSelection = true;
}
@@ -1899,27 +1838,26 @@
if (fakeSelection) {
chunk.after = chunk.selection + chunk.after;
- chunk.selection = "";
+ chunk.selection = '';
}
};
- commandProto.doBlockquote = function (chunk, postProcessing) {
-
+ commandProto.doBlockquote = function(chunk, postProcessing) {
chunk.selection = chunk.selection.replace(/^(\n*)([^\r]+?)(\n*)$/,
- function (totalMatch, newlinesBefore, text, newlinesAfter) {
+ function(totalMatch, newlinesBefore, text, newlinesAfter) {
chunk.before += newlinesBefore;
chunk.after = newlinesAfter + chunk.after;
return text;
});
chunk.before = chunk.before.replace(/(>[ \t]*)$/,
- function (totalMatch, blankLine) {
+ function(totalMatch, blankLine) {
chunk.selection = blankLine + chunk.selection;
- return "";
+ return '';
});
- chunk.selection = chunk.selection.replace(/^(\s|>)+$/, "");
- chunk.selection = chunk.selection || gettext("Blockquote");
+ chunk.selection = chunk.selection.replace(/^(\s|>)+$/, '');
+ chunk.selection = chunk.selection || gettext('Blockquote');
// The original code uses a regular expression to find out how much of the
// text *directly before* the selection already was a blockquote:
@@ -1951,11 +1889,11 @@
// Hence we replaced this by a simple state machine that just goes through the
// lines and checks for a), b), and c).
- var match = "",
- leftOver = "",
+ var match = '',
+ leftOver = '',
line;
if (chunk.before) {
- var lines = chunk.before.replace(/\n$/, "").split("\n");
+ var lines = chunk.before.replace(/\n$/, '').split('\n');
var inChain = false;
for (var i = 0; i < lines.length; i++) {
var good = false;
@@ -1971,15 +1909,15 @@
good = inChain; // c) the line is not empty and does not start with ">", so it matches if and only if we're in the chain
}
if (good) {
- match += line + "\n";
+ match += line + '\n';
} else {
leftOver += match + line;
- match = "\n";
+ match = '\n';
}
}
if (!/(^|\n)>/.test(match)) { // d)
leftOver += match;
- match = "";
+ match = '';
}
}
@@ -1989,50 +1927,49 @@
// end of change
if (chunk.after) {
- chunk.after = chunk.after.replace(/^\n?/, "\n");
+ chunk.after = chunk.after.replace(/^\n?/, '\n');
}
chunk.after = chunk.after.replace(/^(((\n|^)(\n[ \t]*)*>(.+\n)*.*)+(\n[ \t]*)*)/,
- function (totalMatch) {
+ function(totalMatch) {
chunk.endTag = totalMatch;
- return "";
+ return '';
}
);
- var replaceBlanksInTags = function (useBracket) {
-
- var replacement = useBracket ? "> " : "";
+ var replaceBlanksInTags = function(useBracket) {
+ var replacement = useBracket ? '> ' : '';
if (chunk.startTag) {
chunk.startTag = chunk.startTag.replace(/\n((>|\s)*)\n$/,
- function (totalMatch, markdown) {
- return "\n" + markdown.replace(/^[ ]{0,3}>?[ \t]*$/gm, replacement) + "\n";
+ function(totalMatch, markdown) {
+ return '\n' + markdown.replace(/^[ ]{0,3}>?[ \t]*$/gm, replacement) + '\n';
});
}
if (chunk.endTag) {
chunk.endTag = chunk.endTag.replace(/^\n((>|\s)*)\n/,
- function (totalMatch, markdown) {
- return "\n" + markdown.replace(/^[ ]{0,3}>?[ \t]*$/gm, replacement) + "\n";
+ function(totalMatch, markdown) {
+ return '\n' + markdown.replace(/^[ ]{0,3}>?[ \t]*$/gm, replacement) + '\n';
});
}
};
if (/^(?![ ]{0,3}>)/m.test(chunk.selection)) {
this.wrap(chunk, SETTINGS.lineLength - 2);
- chunk.selection = chunk.selection.replace(/^/gm, "> ");
+ chunk.selection = chunk.selection.replace(/^/gm, '> ');
replaceBlanksInTags(true);
chunk.skipLines();
} else {
- chunk.selection = chunk.selection.replace(/^[ ]{0,3}> ?/gm, "");
+ chunk.selection = chunk.selection.replace(/^[ ]{0,3}> ?/gm, '');
this.unwrap(chunk);
replaceBlanksInTags(false);
if (!/^(\n|^)[ ]{0,3}>/.test(chunk.selection) && chunk.startTag) {
- chunk.startTag = chunk.startTag.replace(/\n{0,2}$/, "\n\n");
+ chunk.startTag = chunk.startTag.replace(/\n{0,2}$/, '\n\n');
}
if (!/(\n|^)[ ]{0,3}>.*$/.test(chunk.selection) && chunk.endTag) {
- chunk.endTag = chunk.endTag.replace(/^\n{0,2}/, "\n\n");
+ chunk.endTag = chunk.endTag.replace(/^\n{0,2}/, '\n\n');
}
}
@@ -2040,26 +1977,24 @@
if (!/\n/.test(chunk.selection)) {
chunk.selection = chunk.selection.replace(/^(> *)/,
- function (wholeMatch, blanks) {
+ function(wholeMatch, blanks) {
chunk.startTag += blanks;
- return "";
+ return '';
});
}
};
- commandProto.doCode = function (chunk, postProcessing) {
-
+ commandProto.doCode = function(chunk, postProcessing) {
var hasTextBefore = /\S[ ]*$/.test(chunk.before);
var hasTextAfter = /^[ ]*\S/.test(chunk.after);
// Use 'four space' markdown if the selection is on its own
// line or is multiline.
- if ((!hasTextAfter && !hasTextBefore) || /\n/.test(chunk.selection)) {
-
+ if ((!hasTextAfter && !hasTextBefore) || /\n/.test(chunk.selection)) {
chunk.before = chunk.before.replace(/[ ]{4}$/,
- function (totalMatch) {
+ function(totalMatch) {
chunk.selection = totalMatch + chunk.selection;
- return "";
+ return '';
});
var nLinesBack = 1;
@@ -2075,18 +2010,18 @@
chunk.skipLines(nLinesBack, nLinesForward);
if (!chunk.selection) {
- chunk.startTag = " ";
- chunk.selection = gettext("enter code here");
+ chunk.startTag = ' ';
+ chunk.selection = gettext('enter code here');
}
else {
if (/^[ ]{0,3}\S/m.test(chunk.selection)) {
if (/\n/.test(chunk.selection))
- chunk.selection = chunk.selection.replace(/^/gm, " ");
+ chunk.selection = chunk.selection.replace(/^/gm, ' ');
else // if it's not multiline, do not select the four added spaces; this is more consistent with the doList behavior
- chunk.before += " ";
+ chunk.before += ' ';
}
else {
- chunk.selection = chunk.selection.replace(/^[ ]{4}/gm, "");
+ chunk.selection = chunk.selection.replace(/^[ ]{4}/gm, '');
}
}
}
@@ -2097,23 +2032,22 @@
chunk.findTags(/`/, /`/);
if (!chunk.startTag && !chunk.endTag) {
- chunk.startTag = chunk.endTag = "`";
+ chunk.startTag = chunk.endTag = '`';
if (!chunk.selection) {
- chunk.selection = gettext("enter code here");
+ chunk.selection = gettext('enter code here');
}
}
else if (chunk.endTag && !chunk.startTag) {
chunk.before += chunk.endTag;
- chunk.endTag = "";
+ chunk.endTag = '';
}
else {
- chunk.startTag = chunk.endTag = "";
+ chunk.startTag = chunk.endTag = '';
}
}
};
- commandProto.doList = function (chunk, postProcessing, isNumberedList) {
-
+ commandProto.doList = function(chunk, postProcessing, isNumberedList) {
// These are identical except at the very beginning and end.
// Should probably use the regex extension function to make this clearer.
var previousItemsRegex = /(\n|^)(([ ]{0,3}([*+-]|\d+[.])[ \t]+.*)(\n.+|\n{2,}([*+-].*|\d+[.])[ \t]+.*|\n{2,}[ \t]+\S.*)*)\n*$/;
@@ -2122,27 +2056,26 @@
// The default bullet is a dash but others are possible.
// This has nothing to do with the particular HTML bullet,
// it's just a markdown bullet.
- var bullet = "-";
+ var bullet = '-';
// The number in a numbered list.
var num = 1;
// Get the item prefix - e.g. " 1. " for a numbered list, " - " for a bulleted list.
- var getItemPrefix = function () {
+ var getItemPrefix = function() {
var prefix;
if (isNumberedList) {
- prefix = " " + num + ". ";
+ prefix = ' ' + num + '. ';
num++;
}
else {
- prefix = " " + bullet + " ";
+ prefix = ' ' + bullet + ' ';
}
return prefix;
};
// Fixes the prefixes of the other list items.
- var getPrefixedItem = function (itemText) {
-
+ var getPrefixedItem = function(itemText) {
// The numbering flag is unset when called by autoindent.
if (isNumberedList === undefined) {
isNumberedList = /^\s*\d/.test(itemText);
@@ -2150,7 +2083,7 @@
// Renumber/bullet the list element.
itemText = itemText.replace(/^[ ]{0,3}([*+-]|\d+[.])\s/gm,
- function (_) {
+ function(_) {
return getItemPrefix();
});
@@ -2161,14 +2094,13 @@
if (chunk.before && !/\n$/.test(chunk.before) && !/^\n/.test(chunk.startTag)) {
chunk.before += chunk.startTag;
- chunk.startTag = "";
+ chunk.startTag = '';
}
- if (chunk.startTag) {
-
+ if (chunk.startTag) {
var hasDigits = /\d+[.]/.test(chunk.startTag);
- chunk.startTag = "";
- chunk.selection = chunk.selection.replace(/\n[ ]{4}/g, "\n");
+ chunk.startTag = '';
+ chunk.selection = chunk.selection.replace(/\n[ ]{4}/g, '\n');
this.unwrap(chunk);
chunk.skipLines();
@@ -2184,7 +2116,7 @@
var nLinesUp = 1;
chunk.before = chunk.before.replace(previousItemsRegex,
- function (itemText) {
+ function(itemText) {
if (/^\s*([*+-])/.test(itemText)) {
bullet = re.$1;
}
@@ -2193,7 +2125,7 @@
});
if (!chunk.selection) {
- chunk.selection = gettext("List item");
+ chunk.selection = gettext('List item');
}
var prefix = getItemPrefix();
@@ -2201,7 +2133,7 @@
var nLinesDown = 1;
chunk.after = chunk.after.replace(nextItemsRegex,
- function (itemText) {
+ function(itemText) {
nLinesDown = /[^\n]\n\n[^\n]/.test(itemText) ? 1 : 0;
return getPrefixedItem(itemText);
});
@@ -2209,24 +2141,22 @@
chunk.trimWhitespace(true);
chunk.skipLines(nLinesUp, nLinesDown, true);
chunk.startTag = prefix;
- var spaces = prefix.replace(/./g, " ");
+ var spaces = prefix.replace(/./g, ' ');
this.wrap(chunk, SETTINGS.lineLength - spaces.length);
- chunk.selection = chunk.selection.replace(/\n/g, "\n" + spaces);
-
+ chunk.selection = chunk.selection.replace(/\n/g, '\n' + spaces);
};
- commandProto.doHeading = function (chunk, postProcessing) {
-
+ commandProto.doHeading = function(chunk, postProcessing) {
// Remove leading/trailing whitespace and reduce internal spaces to single spaces.
- chunk.selection = chunk.selection.replace(/\s+/g, " ");
- chunk.selection = chunk.selection.replace(/(^\s+|\s+$)/g, "");
+ chunk.selection = chunk.selection.replace(/\s+/g, ' ');
+ chunk.selection = chunk.selection.replace(/(^\s+|\s+$)/g, '');
// If we clicked the button with no selected text, we just
// make a level 2 hash header around some default text.
if (!chunk.selection) {
- chunk.startTag = "## ";
- chunk.selection = gettext("Heading");
- chunk.endTag = " ##";
+ chunk.startTag = '## ';
+ chunk.selection = gettext('Heading');
+ chunk.endTag = ' ##';
return;
}
@@ -2237,7 +2167,7 @@
if (/#+/.test(chunk.startTag)) {
headerLevel = re.lastMatch.length;
}
- chunk.startTag = chunk.endTag = "";
+ chunk.startTag = chunk.endTag = '';
// Try to get the current header level by looking for - and = in the line
// below the selection.
@@ -2250,7 +2180,7 @@
}
// Skip to the next line so we can create the header markdown.
- chunk.startTag = chunk.endTag = "";
+ chunk.startTag = chunk.endTag = '';
chunk.skipLines(1, 1);
// We make a level 2 header if there is no current header.
@@ -2258,27 +2188,24 @@
// If it's already a level 1 header, it's removed.
var headerLevelToCreate = headerLevel == 0 ? 2 : headerLevel - 1;
- if (headerLevelToCreate > 0) {
-
+ if (headerLevelToCreate > 0) {
// The button only creates level 1 and 2 underline headers.
// Why not have it iterate over hash header levels? Wouldn't that be easier and cleaner?
- var headerChar = headerLevelToCreate >= 2 ? "-" : "=";
+ var headerChar = headerLevelToCreate >= 2 ? '-' : '=';
var len = chunk.selection.length;
if (len > SETTINGS.lineLength) {
len = SETTINGS.lineLength;
}
- chunk.endTag = "\n";
+ chunk.endTag = '\n';
while (len--) {
chunk.endTag += headerChar;
}
}
};
- commandProto.doHorizontalRule = function (chunk, postProcessing) {
- chunk.startTag = "----------\n";
- chunk.selection = "";
+ commandProto.doHorizontalRule = function(chunk, postProcessing) {
+ chunk.startTag = '----------\n';
+ chunk.selection = '';
chunk.skipLines(2, 1, true);
- }
-
-
+ };
})();
diff --git a/lms/static/js/Markdown.Sanitizer.js b/lms/static/js/Markdown.Sanitizer.js
index cc5826fa8f..221673eb59 100644
--- a/lms/static/js/Markdown.Sanitizer.js
+++ b/lms/static/js/Markdown.Sanitizer.js
@@ -1,19 +1,19 @@
-(function () {
+(function() {
var output, Converter;
- if (typeof exports === "object" && typeof require === "function") { // we're in a CommonJS (e.g. Node.js) module
+ if (typeof exports === 'object' && typeof require === 'function') { // we're in a CommonJS (e.g. Node.js) module
output = exports;
- Converter = require("./Markdown.Converter").Converter;
+ Converter = require('./Markdown.Converter').Converter;
} else {
output = window.Markdown;
Converter = output.Converter;
}
-
- output.getSanitizingConverter = function () {
+
+ output.getSanitizingConverter = function() {
var converter = new Converter();
- converter.hooks.chain("postConversion", sanitizeHtml);
- converter.hooks.chain("postConversion", balanceTags);
+ converter.hooks.chain('postConversion', sanitizeHtml);
+ converter.hooks.chain('postConversion', balanceTags);
return converter;
- }
+ };
function sanitizeHtml(html) {
return html.replace(/<[^>]*>?/gi, sanitizeTag);
@@ -31,21 +31,20 @@
if (tag.match(basic_tag_whitelist) || tag.match(a_white) || tag.match(img_white))
return tag;
else
- return "";
+ return '';
}
- ///
- /// attempt to balance HTML tags in the html string
- /// by removing any unmatched opening or closing tags
- /// IMPORTANT: we *assume* HTML has *already* been
- /// sanitized and is safe/sane before balancing!
- ///
- /// adapted from CODESNIPPET: A8591DBA-D1D3-11DE-947C-BA5556D89593
- ///
+ // /
+ // / attempt to balance HTML tags in the html string
+ // / by removing any unmatched opening or closing tags
+ // / IMPORTANT: we *assume* HTML has *already* been
+ // / sanitized and is safe/sane before balancing!
+ // /
+ // / adapted from CODESNIPPET: A8591DBA-D1D3-11DE-947C-BA5556D89593
+ // /
function balanceTags(html) {
-
- if (html == "")
- return "";
+ if (html == '')
+ return '';
var re = /<\/?\w+[^>]*(\s|$|>)/g;
// convert everything to lower case; this makes
@@ -58,7 +57,7 @@
return html;
var tagname, tag;
- var ignoredtags = "![]()
";
+ var ignoredtags = '![]()
';
var match;
var tagpaired = [];
var tagremove = [];
@@ -66,10 +65,10 @@
// loop through matched tags in forward order
for (var ctag = 0; ctag < tagcount; ctag++) {
- tagname = tags[ctag].replace(/<\/?(\w+).*/, "$1");
+ tagname = tags[ctag].replace(/<\/?(\w+).*/, '$1');
// skip any already paired tags
// and skip tags in our ignore list; assume they're self-closed
- if (tagpaired[ctag] || ignoredtags.search("<" + tagname + ">") > -1)
+ if (tagpaired[ctag] || ignoredtags.search('<' + tagname + '>') > -1)
continue;
tag = tags[ctag];
@@ -79,7 +78,7 @@
// this is an opening tag
// search forwards (next tags), look for closing tags
for (var ntag = ctag + 1; ntag < tagcount; ntag++) {
- if (!tagpaired[ntag] && tags[ntag] == "") {
+ if (!tagpaired[ntag] && tags[ntag] == '') {
match = ntag;
break;
}
@@ -98,8 +97,8 @@
// delete all orphaned tags from the string
var ctag = 0;
- html = html.replace(re, function (match) {
- var res = tagremove[ctag] ? "" : match;
+ html = html.replace(re, function(match) {
+ var res = tagremove[ctag] ? '' : match;
ctag++;
return res;
});
diff --git a/lms/static/js/ajax-error.js b/lms/static/js/ajax-error.js
index 6b29d4c24b..b25164d2b8 100644
--- a/lms/static/js/ajax-error.js
+++ b/lms/static/js/ajax-error.js
@@ -1,15 +1,15 @@
-$(document).ajaxError(function (event, jXHR) {
+$(document).ajaxError(function(event, jXHR) {
if (jXHR.status === 403 && jXHR.responseText === 'Unauthenticated') {
var message = gettext(
- 'You have been logged out of your edX account. '+
- 'Click Okay to log in again now. '+
- 'Click Cancel to stay on this page '+
+ 'You have been logged out of your edX account. ' +
+ 'Click Okay to log in again now. ' +
+ 'Click Cancel to stay on this page ' +
'(you must log in again to save your work).'
);
if (window.confirm(message)) {
var currentLocation = window.location.pathname;
window.location.href = '/login?next=' + encodeURIComponent(currentLocation);
- };
+ }
}
});
diff --git a/lms/static/js/api_admin/catalog_preview_factory.js b/lms/static/js/api_admin/catalog_preview_factory.js
index df7c931e86..3db93cfb3f 100644
--- a/lms/static/js/api_admin/catalog_preview_factory.js
+++ b/lms/static/js/api_admin/catalog_preview_factory.js
@@ -1,12 +1,12 @@
-;(function (define) {
+(function(define) {
'use strict';
- define(['js/api_admin/views/catalog_preview'], function (CatalogPreviewView) {
- return function (options) {
+ define(['js/api_admin/views/catalog_preview'], function(CatalogPreviewView) {
+ return function(options) {
var view = new CatalogPreviewView({
el: '.catalog-body',
previewUrl: options.previewUrl,
- catalogApiUrl: options.catalogApiUrl,
+ catalogApiUrl: options.catalogApiUrl
});
return view.render();
};
diff --git a/lms/static/js/api_admin/views/catalog_preview.js b/lms/static/js/api_admin/views/catalog_preview.js
index f32110aa71..866d92f37f 100644
--- a/lms/static/js/api_admin/views/catalog_preview.js
+++ b/lms/static/js/api_admin/views/catalog_preview.js
@@ -1,4 +1,4 @@
-;(function(define) {
+(function(define) {
'use strict';
define([
@@ -7,21 +7,21 @@
'gettext',
'text!../../../templates/api_admin/catalog-results.underscore',
'text!../../../templates/api_admin/catalog-error.underscore'
- ], function (Backbone, _, gettext, catalogResultsTpl, catalogErrorTpl) {
+ ], function(Backbone, _, gettext, catalogResultsTpl, catalogErrorTpl) {
return Backbone.View.extend({
events: {
'click .preview-query': 'previewQuery'
},
- initialize: function (options) {
+ initialize: function(options) {
this.previewUrl = options.previewUrl;
this.catalogApiUrl = options.catalogApiUrl;
},
- render: function () {
+ render: function() {
this.$('#id_query').after(
- ''
+ ''
);
return this;
},
@@ -29,8 +29,8 @@
/*
* Return the user's query, URL-encoded.
*/
- getQuery: function () {
- return encodeURIComponent(this.$("#id_query").val());
+ getQuery: function() {
+ return encodeURIComponent(this.$('#id_query').val());
},
/*
@@ -38,12 +38,12 @@
* with the user's query. On success, displays the
* results, and on failure, displays an error message.
*/
- previewQuery: function (event) {
+ previewQuery: function(event) {
event.preventDefault();
$.ajax(this.previewUrl + '?q=' + this.getQuery(), {
method: 'GET',
success: _.bind(this.renderCourses, this),
- error: _.bind(function () {
+ error: _.bind(function() {
this.$('.preview-results').html(_.template(catalogErrorTpl)({}));
}, this)
});
@@ -53,12 +53,12 @@
* Render a list of courses with data returned by the
* courses API.
*/
- renderCourses: function (data) {
+ renderCourses: function(data) {
this.$('.preview-results').html(_.template(catalogResultsTpl)({
'courses': data.results,
- 'catalogApiUrl': this.catalogApiUrl,
+ 'catalogApiUrl': this.catalogApiUrl
}));
- },
+ }
});
});
}).call(this, define || RequireJS.define);
diff --git a/lms/static/js/bookmarks/collections/bookmarks.js b/lms/static/js/bookmarks/collections/bookmarks.js
index 8da8c24ed7..ffedc9ef2a 100644
--- a/lms/static/js/bookmarks/collections/bookmarks.js
+++ b/lms/static/js/bookmarks/collections/bookmarks.js
@@ -1,29 +1,28 @@
-;(function (define) {
+(function(define) {
'use strict';
define([
'backbone',
'edx-ui-toolkit/js/pagination/paging-collection',
'js/bookmarks/models/bookmark'
- ], function (Backbone, PagingCollection, BookmarkModel) {
- return PagingCollection.extend({
- model: BookmarkModel,
+ ], function(Backbone, PagingCollection, BookmarkModel) {
+ return PagingCollection.extend({
+ model: BookmarkModel,
- queryParams: {
- course_id: function () { return this.options.course_id; },
- fields : function () { return 'display_name,path'; }
- },
+ queryParams: {
+ course_id: function() { return this.options.course_id; },
+ fields: function() { return 'display_name,path'; }
+ },
- url: function() {
- return this.url;
- },
+ url: function() {
+ return this.url;
+ },
- constructor: function (models, options) {
- this.options = options;
- this.url = options.url;
- PagingCollection.prototype.constructor.call(this, models, options);
- }
- });
+ constructor: function(models, options) {
+ this.options = options;
+ this.url = options.url;
+ PagingCollection.prototype.constructor.call(this, models, options);
+ }
+ });
});
-
})(define || RequireJS.define);
diff --git a/lms/static/js/bookmarks/models/bookmark.js b/lms/static/js/bookmarks/models/bookmark.js
index 57c50c30e5..3f0e7c6e17 100644
--- a/lms/static/js/bookmarks/models/bookmark.js
+++ b/lms/static/js/bookmarks/models/bookmark.js
@@ -1,7 +1,6 @@
-;(function (define) {
+(function(define) {
'use strict';
- define(['backbone'], function (Backbone) {
-
+ define(['backbone'], function(Backbone) {
return Backbone.Model.extend({
idAttribute: 'id',
defaults: {
@@ -12,10 +11,9 @@
created: ''
},
- blockUrl: function () {
+ blockUrl: function() {
return '/courses/' + this.get('course_id') + '/jump_to/' + this.get('usage_id');
}
});
});
-
})(define || RequireJS.define);
diff --git a/lms/static/js/bookmarks/views/bookmark_button.js b/lms/static/js/bookmarks/views/bookmark_button.js
index fd2574e156..642e184020 100644
--- a/lms/static/js/bookmarks/views/bookmark_button.js
+++ b/lms/static/js/bookmarks/views/bookmark_button.js
@@ -1,115 +1,114 @@
-;(function (define, undefined) {
+(function(define, undefined) {
'use strict';
define(['gettext', 'jquery', 'underscore', 'backbone', 'js/views/message_banner'],
- function (gettext, $, _, Backbone, MessageBannerView) {
+ function(gettext, $, _, Backbone, MessageBannerView) {
+ return Backbone.View.extend({
+ errorMessage: gettext('An error has occurred. Please try again.'),
- return Backbone.View.extend({
- errorMessage: gettext('An error has occurred. Please try again.'),
+ srAddBookmarkText: gettext('Click to add'),
+ srRemoveBookmarkText: gettext('Click to remove'),
- srAddBookmarkText: gettext('Click to add'),
- srRemoveBookmarkText: gettext('Click to remove'),
+ events: {
+ 'click': 'toggleBookmark'
+ },
- events: {
- 'click': 'toggleBookmark'
- },
+ showBannerInterval: 5000, // time in ms
- showBannerInterval: 5000, // time in ms
+ initialize: function(options) {
+ this.apiUrl = options.apiUrl;
+ this.bookmarkId = options.bookmarkId;
+ this.bookmarked = options.bookmarked;
+ this.usageId = options.usageId;
+ this.setBookmarkState(this.bookmarked);
+ },
- initialize: function (options) {
- this.apiUrl = options.apiUrl;
- this.bookmarkId = options.bookmarkId;
- this.bookmarked = options.bookmarked;
- this.usageId = options.usageId;
- this.setBookmarkState(this.bookmarked);
- },
+ toggleBookmark: function(event) {
+ event.preventDefault();
- toggleBookmark: function(event) {
- event.preventDefault();
+ this.$el.prop('disabled', true);
- this.$el.prop('disabled', true);
+ if (this.$el.hasClass('bookmarked')) {
+ this.removeBookmark();
+ } else {
+ this.addBookmark();
+ }
+ },
- if (this.$el.hasClass('bookmarked')) {
- this.removeBookmark();
- } else {
- this.addBookmark();
- }
- },
-
- addBookmark: function() {
- var view = this;
- $.ajax({
- data: {usage_id: view.usageId},
- type: "POST",
- url: view.apiUrl,
- dataType: 'json',
- success: function () {
- view.$el.trigger('bookmark:add');
- view.setBookmarkState(true);
- },
- error: function (jqXHR) {
- try {
- var response = jqXHR.responseText ? JSON.parse(jqXHR.responseText) : '';
- var userMessage = response ? response.user_message : '';
- view.showError(userMessage);
- }
- catch(err) {
+ addBookmark: function() {
+ var view = this;
+ $.ajax({
+ data: {usage_id: view.usageId},
+ type: 'POST',
+ url: view.apiUrl,
+ dataType: 'json',
+ success: function() {
+ view.$el.trigger('bookmark:add');
+ view.setBookmarkState(true);
+ },
+ error: function(jqXHR) {
+ try {
+ var response = jqXHR.responseText ? JSON.parse(jqXHR.responseText) : '';
+ var userMessage = response ? response.user_message : '';
+ view.showError(userMessage);
+ }
+ catch (err) {
view.showError();
}
- },
- complete: function () {
- view.$el.prop('disabled', false);
- }
- });
- },
-
- removeBookmark: function() {
- var view = this;
- var deleteUrl = view.apiUrl + view.bookmarkId + '/';
-
- $.ajax({
- type: "DELETE",
- url: deleteUrl,
- success: function () {
- view.$el.trigger('bookmark:remove');
- view.setBookmarkState(false);
- },
- error: function() {
- view.showError();
- },
- complete: function() {
- view.$el.prop('disabled', false);
- }
- });
- },
-
- setBookmarkState: function(bookmarked) {
- if (bookmarked) {
- this.$el.addClass('bookmarked');
- this.$el.attr('aria-pressed', 'true');
- this.$el.find('.bookmark-sr').text(this.srRemoveBookmarkText);
- } else {
- this.$el.removeClass('bookmarked');
- this.$el.attr('aria-pressed', 'false');
- this.$el.find('.bookmark-sr').text(this.srAddBookmarkText);
- }
- },
-
- showError: function (errorText) {
- var errorMsg = errorText || this.errorMessage;
-
- if (!this.messageView) {
- this.messageView = new MessageBannerView({
- el: $('.message-banner'),
- type: 'error'
+ },
+ complete: function() {
+ view.$el.prop('disabled', false);
+ }
});
- }
- this.messageView.showMessage(errorMsg);
+ },
+
+ removeBookmark: function() {
+ var view = this;
+ var deleteUrl = view.apiUrl + view.bookmarkId + '/';
+
+ $.ajax({
+ type: 'DELETE',
+ url: deleteUrl,
+ success: function() {
+ view.$el.trigger('bookmark:remove');
+ view.setBookmarkState(false);
+ },
+ error: function() {
+ view.showError();
+ },
+ complete: function() {
+ view.$el.prop('disabled', false);
+ }
+ });
+ },
+
+ setBookmarkState: function(bookmarked) {
+ if (bookmarked) {
+ this.$el.addClass('bookmarked');
+ this.$el.attr('aria-pressed', 'true');
+ this.$el.find('.bookmark-sr').text(this.srRemoveBookmarkText);
+ } else {
+ this.$el.removeClass('bookmarked');
+ this.$el.attr('aria-pressed', 'false');
+ this.$el.find('.bookmark-sr').text(this.srAddBookmarkText);
+ }
+ },
+
+ showError: function(errorText) {
+ var errorMsg = errorText || this.errorMessage;
+
+ if (!this.messageView) {
+ this.messageView = new MessageBannerView({
+ el: $('.message-banner'),
+ type: 'error'
+ });
+ }
+ this.messageView.showMessage(errorMsg);
// Hide message automatically after some interval
- setTimeout(_.bind(function () {
- this.messageView.hideMessage();
- }, this), this.showBannerInterval);
- }
+ setTimeout(_.bind(function() {
+ this.messageView.hideMessage();
+ }, this), this.showBannerInterval);
+ }
+ });
});
- });
}).call(this, define || RequireJS.define);
diff --git a/lms/static/js/bookmarks/views/bookmarks_list.js b/lms/static/js/bookmarks/views/bookmarks_list.js
index 38a7688d9a..18db4360a3 100644
--- a/lms/static/js/bookmarks/views/bookmarks_list.js
+++ b/lms/static/js/bookmarks/views/bookmarks_list.js
@@ -1,133 +1,132 @@
-;(function (define, undefined) {
+(function(define, undefined) {
'use strict';
define(['gettext', 'jquery', 'underscore', 'backbone', 'logger', 'moment', 'edx-ui-toolkit/js/utils/html-utils',
'common/js/components/views/paging_header', 'common/js/components/views/paging_footer',
'text!templates/bookmarks/bookmarks-list.underscore'
],
- function (gettext, $, _, Backbone, Logger, _moment, HtmlUtils,
+ function(gettext, $, _, Backbone, Logger, _moment, HtmlUtils,
PagingHeaderView, PagingFooterView, BookmarksListTemplate) {
+ var moment = _moment || window.moment;
- var moment = _moment || window.moment;
+ return Backbone.View.extend({
- return Backbone.View.extend({
+ el: '.courseware-results',
+ coursewareContentEl: '#course-content',
+ coursewareResultsWrapperEl: '.courseware-results-wrapper',
- el: '.courseware-results',
- coursewareContentEl: '#course-content',
- coursewareResultsWrapperEl: '.courseware-results-wrapper',
+ errorIcon: '',
+ loadingIcon: '',
- errorIcon: '',
- loadingIcon: '',
+ errorMessage: gettext('An error has occurred. Please try again.'),
+ loadingMessage: gettext('Loading'),
- errorMessage: gettext('An error has occurred. Please try again.'),
- loadingMessage: gettext('Loading'),
+ defaultPage: 1,
- defaultPage: 1,
+ events: {
+ 'click .bookmarks-results-list-item': 'visitBookmark'
+ },
- events : {
- 'click .bookmarks-results-list-item': 'visitBookmark'
- },
+ initialize: function(options) {
+ this.template = HtmlUtils.template(BookmarksListTemplate);
+ this.loadingMessageView = options.loadingMessageView;
+ this.errorMessageView = options.errorMessageView;
+ this.langCode = $(this.el).data('langCode');
+ this.pagingHeaderView = new PagingHeaderView({collection: this.collection});
+ this.pagingFooterView = new PagingFooterView({collection: this.collection});
+ this.listenTo(this.collection, 'page_changed', this.render);
+ _.bindAll(this, 'render', 'humanFriendlyDate');
+ },
- initialize: function (options) {
- this.template = HtmlUtils.template(BookmarksListTemplate);
- this.loadingMessageView = options.loadingMessageView;
- this.errorMessageView = options.errorMessageView;
- this.langCode = $(this.el).data('langCode');
- this.pagingHeaderView = new PagingHeaderView({collection: this.collection});
- this.pagingFooterView = new PagingFooterView({collection: this.collection});
- this.listenTo(this.collection, 'page_changed', this.render);
- _.bindAll(this, 'render', 'humanFriendlyDate');
- },
+ render: function() {
+ var data = {
+ bookmarksCollection: this.collection,
+ humanFriendlyDate: this.humanFriendlyDate
+ };
- render: function () {
- var data = {
- bookmarksCollection: this.collection,
- humanFriendlyDate: this.humanFriendlyDate
- };
+ HtmlUtils.setHtml(this.$el, this.template(data));
+ this.pagingHeaderView.setElement(this.$('.paging-header')).render();
+ this.pagingFooterView.setElement(this.$('.paging-footer')).render();
+ this.delegateEvents();
+ return this;
+ },
- HtmlUtils.setHtml(this.$el, this.template(data));
- this.pagingHeaderView.setElement(this.$('.paging-header')).render();
- this.pagingFooterView.setElement(this.$('.paging-footer')).render();
- this.delegateEvents();
- return this;
- },
+ showBookmarks: function() {
+ var view = this;
- showBookmarks: function () {
- var view = this;
+ this.hideErrorMessage();
+ this.showBookmarksContainer();
- this.hideErrorMessage();
- this.showBookmarksContainer();
+ this.collection.getPage(this.defaultPage).done(function() {
+ view.render();
+ view.focusBookmarksElement();
+ }).fail(function() {
+ view.showErrorMessage();
+ });
+ },
- this.collection.getPage(this.defaultPage).done(function () {
- view.render();
- view.focusBookmarksElement();
- }).fail(function () {
- view.showErrorMessage();
- });
- },
-
- visitBookmark: function (event) {
- var bookmarkedComponent = $(event.currentTarget);
- var bookmark_id = bookmarkedComponent.data('bookmarkId');
- var component_usage_id = bookmarkedComponent.data('usageId');
- var component_type = bookmarkedComponent.data('componentType');
- Logger.log(
+ visitBookmark: function(event) {
+ var bookmarkedComponent = $(event.currentTarget);
+ var bookmark_id = bookmarkedComponent.data('bookmarkId');
+ var component_usage_id = bookmarkedComponent.data('usageId');
+ var component_type = bookmarkedComponent.data('componentType');
+ Logger.log(
'edx.bookmark.accessed',
- {
- bookmark_id: bookmark_id,
- component_type: component_type,
- component_usage_id: component_usage_id
- }
- ).always(function () {
+ {
+ bookmark_id: bookmark_id,
+ component_type: component_type,
+ component_usage_id: component_usage_id
+ }
+ ).always(function() {
window.location.href = event.currentTarget.pathname;
});
- },
+ },
/**
* Convert ISO 8601 formatted date into human friendly format. e.g, `2014-05-23T14:00:00Z` to `May 23, 2014`
* @param {String} isoDate - ISO 8601 formatted date string.
*/
- humanFriendlyDate: function (isoDate) {
- moment.locale(this.langCode);
- return moment(isoDate).format('LL');
- },
+ humanFriendlyDate: function(isoDate) {
+ moment.locale(this.langCode);
+ return moment(isoDate).format('LL');
+ },
- areBookmarksVisible: function () {
- return this.$('#my-bookmarks').is(":visible");
- },
+ areBookmarksVisible: function() {
+ return this.$('#my-bookmarks').is(':visible');
+ },
- hideBookmarks: function () {
- this.$el.hide();
- $(this.coursewareResultsWrapperEl).hide();
- $(this.coursewareContentEl).css( 'display', 'table-cell');
- },
+ hideBookmarks: function() {
+ this.$el.hide();
+ $(this.coursewareResultsWrapperEl).hide();
+ $(this.coursewareContentEl).css('display', 'table-cell');
+ },
- showBookmarksContainer: function () {
- $(this.coursewareContentEl).hide();
+ showBookmarksContainer: function() {
+ $(this.coursewareContentEl).hide();
// Empty el if it's not empty to get the clean state.
- this.$el.html('');
- this.$el.show();
- $(this.coursewareResultsWrapperEl).css('display', 'table-cell');
- },
+ this.$el.html('');
+ this.$el.show();
+ $(this.coursewareResultsWrapperEl).css('display', 'table-cell');
+ },
- showLoadingMessage: function () {
- this.loadingMessageView.showMessage(this.loadingMessage, this.loadingIcon);
- },
+ showLoadingMessage: function() {
+ this.loadingMessageView.showMessage(this.loadingMessage, this.loadingIcon);
+ },
- hideLoadingMessage: function () {
- this.loadingMessageView.hideMessage();
- },
+ hideLoadingMessage: function() {
+ this.loadingMessageView.hideMessage();
+ },
- showErrorMessage: function () {
- this.errorMessageView.showMessage(this.errorMessage, this.errorIcon);
- },
+ showErrorMessage: function() {
+ this.errorMessageView.showMessage(this.errorMessage, this.errorIcon);
+ },
- hideErrorMessage: function () {
- this.errorMessageView.hideMessage();
- },
+ hideErrorMessage: function() {
+ this.errorMessageView.hideMessage();
+ },
- focusBookmarksElement: function () {
- this.$('#my-bookmarks').focus();
- }
+ focusBookmarksElement: function() {
+ this.$('#my-bookmarks').focus();
+ }
+ });
});
- });
}).call(this, define || RequireJS.define);
diff --git a/lms/static/js/bookmarks/views/bookmarks_list_button.js b/lms/static/js/bookmarks/views/bookmarks_list_button.js
index 0227e285c9..6fb74e6543 100644
--- a/lms/static/js/bookmarks/views/bookmarks_list_button.js
+++ b/lms/static/js/bookmarks/views/bookmarks_list_button.js
@@ -1,47 +1,46 @@
-;(function (define, undefined) {
+(function(define, undefined) {
'use strict';
define(['gettext', 'jquery', 'underscore', 'backbone', 'js/bookmarks/views/bookmarks_list',
'js/bookmarks/collections/bookmarks', 'js/views/message_banner'],
- function (gettext, $, _, Backbone, BookmarksListView, BookmarksCollection, MessageBannerView) {
+ function(gettext, $, _, Backbone, BookmarksListView, BookmarksCollection, MessageBannerView) {
+ return Backbone.View.extend({
- return Backbone.View.extend({
+ el: '.courseware-bookmarks-button',
- el: '.courseware-bookmarks-button',
+ loadingMessageElement: '#loading-message',
+ errorMessageElement: '#error-message',
- loadingMessageElement: '#loading-message',
- errorMessageElement: '#error-message',
+ events: {
+ 'click .bookmarks-list-button': 'toggleBookmarksListView'
+ },
- events: {
- 'click .bookmarks-list-button': 'toggleBookmarksListView'
- },
-
- initialize: function () {
- var bookmarksCollection = new BookmarksCollection([],
- {
- course_id: $('.courseware-results').data('courseId'),
- url: $('.courseware-bookmarks-button').data('bookmarksApiUrl')
- }
+ initialize: function() {
+ var bookmarksCollection = new BookmarksCollection([],
+ {
+ course_id: $('.courseware-results').data('courseId'),
+ url: $('.courseware-bookmarks-button').data('bookmarksApiUrl')
+ }
);
- this.bookmarksListView = new BookmarksListView(
- {
- collection: bookmarksCollection,
- loadingMessageView: new MessageBannerView({el: $(this.loadingMessageElement)}),
- errorMessageView: new MessageBannerView({el: $(this.errorMessageElement)})
- }
+ this.bookmarksListView = new BookmarksListView(
+ {
+ collection: bookmarksCollection,
+ loadingMessageView: new MessageBannerView({el: $(this.loadingMessageElement)}),
+ errorMessageView: new MessageBannerView({el: $(this.errorMessageElement)})
+ }
);
- },
+ },
- toggleBookmarksListView: function () {
- if (this.bookmarksListView.areBookmarksVisible()) {
- this.bookmarksListView.hideBookmarks();
- this.$('.bookmarks-list-button').attr('aria-pressed', 'false');
- this.$('.bookmarks-list-button').removeClass('is-active').addClass('is-inactive');
- } else {
- this.bookmarksListView.showBookmarks();
- this.$('.bookmarks-list-button').attr('aria-pressed', 'true');
- this.$('.bookmarks-list-button').removeClass('is-inactive').addClass('is-active');
+ toggleBookmarksListView: function() {
+ if (this.bookmarksListView.areBookmarksVisible()) {
+ this.bookmarksListView.hideBookmarks();
+ this.$('.bookmarks-list-button').attr('aria-pressed', 'false');
+ this.$('.bookmarks-list-button').removeClass('is-active').addClass('is-inactive');
+ } else {
+ this.bookmarksListView.showBookmarks();
+ this.$('.bookmarks-list-button').attr('aria-pressed', 'true');
+ this.$('.bookmarks-list-button').removeClass('is-inactive').addClass('is-active');
+ }
}
- }
+ });
});
- });
}).call(this, define || RequireJS.define);
diff --git a/lms/static/js/ccx/schedule.js b/lms/static/js/ccx/schedule.js
index eb643e45d9..0fd2a75496 100644
--- a/lms/static/js/ccx/schedule.js
+++ b/lms/static/js/ccx/schedule.js
@@ -1,535 +1,535 @@
var edx = edx || {};
(function($, _, Backbone, gettext) {
- 'use strict';
+ 'use strict';
- edx.ccx = edx.ccx || {};
- edx.ccx.schedule = edx.ccx.schedule || {};
- var self;
+ edx.ccx = edx.ccx || {};
+ edx.ccx.schedule = edx.ccx.schedule || {};
+ var self;
- edx.ccx.schedule.reloadPage = function() {
- location.reload();
- };
+ edx.ccx.schedule.reloadPage = function() {
+ location.reload();
+ };
- edx.ccx.schedule.UnitModel = Backbone.Model.extend({
- defaults: {
- location: '',
- display_name: '',
- start: null,
- due: null,
- category: '',
- hidden: false,
- children: []
- }
- });
+ edx.ccx.schedule.UnitModel = Backbone.Model.extend({
+ defaults: {
+ location: '',
+ display_name: '',
+ start: null,
+ due: null,
+ category: '',
+ hidden: false,
+ children: []
+ }
+ });
- edx.ccx.schedule.Schedule = Backbone.Collection.extend({
- model: edx.ccx.schedule.UnitModel,
- url: 'ccx_schedule'
- });
+ edx.ccx.schedule.Schedule = Backbone.Collection.extend({
+ model: edx.ccx.schedule.UnitModel,
+ url: 'ccx_schedule'
+ });
- edx.ccx.schedule.ScheduleView = Backbone.View.extend({
+ edx.ccx.schedule.ScheduleView = Backbone.View.extend({
- initialize: function() {
- _.bindAll(this, 'render');
- this.schedule_collection = new edx.ccx.schedule.Schedule();
- this.schedule = {};
- this.schedule_collection.bind('reset', this.render);
- this.schedule_collection.fetch({reset: true});
- this.chapter_select = $('form#add-unit select[name="chapter"]');
- this.sequential_select = $('form#add-unit select[name="sequential"]');
- this.vertical_select = $('form#add-unit select[name="vertical"]');
- this.dirty = false;
- self = this;
- $('#add-all').on('click', function(event) {
- event.preventDefault();
- self.schedule_apply(self.schedule, self.show);
- self.dirty = true;
- self.schedule_collection.set(self.schedule);
- self.render();
- });
+ initialize: function() {
+ _.bindAll(this, 'render');
+ this.schedule_collection = new edx.ccx.schedule.Schedule();
+ this.schedule = {};
+ this.schedule_collection.bind('reset', this.render);
+ this.schedule_collection.fetch({reset: true});
+ this.chapter_select = $('form#add-unit select[name="chapter"]');
+ this.sequential_select = $('form#add-unit select[name="sequential"]');
+ this.vertical_select = $('form#add-unit select[name="vertical"]');
+ this.dirty = false;
+ self = this;
+ $('#add-all').on('click', function(event) {
+ event.preventDefault();
+ self.schedule_apply(self.schedule, self.show);
+ self.dirty = true;
+ self.schedule_collection.set(self.schedule);
+ self.render();
+ });
// By default input date and time fileds are disable.
- self.disableFields($('.ccx_due_date_time_fields'));
- self.disableFields($('.ccx_start_date_time_fields'));
+ self.disableFields($('.ccx_due_date_time_fields'));
+ self.disableFields($('.ccx_start_date_time_fields'));
// Add unit handlers
- this.chapter_select.on('change', function() {
- var chapter_location = self.chapter_select.val();
- self.vertical_select.html('').prop('disabled', true);
- if (chapter_location !== 'none') {
- var chapter = self.find_unit(self.hidden, chapter_location);
- self.sequential_select.html('')
- .append('')
+ this.chapter_select.on('change', function() {
+ var chapter_location = self.chapter_select.val();
+ self.vertical_select.html('').prop('disabled', true);
+ if (chapter_location !== 'none') {
+ var chapter = self.find_unit(self.hidden, chapter_location);
+ self.sequential_select.html('')
+ .append('')
.append(self.schedule_options(chapter.children));
- self.sequential_select.prop('disabled', false);
- $('#add-unit-button').prop('disabled', false);
+ self.sequential_select.prop('disabled', false);
+ $('#add-unit-button').prop('disabled', false);
// When a chapter is selected, start date fields are enabled and due date
// fields are disabled because due dates are not applicable on a chapter.
- self.disableFields($('.ccx_due_date_time_fields'));
- self.enableFields($('.ccx_start_date_time_fields'));
- } else {
- self.sequential_select.html('').prop('disabled', true);
+ self.disableFields($('.ccx_due_date_time_fields'));
+ self.enableFields($('.ccx_start_date_time_fields'));
+ } else {
+ self.sequential_select.html('').prop('disabled', true);
// When no chapter is selected, all date fields are disabled.
- self.disableFields($('.ccx_due_date_time_fields'));
- self.disableFields($('.ccx_start_date_time_fields'));
- }
- });
+ self.disableFields($('.ccx_due_date_time_fields'));
+ self.disableFields($('.ccx_start_date_time_fields'));
+ }
+ });
- this.sequential_select.on('change', function() {
- var sequential_location = self.sequential_select.val();
- if (sequential_location !== 'all') {
- var chapter = self.chapter_select.val(),
- sequential = self.find_unit(self.hidden, chapter, sequential_location);
- self.vertical_select.html('')
- .append('')
+ this.sequential_select.on('change', function() {
+ var sequential_location = self.sequential_select.val();
+ if (sequential_location !== 'all') {
+ var chapter = self.chapter_select.val(),
+ sequential = self.find_unit(self.hidden, chapter, sequential_location);
+ self.vertical_select.html('')
+ .append('')
.append(self.schedule_options(sequential.children));
- self.vertical_select.prop('disabled', false);
- self.set_datetime('start', sequential.start);
- self.set_datetime('due', sequential.due);
+ self.vertical_select.prop('disabled', false);
+ self.set_datetime('start', sequential.start);
+ self.set_datetime('due', sequential.due);
// When a subsection (aka sequential) is selected,
// both start and due date fields are enabled.
- self.enableFields($('.ccx_due_date_time_fields'));
- self.enableFields($('.ccx_start_date_time_fields'));
- } else {
+ self.enableFields($('.ccx_due_date_time_fields'));
+ self.enableFields($('.ccx_start_date_time_fields'));
+ } else {
// When "All subsections" is selected, all date fields are disabled.
- self.vertical_select.html('').prop('disabled', true);
- self.disableFields($('.ccx_due_date_time_fields'));
- self.enableFields($('.ccx_start_date_time_fields'));
- }
- });
+ self.vertical_select.html('').prop('disabled', true);
+ self.disableFields($('.ccx_due_date_time_fields'));
+ self.enableFields($('.ccx_start_date_time_fields'));
+ }
+ });
- this.vertical_select.on('change', function() {
- var vertical_location = self.vertical_select.val();
- if (vertical_location !== 'all') {
- var chapter = self.chapter_select.val(),
- sequential = self.sequential_select.val();
- var vertical = self.find_unit(
+ this.vertical_select.on('change', function() {
+ var vertical_location = self.vertical_select.val();
+ if (vertical_location !== 'all') {
+ var chapter = self.chapter_select.val(),
+ sequential = self.sequential_select.val();
+ var vertical = self.find_unit(
self.hidden, chapter, sequential, vertical_location);
// When a unit (aka vertical) is selected, all date fields are disabled because units
// inherit dates from subsection
- self.disableFields($('.ccx_due_date_time_fields'));
- self.disableFields($('.ccx_start_date_time_fields'));
- } else {
+ self.disableFields($('.ccx_due_date_time_fields'));
+ self.disableFields($('.ccx_start_date_time_fields'));
+ } else {
// When "All units" is selected, all date fields are enabled,
// because units inherit dates from subsections and we
// are showing dates from the selected subsection.
- self.enableFields($('.ccx_due_date_time_fields'));
- self.enableFields($('.ccx_start_date_time_fields'));
- }
- });
+ self.enableFields($('.ccx_due_date_time_fields'));
+ self.enableFields($('.ccx_start_date_time_fields'));
+ }
+ });
// Add unit handler
- $('#add-unit-button').on('click', function(event) {
- event.preventDefault();
+ $('#add-unit-button').on('click', function(event) {
+ event.preventDefault();
// Default value of time is 00:00.
- var start, chapter, sequential, vertical, units, due;
- start = self.get_datetime('start');
- chapter = self.chapter_select.val();
- sequential = self.sequential_select.val();
- vertical = self.vertical_select.val();
- units = self.find_lineage(
+ var start, chapter, sequential, vertical, units, due;
+ start = self.get_datetime('start');
+ chapter = self.chapter_select.val();
+ sequential = self.sequential_select.val();
+ vertical = self.vertical_select.val();
+ units = self.find_lineage(
self.schedule,
chapter,
sequential === 'all' ? null : sequential,
vertical === 'all' ? null : vertical
);
- due = self.get_datetime('due');
- var errorMessage = self.valid_dates(start, due);
- if (_.isUndefined(errorMessage)) {
- units.map(self.show);
- var unit = units[units.length - 1];
- if (!_.isUndefined(unit)) {
- if (!_.isNull(start)) {
- unit.start = start;
- }
- if (!_.isNull(due)) {
- unit.due = due;
- }
- }
- self.schedule_apply([unit], self.show);
- self.schedule_collection.set(self.schedule);
- self.dirty = true;
- self.render();
- } else {
- self.dirty = false;
- $('#ccx_schedule_error_message').text(errorMessage);
- $('#ajax-error').show().focus();
- $('#dirty-schedule').hide();
- }
- });
+ due = self.get_datetime('due');
+ var errorMessage = self.valid_dates(start, due);
+ if (_.isUndefined(errorMessage)) {
+ units.map(self.show);
+ var unit = units[units.length - 1];
+ if (!_.isUndefined(unit)) {
+ if (!_.isNull(start)) {
+ unit.start = start;
+ }
+ if (!_.isNull(due)) {
+ unit.due = due;
+ }
+ }
+ self.schedule_apply([unit], self.show);
+ self.schedule_collection.set(self.schedule);
+ self.dirty = true;
+ self.render();
+ } else {
+ self.dirty = false;
+ $('#ccx_schedule_error_message').text(errorMessage);
+ $('#ajax-error').show().focus();
+ $('#dirty-schedule').hide();
+ }
+ });
// Handle save button
- $('#dirty-schedule #save-changes').on('click', function(event) {
- event.preventDefault();
- self.save();
- });
- }, // end initialization
+ $('#dirty-schedule #save-changes').on('click', function(event) {
+ event.preventDefault();
+ self.save();
+ });
+ }, // end initialization
- render: function() {
- self.schedule = this.schedule_collection.toJSON();
- self.hidden = this.pruned(self.schedule, function(node) {
- return node.hidden || node.category !== 'vertical';
- });
- this.showing = this.pruned(self.schedule, function(node) {
- return !node.hidden;
- });
+ render: function() {
+ self.schedule = this.schedule_collection.toJSON();
+ self.hidden = this.pruned(self.schedule, function(node) {
+ return node.hidden || node.category !== 'vertical';
+ });
+ this.showing = this.pruned(self.schedule, function(node) {
+ return !node.hidden;
+ });
// schedule_template defined globally in ccx\schedule.html
/* globals schedule_template */
- this.$el.html(schedule_template({chapters: this.showing}));
- $('table.ccx-schedule .sequential,.vertical').hide();
- $('table.ccx-schedule .unit .toggle-collapse').on('click', this.toggle_collapse);
+ this.$el.html(schedule_template({chapters: this.showing}));
+ $('table.ccx-schedule .sequential,.vertical').hide();
+ $('table.ccx-schedule .unit .toggle-collapse').on('click', this.toggle_collapse);
// Hidden hover fields for empty date fields
- $('table.ccx-schedule .date button').each(function() {
- if ($(this).text().trim() === gettext("Click to change")) {
- $(this).html('Set date ' +
- gettext("Click to change") + '');
- }
- });
+ $('table.ccx-schedule .date button').each(function() {
+ if ($(this).text().trim() === gettext('Click to change')) {
+ $(this).html('Set date ' +
+ gettext('Click to change') + '');
+ }
+ });
// Handle date edit clicks
- $('table.ccx-schedule .date button').attr('href', '#enter-date-modal')
+ $('table.ccx-schedule .date button').attr('href', '#enter-date-modal')
.leanModal({closeButton: '.close-modal'});
- $('table.ccx-schedule .due-date button').on('click', this.enterNewDate('due'));
- $('table.ccx-schedule .start-date button').on('click', this.enterNewDate('start'));
+ $('table.ccx-schedule .due-date button').on('click', this.enterNewDate('due'));
+ $('table.ccx-schedule .start-date button').on('click', this.enterNewDate('start'));
// click handler for expand all
- $('#ccx_expand_all_btn').on('click', self.expandAll);
+ $('#ccx_expand_all_btn').on('click', self.expandAll);
// click handler for collapse all
- $('#ccx_collapse_all_btn').on('click', self.collapseAll);
+ $('#ccx_collapse_all_btn').on('click', self.collapseAll);
// Click handler for remove all
- $('table.ccx-schedule button#remove-all').on('click', function(event) {
- event.preventDefault();
- self.schedule_apply(self.schedule, self.hide);
- self.dirty = true;
- self.schedule_collection.set(self.schedule);
- self.render();
- });
+ $('table.ccx-schedule button#remove-all').on('click', function(event) {
+ event.preventDefault();
+ self.schedule_apply(self.schedule, self.hide);
+ self.dirty = true;
+ self.schedule_collection.set(self.schedule);
+ self.render();
+ });
// Remove unit handler
- $('table.ccx-schedule button.remove-unit').on('click', function() {
- var row = $(this).closest('tr'),
- path = row.data('location').split(' '),
- unit = self.find_unit(self.schedule, path[0], path[1], path[2]);
- self.schedule_apply([unit], self.hide);
- self.schedule_collection.set(self.schedule);
- self.dirty = true;
- self.render();
- });
+ $('table.ccx-schedule button.remove-unit').on('click', function() {
+ var row = $(this).closest('tr'),
+ path = row.data('location').split(' '),
+ unit = self.find_unit(self.schedule, path[0], path[1], path[2]);
+ self.schedule_apply([unit], self.hide);
+ self.schedule_collection.set(self.schedule);
+ self.dirty = true;
+ self.render();
+ });
// Show or hide form
- if (this.hidden.length) {
+ if (this.hidden.length) {
// Populate chapters select, depopulate others
- this.chapter_select.html('')
- .append('')
+ this.chapter_select.html('')
+ .append('')
.append(self.schedule_options(this.hidden));
- this.sequential_select.html('').prop('disabled', true);
- this.vertical_select.html('').prop('disabled', true);
- $('form#add-unit').show();
- $('#all-units-added').hide();
- $('#add-unit-button').prop('disabled', true);
- } else {
- $('form#add-unit').hide();
- $('#all-units-added').show();
- }
+ this.sequential_select.html('').prop('disabled', true);
+ this.vertical_select.html('').prop('disabled', true);
+ $('form#add-unit').show();
+ $('#all-units-added').hide();
+ $('#add-unit-button').prop('disabled', true);
+ } else {
+ $('form#add-unit').hide();
+ $('#all-units-added').show();
+ }
// Show or hide save button
- if (this.dirty) {
- $('#dirty-schedule').show();
- $('html, body').animate(
- { scrollTop: $('#dirty-schedule').offset().top },
- 'slow', function() {$('#dirty-schedule').focus();
- });
- } else {
- $('#dirty-schedule').hide();
- }
- $('#ajax-error').hide();
+ if (this.dirty) {
+ $('#dirty-schedule').show();
+ $('html, body').animate(
+ {scrollTop: $('#dirty-schedule').offset().top},
+ 'slow', function() { $('#dirty-schedule').focus();
+ });
+ } else {
+ $('#dirty-schedule').hide();
+ }
+ $('#ajax-error').hide();
- return this;
- }, // end render
+ return this;
+ }, // end render
- save: function() {
- self.schedule_collection.set(self.schedule);
- var button = $('#dirty-schedule #save-changes');
- button.prop('disabled', true).text(gettext("Saving"));
+ save: function() {
+ self.schedule_collection.set(self.schedule);
+ var button = $('#dirty-schedule #save-changes');
+ button.prop('disabled', true).text(gettext('Saving'));
// save_url defined globally in ccx\schedule.html
/* globals save_url */
- $.ajax({
- url: save_url,
- type: 'POST',
- contentType: 'application/json',
- data: JSON.stringify(self.schedule),
- success: function(data) {
- self.dirty = false;
- self.render();
- button.prop('disabled', false).text(gettext("Save changes"));
+ $.ajax({
+ url: save_url,
+ type: 'POST',
+ contentType: 'application/json',
+ data: JSON.stringify(self.schedule),
+ success: function(data) {
+ self.dirty = false;
+ self.render();
+ button.prop('disabled', false).text(gettext('Save changes'));
// Update textarea with grading policy JSON, since grading policy
// may have changed.
- $('#grading-policy').text(data.grading_policy);
+ $('#grading-policy').text(data.grading_policy);
+ },
+ error: function(jqXHR) {
+ console.log(jqXHR.responseText);
+ $('#ajax-error').show().focus();
+ $('#dirty-schedule').hide();
+ $('form#add-unit select,input,button').prop('disabled', true);
+ button.prop('disabled', false).text(gettext('Save changes'));
+ }
+ });
+ }, // end save
+
+ hide: function(unit) {
+ if (unit !== undefined) {
+ unit.hidden = true;
+ }
},
- error: function(jqXHR) {
- console.log(jqXHR.responseText);
- $('#ajax-error').show().focus();
- $('#dirty-schedule').hide();
- $('form#add-unit select,input,button').prop('disabled', true);
- button.prop('disabled', false).text(gettext("Save changes"));
- }
- });
- }, // end save
- hide: function(unit) {
- if (unit !== undefined) {
- unit.hidden = true;
- }
- },
+ show: function(unit) {
+ if (unit !== undefined) {
+ unit.hidden = false;
+ }
+ },
- show: function(unit) {
- if (unit !== undefined) {
- unit.hidden = false;
- }
- },
-
- valid_dates: function(start, due) {
- var errorMessage;
+ valid_dates: function(start, due) {
+ var errorMessage;
// Start date is compulsory and due date is optional.
- if (_.isEmpty(start) && !_.isEmpty(due)) {
- errorMessage = gettext("Please enter valid start date and time.");
- } else if (!_.isEmpty(start) && !_.isEmpty(due)) {
- var requirejs = window.require || RequireJS.require;
- var moment = requirejs("moment");
- var parsedDueDate = moment(due, 'YYYY-MM-DD HH:mm');
- var parsedStartDate = moment(start, 'YYYY-MM-DD HH:mm');
- if (parsedDueDate.isBefore(parsedStartDate)) {
- errorMessage = gettext("Due date cannot be before start date.");
- }
- }
- return errorMessage;
- },
+ if (_.isEmpty(start) && !_.isEmpty(due)) {
+ errorMessage = gettext('Please enter valid start date and time.');
+ } else if (!_.isEmpty(start) && !_.isEmpty(due)) {
+ var requirejs = window.require || RequireJS.require;
+ var moment = requirejs('moment');
+ var parsedDueDate = moment(due, 'YYYY-MM-DD HH:mm');
+ var parsedStartDate = moment(start, 'YYYY-MM-DD HH:mm');
+ if (parsedDueDate.isBefore(parsedStartDate)) {
+ errorMessage = gettext('Due date cannot be before start date.');
+ }
+ }
+ return errorMessage;
+ },
- get_datetime: function(which) {
- var date = $('form#add-unit input[name=' + which + '_date]').val();
- var time = $('form#add-unit input[name=' + which + '_time]').val();
- time = _.isEmpty(time) ? "00:00" : time;
- if (date && time) {
- return date + ' ' + time;
- }
- return null;
- },
+ get_datetime: function(which) {
+ var date = $('form#add-unit input[name=' + which + '_date]').val();
+ var time = $('form#add-unit input[name=' + which + '_time]').val();
+ time = _.isEmpty(time) ? '00:00' : time;
+ if (date && time) {
+ return date + ' ' + time;
+ }
+ return null;
+ },
- set_datetime: function(which, value) {
- var parts = value ? value.split(' ') : ['', ''],
- date = parts[0],
- time = parts[1];
- $('form#add-unit input[name=' + which + '_date]').val(date);
- $('form#add-unit input[name=' + which + '_time]').val(time);
- },
+ set_datetime: function(which, value) {
+ var parts = value ? value.split(' ') : ['', ''],
+ date = parts[0],
+ time = parts[1];
+ $('form#add-unit input[name=' + which + '_date]').val(date);
+ $('form#add-unit input[name=' + which + '_time]').val(time);
+ },
- schedule_options: function(nodes) {
- return nodes.map(function(node) {
- return $('