-
Notifications
You must be signed in to change notification settings - Fork 166
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Create numbered and bulleted lists #674
Open
satsuper
wants to merge
7
commits into
webodf:master
Choose a base branch
from
satsuper:create-list
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+3,285
−58
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
8f8df7b
Add UI buttons for list creation
0520f0c
Add list controller and responding to cursor events
2770489
Add support for session constraints to list controller
544529c
Add unstable flags for the list editing feature
06f0562
Operations for adding and removing lists
d63e805
Operational transforms for adding and removing lists
33566eb
Default styles for numbered and bulleted lists
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,127 @@ | ||
/** | ||
* Copyright (C) 2010-2014 KO GmbH <[email protected]> | ||
* | ||
* @licstart | ||
* This file is part of WebODF. | ||
* | ||
* WebODF is free software: you can redistribute it and/or modify it | ||
* under the terms of the GNU Affero General Public License (GNU AGPL) | ||
* as published by the Free Software Foundation, either version 3 of | ||
* the License, or (at your option) any later version. | ||
* | ||
* WebODF is distributed in the hope that it will be useful, but | ||
* WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with WebODF. If not, see <http://www.gnu.org/licenses/>. | ||
* @licend | ||
* | ||
* @source: http://www.webodf.org/ | ||
* @source: https://github.com/kogmbh/WebODF/ | ||
*/ | ||
|
||
/*global define,require */ | ||
|
||
define("webodf/editor/widgets/toggleLists", [ | ||
"dijit/form/ToggleButton", | ||
"webodf/editor/EditorSession"], | ||
|
||
function (ToggleButton, EditorSession) { | ||
"use strict"; | ||
|
||
var ToggleLists = function (callback) { | ||
var self = this, | ||
editorSession, | ||
listController, | ||
widget = {}, | ||
numberedList, | ||
bulletedList; | ||
|
||
numberedList = new ToggleButton({ | ||
label: runtime.tr('Numbering'), | ||
disabled: true, | ||
showLabel: false, | ||
checked: false, | ||
iconClass: "dijitEditorIcon dijitEditorIconInsertOrderedList", | ||
onChange: function (checked) { | ||
var success = listController.setNumberedList(checked); | ||
//TODO: remove this when the list controller supports all use cases triggered by this button | ||
if(!success) { | ||
numberedList.set("checked", !checked, false); | ||
} | ||
self.onToolDone(); | ||
} | ||
}); | ||
|
||
bulletedList = new ToggleButton({ | ||
label: runtime.tr('Bullets'), | ||
disabled: true, | ||
showLabel: false, | ||
checked: false, | ||
iconClass: "dijitEditorIcon dijitEditorIconInsertUnorderedList", | ||
onChange: function (checked) { | ||
var success = listController.setBulletedList(checked); | ||
//TODO: remove this when the list controller supports all use cases triggered by this button | ||
if(!success) { | ||
bulletedList.set("checked", !checked, false); | ||
} | ||
self.onToolDone(); | ||
} | ||
}); | ||
|
||
widget.children = [numberedList, bulletedList]; | ||
|
||
widget.startup = function () { | ||
widget.children.forEach(function (element) { | ||
element.startup(); | ||
}); | ||
}; | ||
|
||
widget.placeAt = function (container) { | ||
widget.children.forEach(function (element) { | ||
element.placeAt(container); | ||
}); | ||
return widget; | ||
}; | ||
|
||
function enableToggleButtons(isEnabled) { | ||
widget.children.forEach(function (element) { | ||
element.setAttribute('disabled', !isEnabled); | ||
}); | ||
} | ||
|
||
function updateToggleButtons(styleSummary) { | ||
bulletedList.set("checked", styleSummary.isBulletedList, false); | ||
numberedList.set("checked", styleSummary.isNumberedList, false); | ||
|
||
} | ||
|
||
this.onToolDone = function () { | ||
}; | ||
|
||
this.setEditorSession = function (session) { | ||
if (editorSession) { | ||
listController.unsubscribe(gui.ListController.listStylingChanged, updateToggleButtons); | ||
listController.unsubscribe(gui.ListController.enabledChanged, enableToggleButtons); | ||
} | ||
|
||
editorSession = session; | ||
|
||
if (editorSession) { | ||
listController = editorSession.sessionController.getListController(); | ||
listController.subscribe(gui.ListController.listStylingChanged, updateToggleButtons); | ||
listController.subscribe(gui.ListController.enabledChanged, enableToggleButtons); | ||
enableToggleButtons(listController.isEnabled()); | ||
} else { | ||
enableToggleButtons(false); | ||
} | ||
}; | ||
|
||
callback(widget); | ||
}; | ||
|
||
return ToggleLists; | ||
} | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -288,6 +288,7 @@ var Wodo = Wodo || (function () { | |
paragraphStyleEditingEnabled = isEnabled(editorOptions.paragraphStyleEditingEnabled), | ||
imageEditingEnabled = isEnabled(editorOptions.imageEditingEnabled), | ||
hyperlinkEditingEnabled = isEnabled(editorOptions.hyperlinkEditingEnabled), | ||
listEditingEnabled = isEnabled(editorOptions.listEditingEnabled), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Would this be considered local-unstable still? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Have added this to the isEnabled check and marked list editing as unstable |
||
reviewModeEnabled = Boolean(editorOptions.reviewModeEnabled), // needs to be explicitly enabled | ||
annotationsEnabled = reviewModeEnabled || isEnabled(editorOptions.annotationsEnabled), | ||
undoRedoEnabled = isEnabled(editorOptions.undoRedoEnabled), | ||
|
@@ -331,6 +332,7 @@ var Wodo = Wodo || (function () { | |
paragraphStyleEditingEnabled: paragraphStyleEditingEnabled, | ||
imageEditingEnabled: imageEditingEnabled, | ||
hyperlinkEditingEnabled: hyperlinkEditingEnabled, | ||
listEditingEnabled: listEditingEnabled, | ||
annotationsEnabled: annotationsEnabled, | ||
zoomingEnabled: zoomingEnabled, | ||
reviewModeEnabled: reviewModeEnabled | ||
|
@@ -661,6 +663,7 @@ var Wodo = Wodo || (function () { | |
paragraphStyleEditingEnabled: paragraphStyleEditingEnabled, | ||
imageInsertingEnabled: imageEditingEnabled, | ||
hyperlinkEditingEnabled: hyperlinkEditingEnabled, | ||
listEditingEnabled: listEditingEnabled, | ||
annotationsEnabled: annotationsEnabled, | ||
undoRedoEnabled: undoRedoEnabled, | ||
zoomingEnabled: zoomingEnabled, | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if there is no
editorSession
the buttons need to be disabled byenableToggleButtons(false);
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done