This repository has been archived by the owner on Jul 24, 2019. It is now read-only.
Merging latest push #173
Closed
Merging latest push #173
Conversation
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
…string/number comparison works.
add btn with data-edit="html" for html editing
I found that IE does not understand commands with parameters (such as "fontSize 3"). This fix strips off any parameters and also does a check to make sure the browser supports the command before it tries to query the state of the command. This is a little more generic than some of the other issue solutions which were only looking at fixing specific command problems.
…and's state. This is a fix for the exception FF throws when querying a command state that is disabled.
I've updated this now with the changes submitted by @beanbrite in Merge #118 and cleaned up the merge.
…ap-wysiwyg This combines the #68 change where FF throws an error and #103 where it supports multiple instances thanks to @brutuscat # By Mauro Asprea # Via Mauro Asprea * 'fix-multiple-instances' of github.com:brutuscat/bootstrap-wysiwyg: Fix to support multiple instances adding a wrapper context for toolbar's bindings Conflicts: bootstrap-wysiwyg.js
Tested, it doesn't appear to throw any disasters along with all the other changes and the timeout seems to be effective, Merge branch 'throttle' of github.com:VictorBjelkholm/bootstrap-wysiwyg Conflicts: bootstrap-wysiwyg.js
Merge branch 'master' of github.com:pnevels/bootstrap-wysiwyg # By Patrick Nevels (@pnevels) # Via Patrick Nevels * 'master' of github.com:pnevels/bootstrap-wysiwyg: add support for bootstrap 3.0
$(options.toolbarSelector,wrapper).find(toolbarBtnSelector).each(UnderscoreThrottle(function () {
Where the function name is actually underscoreThrottle.
My apologies. This is it fixed.
Tested to be working, please let me know if it is not.
…that and thank those responsible.
I think the new layout makes it a little easier to take the example code and see what is going on.
Conflicts: bootstrap-wysiwyg.js Also cleaned up some of the code.
and additional improvements.
Tested in Safari, FF and Chrome. Not tested on mobile.
…l-editor Fixed it up a little and cleaned it to make it fix with the rest of the recent code change. Added an example file too.
…nto dev Conflicts: index.html changed 'comm' to 'format' instead. Created example for this too. Note, from the original, code and small didn't work, but added h[1-5] and will add some more with examples later.
Updated cleanHtml() to toggle the html "pre" output, that was introduced previously, before outputting the HTML to the browser. This means that you can now export HTML using cleanHtml() while the code window is open and it will work! Updated html-editor example to use the command.
…side a form, it will allow you to move the image tags to their own input elements.
Add a change event callback
|
This merge actually incorporates and replaced a number of the merges before it. |
|
Closing request - leaving this version as is. Thanks! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Here's the latest push from 12 developers fixing some problems.
There are three open issues.
This will close #171 #172 #157 (We added requirements, but we'll fix silent failure later) and clarifies use of #159 #149 #147 #143 #141 #140 #138 #52 #138 #136 #134 #135 (Updated) #133 #116 (The reason I got onto this project) #112 #113 #113 (Updated) #109 #101 #91 #86 #83 ( in 5f46909 ) #65 #61 (Appears to be working) #48 #40 #23 and #19
Should close #167 #164 (by adding multiple input support)