0
Fork 0
mirror of https://github.com/fastmail/Squire.git synced 2024-12-22 15:23:29 -05:00
Commit graph

191 commits

Author SHA1 Message Date
Matthew Borden
87b69183a6 Revert "Removed Local Server"
This reverts commit b3bf7bf563.
2014-07-11 20:16:37 +10:00
Matthew Borden
b3bf7bf563 Removed Local Server 2014-07-11 20:14:18 +10:00
Matthew Borden
821487eb6e Added the build directory 2014-07-11 20:07:56 +10:00
Matthew Borden
82b600874b Final Copy of Version1.0 2014-07-11 18:52:17 +10:00
Matthew Borden
9687fb9cb2 It's working http://www.reactiongifs.com/r/lmsac.gif 2014-07-11 16:56:31 +10:00
Matthew Borden
2dbae0dda9 Setting fonts now work 2014-07-11 14:57:46 +10:00
Matthew Borden
d9612277fc Added font selection, working on text size 2014-07-11 14:26:35 +10:00
Matthew Borden
d06a3831b7 Lists now work on no selected text 2014-07-11 00:29:49 +10:00
Matthew Borden
8e1b30b2ad stuff is working more and more 2014-07-10 19:05:25 +10:00
Matthew Borden
bea183d23f Images Work! http://www.reactiongifs.com/r/dpfy.gif 2014-07-10 12:24:08 +10:00
Matthew Borden
db6ef4a630 Links now work. Images are doing some weird stuff 2014-07-10 12:01:00 +10:00
Matthew Borden
fa6868e4af Working: Images 2014-07-10 08:27:59 +10:00
Matthew Borden
5c49fcf543 Fix:Patched Editor.js to fix firefox issues 2014-07-09 15:16:37 +10:00
Matthew Borden
cac68fb551 Functional stuff working a little better 2014-07-09 15:15:32 +10:00
Matthew Borden
3f0bf902fd Update: Bold, Underline,Italics, Lists, Quotes Undo & Redo working 2014-07-09 13:51:03 +10:00
Matthew Borden
539e880e01 Merge branch 'Squire-UI' of https://github.com/matthewborden/Squire into Squire-UI 2014-07-09 11:07:06 +10:00
Matthew Borden
3065edf906 Fix: Firefox issues by adding Squire on load of iframe 2014-07-09 11:06:57 +10:00
Matthew Borden
5a7b3d90fd Working: Commentry 2014-07-08 23:48:33 +10:00
Matthew Borden
af9c68a2c3 Working: Non solution to fuproblem 2014-07-08 23:43:58 +10:00
Matthew Borden
f706dd6763 Working: Made progress on Rgex Checking 2014-07-08 22:04:59 +10:00
Matthew Borden
9312e0bfaf Add: Refactoring isPresent 2014-07-08 20:47:54 +10:00
Matthew Borden
8479a7e1c7 Working: on getting text selection to work 2014-07-08 20:42:00 +10:00
Matthew Borden
632dd68a2f Working: Editor Functionality, testing function call on object 2014-07-08 16:10:57 +10:00
Matthew Borden
15c45cc677 Working: On Functionality 2014-07-08 16:00:44 +10:00
Matthew Borden
1b5bf96295 Editor now loads from one JS and One CSS file. 2014-07-08 15:36:25 +10:00
Matthew Borden
aa1c78fab3 Testing In Firefox 2014-07-08 11:25:33 +10:00
Matthew Borden
c63ab9c74b Update: Loading now works in Chrome 2014-07-08 11:21:18 +10:00
Matthew Borden
99ae3eac96 Fixed build problems, resolves merge conflict 2014-07-08 11:07:37 +10:00
Matthew Borden
53dcbc8605 Update: Loading content into DIV 2014-07-08 11:00:11 +10:00
FastMail Admin
bbaaaa3102 Testing: Firefox Support 2014-07-08 10:45:18 +10:00
Matthew Borden
e0043013b1 Update: Editor & UI now load into selector.
Need to combat the problem of multiple instances.
2014-07-08 09:44:09 +10:00
Matthew Borden
e0fe00bea6 Update & Add: Refactored Loading of UI & Stylesheets/Scripts 2014-07-07 22:35:28 +10:00
Matthew Borden
97a75e92ac Attempt: Drop.js Working
Attempting to get Drop.js Working with multiple elements.
2014-07-07 17:46:17 +10:00
Matthew Borden
52a3460680 Update: Renamed files to Squire-UI added Drop 2014-07-07 15:05:50 +10:00
Matthew Borden
3180323136 Update: Toolbar Loads with Fonts from Assets 2014-07-07 14:24:47 +10:00
Matthew Borden
cef33754c1 Update: Build Directory with UI Changes 2014-07-07 13:56:59 +10:00
Matthew Borden
12072bdd07 Add: Font's for Icons
Using FontAwesome for Icons. This could be replaced with data-url
images sometime in the future.
2014-07-07 13:54:50 +10:00
Matthew Borden
d2c64f9a81 Update: Header.html Added to the Demo 2014-07-07 13:53:22 +10:00
Matthew Borden
273577882c Add: HTML & CSS UI
The HTML and CSS File to be included as an iFrame alongside the Squire
Editor.
2014-07-07 13:53:00 +10:00
Neil Jenkins
3b95f7b864 Better parsing of links and emails into links.
* Be more liberal in tld, as there are now a billion new ones, of every length.
* Fix bug where if the URL contains an @ it would add it as a mailto link
  instead.
2014-07-03 14:16:20 +01:00
Neil Jenkins
bbf765bee7 Ensure there is always a selection.
Many functions rely on there being a selection; if the browser doesn't return
one, make one up (collapsed, at beginning of document).
2014-06-30 15:10:30 +01:00
Neil Jenkins
c09c5e98f7 Fix Firefox cursor disappears after calling modifyBlocks
Workaround for an old Firefox bug was causing it. Happily, that seems to no
longer be needed, so can just remove it and we're all good. :)
2014-06-26 16:13:54 +01:00
Neil Jenkins
eed472b5ef Don't change encoding of URL in Squire#makeLink.
Presume the URL is already valid, otherwise we could end up double encoding.
2014-06-06 14:00:31 +10:00
Neil Jenkins
e108c18c38 Ensure there is always a normal block at the bottom of the page. 2014-06-02 13:41:59 +10:00
Neil Jenkins
f0bd5138e1 Add support for defaultBlockProperties.
Set the defaultBlockProperties property on a squire instance to an object and
it will use these properties when it has to create a new default block element.
2014-06-02 10:22:52 +10:00
Neil Jenkins
aa9afdfaf6 Code format tidying.
* Use upper-case for all tag names.
* Tidy document reference.
2014-06-02 10:17:54 +10:00
Neil Jenkins
34d3839ceb Don't trim whitespace if inside another inline node. 2014-05-27 12:24:31 +10:00
Neil Jenkins
aca8fd4fab Better fix up of mixed inline/block content. 2014-05-27 11:31:06 +10:00
Neil Jenkins
46706db889 Wrap LI contents when merging. 2014-05-23 15:33:00 +10:00
Neil Jenkins
ca5c08e4d0 Cleanup nbsp-only text nodes. 2014-05-20 17:47:02 +10:00