-
Notifications
You must be signed in to change notification settings - Fork 1
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
Documentation and Refactoring #3
base: main
Are you sure you want to change the base?
Conversation
…r and switch statements
… accepted mime types
ordo/ordo.js
Outdated
var toggleOpenButton = function(cell) { | ||
<<<<<<< HEAD |
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.
Pls remove the merge artifacts, first!
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
ordo/ordo.js
Outdated
if (cell.metadata.ordo !== undefined && | ||
cell.metadata.ordo.admonition !== undefined && | ||
cell.metadata.ordo.admonition) { | ||
======= |
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.
Pls remove the merge artifacts, first!
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
ordo/ordo.js
Outdated
@@ -214,67 +244,148 @@ define([ | |||
cell.element.find('div.ordo-admonition-controls').remove(); | |||
} | |||
} | |||
>>>>>>> 0c1a4b94feb516d3f1f0a5e4f8cda3e37fe3e17f |
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.
Pls remove the merge artifacts, first!
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
ordo/ordo.js
Outdated
|
||
|
||
/** | ||
* Toggels the admonition div between the states open and close |
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.
Toggels -> Toggles?
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
ordo/ordo.js
Outdated
var initializeCells = function() { | ||
<<<<<<< HEAD |
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.
Pls. remove the merge artifacts first.
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
ordo/ordo.js
Outdated
var onEditSol = function(cell) { | ||
<<<<<<< HEAD |
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.
Pls. remove the merge artifacts first.
ordo/ordo.js
Outdated
'keyboard_manager': Jupyter.notebook.keyboard_manager, | ||
'notebook': Jupyter.notebook | ||
}); | ||
======= |
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.
Pls. remove the merge artifacts first.
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.
ordo/ordo.js
Outdated
@@ -815,81 +1103,244 @@ define([ | |||
'keyboard_manager': Jupyter.notebook.keyboard_manager, | |||
'notebook': Jupyter.notebook | |||
}) | |||
>>>>>>> 0c1a4b94feb516d3f1f0a5e4f8cda3e37fe3e17f |
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.
Pls. remove the merge artifacts first.
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.
ordo/ordo.js
Outdated
.then(initialize) | ||
.catch(function on_error(reason) { | ||
console.error('Error:', reason); | ||
======= |
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.
Pls. remove the merge artifacts first.
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.
ordo/ordo.js
Outdated
@@ -1038,9 +1489,11 @@ define([ | |||
var ordo_exts = function() { | |||
return Jupyter.notebook.config.loaded.then(readConfig).then(initialize).catch(function on_error (reason) { | |||
console.error('Error:', reason); | |||
>>>>>>> 0c1a4b94feb516d3f1f0a5e4f8cda3e37fe3e17f |
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.
Pls. remove the merge artifacts first.
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.
I think the pull request has still an issue because the defering mechanisms in initialilzeCells is gone. In fact, I think that the function can be made simpler by deleting the first loop and only using the event as they do the same. But fixing this might be for the next pull request. |
This pull request aims at improving the code quality, which is achieved by