Permalink
Commits on Apr 26, 2013
  1. Merge branch 'master' of git://github.com/jwysiwyg/jwysiwyg into jwys…

    …iwyg-master
    
    Conflicts:
    	.gitignore
    	README.rst
    	Rakefile
    	build.yml
    	build/copyright.txt
    	jquery.wysiwyg.js
    	jquery.wysiwyg.less
    	jquery.wysiwyg.no-alpha.gif
    	src/jquery.wysiwyg.js
    Clovis Six committed Apr 26, 2013
Commits on Apr 14, 2013
  1. Merge branch 'ft-issue-143'

    frost-nzcr4 committed Apr 14, 2013
  2. Update README

    (cherry picked from commit bf3497e65efcc38814a729a15cfecf81030705c4)
    
    Conflicts:
    
    	README.rst
    frost-nzcr4 committed Apr 14, 2013
  3. Split jWYSIWYG

    (cherry picked from commit bc0cc3d764a09e3781a41bea28fd4fc0928cf3ba)
    
    Conflicts:
    
    	build/copyright.txt
    frost-nzcr4 committed Apr 14, 2013
  4. Update rake

    (cherry picked from commit bf3497e65efcc38814a729a15cfecf81030705c4)
    
    Conflicts:
    
    	README.rst
    frost-nzcr4 committed Apr 14, 2013
  5. Set jasmine to 1.1.0

    (cherry picked from commit 3ec97f75e0127e16c01c8d2f96e2d147c29de8c0)
    
    Conflicts:
    
    	test/jasmine.html
    frost-nzcr4 committed Apr 14, 2013
  6. Update package

    frost-nzcr4 committed Apr 14, 2013
Commits on Apr 8, 2013
  1. Update README.rst

    Add javascript syntax higlight
    frost-nzcr4 committed Apr 8, 2013
Commits on Mar 1, 2013
  1. Merge pull request #17 from ndtreviv/master

    Added Java example of server-side implementation as requested
    akzhan committed Mar 1, 2013
  2. Merge pull request #16 from ndtreviv/master

    Spellcheck plugin
    akzhan committed Mar 1, 2013
Commits on Feb 28, 2013
  1. Improved README slightly

    ndtreviv committed Feb 28, 2013
  2. Added spellchecker plugin

    ndtreviv committed Feb 28, 2013
Commits on Feb 25, 2013
  1. Merge pull request #15 from ma-ordonezruiz/maor-refactor

    Fixed minor gramar error.
    akzhan committed Feb 25, 2013
Commits on Feb 24, 2013
  1. Fixed minor gramar error.

    ManuelAgustin committed Feb 24, 2013
Commits on Feb 11, 2013
  1. Merge pull request #359 from rajbot/master

    Fix typo which prevented increaseFontSize() and decreaseFontSize() from working in Chrome and Safari.
    akzhan committed Feb 11, 2013
Commits on Feb 9, 2013
  1. fix typo which prevented increaseFontSize() and decreaseFontSize() fr…

    …om working in Chrome and Safari.
    rajbot committed Feb 9, 2013
Commits on Jan 25, 2013
Commits on Jan 19, 2013
  1. Merge pull request #356 from stianlik/master

    Some style improvements and jshint verification
    akzhan committed Jan 19, 2013
  2. Merged

    stianlik committed Jan 19, 2013
  3. Made code pass jshint tests

    stianlik committed Jan 19, 2013
Commits on Jan 18, 2013
Commits on Jan 17, 2013
  1. Improved style for toolbar

    Active elements are no longer yellow, instead a discreete border is
    appended. Additionally there are more space between menu elements.
    
    To achieve proper spacing, it was necessary to slightly change the toolbar
    HTML structure. It is now wrapped in a div element. This does not seem to cause
    any side-effects.
    stianlik committed Jan 17, 2013
  2. HTML edititor (textarea) should be same size wysiwyg editor

    Removed the size reduction. Don't know why the textarea size was
    specified as smaller than the wysiwyg editor, maybe a hack for some
    browser bug?
    stianlik committed Jan 17, 2013
  3. Merge pull request #355 from stianlik/master

    Language fix and more customizability for editor
    akzhan committed Jan 17, 2013
  4. Merge pull request #354 from idlesign/master

    $.browser fallback for jQuery 1.9+.
    akzhan committed Jan 17, 2013
  5. Recognizable change event, filtering and control callback args

    When content in editor changes, a change event is triggered on
    the textarea. If some pluign, or unrelated code changes this textarea,
    these will be overwritten. To avoid this one can listen to the change event
    of the textarea and update the editor content accordingly. However, one needs
    to avoid updating the editor if the change-event was fired from itself. This
    can now be achieved by testing if event.source is equal to editor object.
    
    Controls now have an additional option: callbackArguments. This is passed
    to the exec-method using apply. I.e. callbackArguments: [ 1, 2, 3 ] will
    allows for an exec-method of the following signature: function(a, b, c).
    
    When viewing the HTML code directly, it may be beneficial to filter the content
    through a "html-beautifier" like https://github.com/einars/js-beautify/blob/master/beautify-html.js.
    Therefore, the html control now use the first callbackArgument (can be any function) to filter the content.
    stianlik committed Jan 17, 2013