Skip to content

Commit 5a8e387

Browse files
author
Satvik Kumar
committed
Add unstable flags for the list editing feature
1 parent d18a355 commit 5a8e387

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

programs/editor/wodocollabtexteditor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ var Wodo = Wodo || (function () {
177177
paragraphStyleEditingEnabled = isEnabled(editorOptions.paragraphStyleEditingEnabled),
178178
imageEditingEnabled = isEnabled(editorOptions.imageEditingEnabled, true),
179179
hyperlinkEditingEnabled = isEnabled(editorOptions.hyperlinkEditingEnabled, true),
180-
listEditingEnabled = isEnabled(editorOptions.listEditingEnabled),
180+
listEditingEnabled = isEnabled(editorOptions.listEditingEnabled, true),
181181
reviewModeEnabled = isEnabled(editorOptions.reviewModeEnabled, true),
182182
annotationsEnabled = reviewModeEnabled || isEnabled(editorOptions.annotationsEnabled, true),
183183
undoRedoEnabled = false, // no proper mechanism yet for collab

programs/editor/wodotexteditor.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -233,12 +233,16 @@ var Wodo = Wodo || (function () {
233233
instanceCounter = instanceCounter + 1;
234234

235235
/**
236-
* Returns true if either all features are wanted and this one is not explicitely disabled
237-
* or if not all features are wanted by default and it is explicitely enabled
238-
* @param {?boolean|undefined} isFeatureEnabled explicit flag which enables a feature
239-
* @return {!boolean}
240-
*/
241-
function isEnabled(isFeatureEnabled) {
236+
* Returns true if either all features are wanted and this one is not explicitely disabled
237+
* or if not all features are wanted by default and it is explicitely enabled
238+
* @param {?boolean|undefined} isFeatureEnabled explicit flag which enables a feature
239+
* @param {!boolean=} isUnstable set to true if the feature is not stable (in collab mode)
240+
* @return {!boolean}
241+
*/
242+
function isEnabled(isFeatureEnabled, isUnstable) {
243+
if (isUnstable && ! editorOptions.unstableFeaturesEnabled) {
244+
return false;
245+
}
242246
return editorOptions.allFeaturesEnabled ? (isFeatureEnabled !== false) : isFeatureEnabled;
243247
}
244248

@@ -283,7 +287,7 @@ var Wodo = Wodo || (function () {
283287
paragraphStyleEditingEnabled = isEnabled(editorOptions.paragraphStyleEditingEnabled),
284288
imageEditingEnabled = isEnabled(editorOptions.imageEditingEnabled),
285289
hyperlinkEditingEnabled = isEnabled(editorOptions.hyperlinkEditingEnabled),
286-
listEditingEnabled = isEnabled(editorOptions.listEditingEnabled),
290+
listEditingEnabled = isEnabled(editorOptions.listEditingEnabled, true),
287291
reviewModeEnabled = Boolean(editorOptions.reviewModeEnabled), // needs to be explicitly enabled
288292
annotationsEnabled = reviewModeEnabled || isEnabled(editorOptions.annotationsEnabled),
289293
undoRedoEnabled = isEnabled(editorOptions.undoRedoEnabled),

0 commit comments

Comments
 (0)