diff --git a/.gitignore b/.gitignore
index a87978343..2726e7445 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,17 @@ sqlite_database
src/
static/*
media/*
+demo/media/*
!.gitkeep
.sass-cache/
tmp/
settings_local.py
build/
tags
+dist/
+*.egg-info/
+CACHE/
+.tox/
+tests/.coverage
+tests/coverage_html/
+js_tests/node_modules
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..ed7e638ec
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,55 @@
+language: python
+python:
+ - "2.7"
+ - "2.6"
+env:
+ global:
+ - SOUTH_TESTS_MIGRATE=1
+ matrix:
+ - DATABASE_ENGINE=sqlite DJANGO_PACKAGE=https://github.com/django/django/archive/stable/1.5.x.zip
+ - DATABASE_ENGINE=sqlite DJANGO_PACKAGE=https://github.com/django/django/archive/stable/1.6.x.zip
+ - DATABASE_ENGINE=sqlite DJANGO_PACKAGE=https://github.com/django/django/archive/stable/1.4.x.zip
+ - DATABASE_ENGINE=postgres DJANGO_PACKAGE=https://github.com/django/django/archive/stable/1.5.x.zip
+ - DATABASE_ENGINE=postgres DJANGO_PACKAGE=https://github.com/django/django/archive/stable/1.6.x.zip
+ - DATABASE_ENGINE=postgres DJANGO_PACKAGE=https://github.com/django/django/archive/stable/1.4.x.zip
+ - DATABASE_ENGINE=mysql DJANGO_PACKAGE=https://github.com/django/django/archive/stable/1.5.x.zip
+ - DATABASE_ENGINE=mysql DJANGO_PACKAGE=https://github.com/django/django/archive/stable/1.6.x.zip
+ - DATABASE_ENGINE=mysql DJANGO_PACKAGE=https://github.com/django/django/archive/stable/1.4.x.zip
+matrix:
+ include:
+ - python: "2.7"
+ env: JAVASCRIPT=1
+install: |
+ set -e
+ if [ -z "$JAVASCRIPT" ]
+ then
+ pip install --upgrade pip
+ pip install -q $DJANGO_PACKAGE --use-mirrors
+ pip install -q --use-mirrors mock
+
+ if [ "$DATABASE_ENGINE" = "mysql" ]
+ then
+ pip install -q --use-mirrors MySQL-python
+ fi
+
+ if [ "$DATABASE_ENGINE" = "postgres" ]
+ then
+ pip install -q --use-mirrors psycopg2
+ fi
+ pip install --use-mirrors .
+ if echo "$DJANGO_PACKAGE" | grep -q '1.4.x'
+ then
+ pip install --use-mirrors -e git://github.com/stephenmcd/mezzanine@5dde99cd68b3ce5118b68#egg=mezzanine
+ fi
+ pip freeze
+ fi
+before_script:
+ - psql -c 'create database widgy;' -U postgres
+ - mysql -e 'create database widgy;'
+script: |
+ if [ -z "$JAVASCRIPT" ]
+ then
+ make test-py
+ else
+ make test-js
+ fi
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
new file mode 100644
index 000000000..612545fa6
--- /dev/null
+++ b/CHANGELOG.rst
@@ -0,0 +1,70 @@
+Changelog
+=========
+
+0.2.0
+-----
+
+* Use django-pyscss_ for SCSS compilation. Requires an update to the
+ COMPRESS_PRECOMPILERS setting::
+
+ COMPRESS_PRECOMPILERS = (
+ ('text/x-scss', 'django_pyscss.compressor.DjangoScssFilter'),
+ )
+
+ You may also have to update ``@import`` statements in your SCSS, because
+ django-pyscss uses a different (more consistent) rule for path resolution.
+ For example, ``@import 'widgy_common'`` should be changed to ``@import
+ '/widgy/css/widgy_common'``
+
+.. _django-pyscss: https://github.com/fusionbox/django-pyscss
+
+0.1.6 (2014-09-09)
+------------------------
+* Fix migrations containing unsupported KeywordsField from mezzanine [Scott Clark]
+* Rename package to django-widgy
+
+
+0.1.5 (2013-11-23)
+------------------------
+
+* Fix Widgy migrations without Mezzanine [Gavin Wahl]
+* Drop target collision detection [Gavin Wahl]
+* Fix Figure and StrDisplayNameMixin [Gavin Wahl]
+* Avoid loading review_queue when it's not installed [Scott Clark]
+* Fix multi-table inheritance with LinkFields [Gavin Wahl]
+
+0.1.4 (2013-11-04)
+------------------
+
+* Add StrDisplayNameMixin
+
+0.1.3 (2013-10-25)
+------------------
+
+* Fix image widget validation with the S3 storage backend
+
+0.1.2 (2013-10-23)
+------------------
+
+* Fix Widgy admin for static files hosted on a different domain
+
+0.1.1 (2013-10-21)
+------------------
+
+* Adjust ``MANIFEST.in`` to fix PyPi install.
+* Fix layout having a unicode ``verbose_name``
+
+0.1.0 (2013-10-18)
+------------------
+
+First release.
+
+Basic features:
+
+* Heterogeneous tree editor (``widgy``)
+* CMS (``widgy.contrib.widgy_mezzanine``)
+* CMS Plugins (``widgy.contrib.urlconf_include``)
+* Widgets (``widgy.contrib.page_builder``)
+* Form builder (``widgy.contrib.form_builder``)
+* Multilingual pages (``widgy.contrib.widgy_i18n``)
+* Review queue (``widgy.contrib.review_queue``)
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000..7f8260507
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,189 @@
+ Copyright (c) Fusionbox and contributors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 000000000..343bda138
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,6 @@
+include README.rst CHANGELOG.rst LICENSE Makefile tox.ini
+recursive-include widgy *
+recursive-include tests *.py
+recursive-include docs *
+prune docs/_build
+global-exclude *.pyc
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..d8b325d46
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,41 @@
+JS_FILES?=`find ./js_tests/tests -type f -name '*.js'`
+
+test: test-py test-js
+
+test-py:
+ cd tests && $(COVERAGE_COMMAND) ./runtests.py --settings=test_multidb --verbosity=2 $(TESTS)
+
+coverage:
+ +make test-py COVERAGE_COMMAND='coverage run --source=widgy'
+ cd tests && coverage html --omit='../widgy/migrations/*,../widgy/contrib/*/migrations/*'
+
+browser: coverage
+ sensible-browser tests/coverage_html/index.html
+
+js_tests/node_modules: js_tests/package.json
+ cd js_tests && npm install .
+
+test-js: js_tests/node_modules
+ ./js_tests/node_modules/mocha/bin/mocha \
+ -s 5 \
+ --reporter spec \
+ $(JS_FILES)
+
+widgy/locale/en/LC_MESSAGES/django.po: $(shell find . -type f -iregex '.*\.\(html\|py\|md\)$$' | grep -v .tox)
+
+ cd widgy && django-admin.py makemessages -l en
+
+widgy/locale/xx_pseudo/LC_MESSAGES/django.po: widgy/locale/en/LC_MESSAGES/django.po
+ -rm -r "`dirname $@`"
+ potpie $< $@
+
+widgy/locale/xx_pseudo/LC_MESSAGES/django.mo: widgy/locale/xx_pseudo/LC_MESSAGES/django.po
+ cd widgy && django-admin.py compilemessages
+
+t10n: widgy/locale/xx_pseudo/LC_MESSAGES/django.mo
+
+docs:
+ cd docs && $(MAKE) html
+
+
+.PHONY: test coverage browser test-py test-js docs
diff --git a/README b/README
deleted file mode 100644
index f0140d0dd..000000000
--- a/README
+++ /dev/null
@@ -1,107 +0,0 @@
-# Widgy Editor for Django
-Widgy is a content editor somewhat in the line of CKEditor. It is not a WYSIWYG
-editor though. Widgy is more suited than CKEditor for editing pages, as in a
-CMS because it allows you to edit specific parts of the page and those parts
-know how to render themselves. Whereas a WYSIWYG stores its data in HTML, Widgy
-stores it in a Tree where each node can render itself.
-
-## Data Model
-A Widgy page is composed of Tree of Nodes. A Node deals with structure. It
-defines where a component lives in the Tree. The Tree does not deal with pages
-like the page tree in Mezzanine, rather it deals with a hierarchy of components
-to be rendered on a page.
-
-Each Node has an associated Content. While a Node concerns itself with
-structure, Contents deal with the specific data of a component. All Nodes are
-instances of the same class, while each Content has a different type. Only
-certain Content types are allowed to be nested under each other (i.e. an Input
-Content probably needs to be inside a Form Content and you probably don't want
-anything inside of a Text Content). Nodes will check the validity of their
-content's relationship before moving.
-
-### Example of a Tree
-**Note:** Content types are in parentheses.
-
- Node (TwoColumnLayout)
- |
- +-- Node (MainBucket)
- | |
- | +-- Node (Text)
- | |
- | +-- Node (Image)
- | |
- | +-- Node (Text)
- | |
- | +-- Node (Form)
- | |
- | +-- Node (Input)
- | |
- | +-- Node (Checkboxes)
- | |
- | +-- Node (Input)
- |
- +-- Node (SidebarBucket)
- |
- +-- Node (CallToAction)
-
-## Minimum Viable Proof of Concept
-In order to prove that a Node-Tree-based content editor is a viable solution,
-here is a list of features that we feel are absolutely necessary. When we
-finish this feature list, we have proved that Widgy is possible.
-
-Working:
-
- - One layout
- - Text widget
- - Front-end rendering of all the widgets
- - Node reordering
- - Node re-rooting (moving a node up/down in the tree, from the left column to
- the right column, for example)
- - Delete widgets
- - Image widget with file upload, or some other widget that makes it seem like
- less of a toy
- - Creating a new ContentPage
- - Adding widgets by dragging from a thing full of options
- - Widgets from apps besides `widgy` (custom project widgets)
- - Admin chrome around the widgy editor
- - Editing of the [mezzanine] page metadata (title, published)
- - Nice drag and drop: retain the inside node offset (ask Gavin), snap into
- drop targets on mouseover.
- - Follow mouse on scroll while dragging.
-
-Not Working Yet:
-
- - Nicer compatibility (preerrors and aftererrors)
-
-## Features required before we can show somebody else
-These are the features that we need to be able to show people other than
-developers. When we finish this feature list, we can sell it to other people in
-the company.
-
- - Designer magic wand.
-
-## JavaScript
-We use require.js to handle dependency management and to encourage code
-modularity. This helps a lot in development, but it also means that page loads
-may be rather slow. If page loads are too slow for you while you are
-developing, you can run the optimizer to compile and minify the file into one
-file and then you will have zippier page loads.
-
-Steps:
-
- 1. Install the RequireJS command line tool.
-
- $ [sudo] npm install -g requirejs
-
- 2. From the project path root, run the optimizer.
-
- $ r.js -o build.js
-
- This will create an optimized file which is placed in
- static/widgy/js/widgy-built.js
-
- 3. Change your script tag to update the new location of the widgy files.
-
-
-
-**Note:** Please avoid committing the change in step 3.
diff --git a/README.rst b/README.rst
new file mode 100644
index 000000000..375af8302
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,73 @@
+Widgy: Tree Editor for Django
+=============================
+
+.. image:: https://travis-ci.org/fusionbox/django-widgy.png?branch=master
+ :target: http://travis-ci.org/fusionbox/django-widgy
+ :alt: Build Status
+
+Widgy is a content editor somewhat in the line of CKEditor. It is not a
+WYSIWYG editor though. Widgy is more suited than CKEditor for editing
+pages, as in a CMS because it allows you to edit specific parts of the
+page and those parts know how to render themselves. Whereas a WYSIWYG
+stores its data in HTML, Widgy stores it in a Tree where each node can
+render itself.
+
+Widgy is available under the Apache Version 2.0 license. Contribute on github.
+
+Documentation
+-------------
+
+Read Widgy's documentation at http://docs.wid.gy.
+
+Installation
+------------
+
+Install with pip. ::
+
+ pip install django-widgy
+
+When developing Widgy, it might be handy to clone the repository then install
+it. ::
+
+ git clone git://github.com/fusionbox/django-widgy
+ cd django-widgy
+ pip install -e .
+
+Design Philosophy
+-----------------
+
+Read about Widgy's data model at
+http://docs.wid.gy/en/latest/design/data-model.html.
+
+
+Contributing
+------------
+
+There is a developers mailing list available at `widgy@fusionbox.com
+`_
+
+Running the Tests
+^^^^^^^^^^^^^^^^^
+
+::
+
+ make test
+
+``make test`` will run both the JavaScript and Python tests. To test one
+or the other, use ``make test-js`` or ``make test-py``.
+
+Coverage
+********
+Once coverage_ is installed (``pip install coverage``), the Makefile
+has two commands to help report on code coverage. ::
+
+ make coverage
+
+will run the tests with coverage enabled and generate HTML coverage
+files. ::
+
+ make browser
+
+will run the tests and open the coverage report in your web browser.
+
+.. _coverage: http://nedbatchelder.com/code/coverage/
diff --git a/add_page.py b/add_page.py
deleted file mode 100644
index 718558696..000000000
--- a/add_page.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from widgy.models import *
-
-
-page = ContentPage.objects.create(
- title='widgy page'
- )
-page.root_node = TwoColumnLayout.add_root().node
-page.save()
-
-for i in range(3):
- page.root_node.content.left_bucket.content.add_child(TextContent,
- content='yay %s' % i
- )
-
-for i in range(2):
- page.root_node.content.right_bucket.content.add_child(TextContent,
- content='yay right bucket %s' % i
- )
diff --git a/bin/daisydiff/LICENSE.txt b/bin/daisydiff/LICENSE.txt
new file mode 100644
index 000000000..261eeb9e9
--- /dev/null
+++ b/bin/daisydiff/LICENSE.txt
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/bin/daisydiff/NOTICE.txt b/bin/daisydiff/NOTICE.txt
new file mode 100644
index 000000000..6092e4dac
--- /dev/null
+++ b/bin/daisydiff/NOTICE.txt
@@ -0,0 +1,8 @@
+NOTICE: Only our own original work is licensed under the terms of the Apache
+License Version 2.0. The licenses of some libraries might impose different
+redistribution or general licensing terms than those stated in the Apache
+License. Users and redistributors are hereby requested to verify these
+conditions and agree upon them.
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/bin/daisydiff/README.txt b/bin/daisydiff/README.txt
new file mode 100644
index 000000000..826d9212a
--- /dev/null
+++ b/bin/daisydiff/README.txt
@@ -0,0 +1,75 @@
+ Daisy Diff 1.2
+
+ This is Daisy Diff, the open source HTML diffing library!
+
+ Website - http://code.google.com/p/daisydiff/
+
+ +---------------------------------------------------------------+
+ | STAND-ALONE |
+ +---------------------------------------------------------------+
+
+Java:
+=====
+java -jar daisydiff.jar [oldHTML] [newHTML] [optional arguments]
+
+
+Optional Arguments:
+===================
+--file=[filename] - Write output to the specified file.
+--type=[html/tag] - Use the html (default) diff algorithm or the tag diff.
+--css=[cssfile1;cssfile2;cssfile3] - Add external CSS files.
+--output=[html/xml] - Write html (default) or xml output.
+--q - Generate less console output.
+
+Example:
+========
+java -jar daisydiff.jar http://web.archive.org/web/20070107145418/http://news.bbc.co.uk/ http://web.archive.org/web/20070107182640/http://news.bbc.co.uk/ --css=http://web.archive.org/web/20070107145418/http://news.bbc.co.uk/nol/shared/css/news_r5.css
+
+java -jar daisydiff.jar http://cocoondev.org/wiki/291-cd/version/15/part/SimpleDocumentContent/data http://cocoondev.org/wiki/291-cd/version/17/part/SimpleDocumentContent/data --css=http://cocoondev.org/resources/skins/daisysite/css/daisy.css --output=xml --file=daisysite.htm
+
+Requirements:
+=============
+Java 1.5 or 6
+
+ +---------------------------------------------------------------+
+ | EMBEDDED |
+ +---------------------------------------------------------------+
+
+Java:
+=====
+org.outerj.daisy.diff.DaisyDiff{
+
+/**
+ * Diffs two html files, outputting the result to the specified consumer.
+ */
+public static void diffHTML(InputSource oldSource, InputSource newSource, ContentHandler consumer, String prefix, Locale locale) throws SAXException, IOException;
+
+/**
+ * Diffs two html files word for word as source, outputting the result to
+ * the specified consumer.
+ */
+public static void diffTag(String oldText, String newText, ContentHandler consumer) throws Exception;
+
+}
+
+Requirements:
+=============
+Java 1.5 or 6
+To run Daisy Diff embedded in your application, you don't need the entire Jar file. A much smaller Jar file without Xerces and NekoHtml will suffice.
+
+
+ +---------------------------------------------------------------+
+ | PHP |
+ +---------------------------------------------------------------+
+
+The DaisyDiff algorithm has been integrated in MediaWiki. The version with DaisyDiff support isn't released yet.
+More info on: http://www.mediawiki.org/wiki/Visual_Diff
+
+The PHP code is released under the GPLv2. It can also be used as an embedded HTML differ in a PHP application.
+
+ +---------------------------------------------------------------+
+ | Acknowledgements |
+ +---------------------------------------------------------------+
+
+Guy Van den Broeck
+Daniel Dickison
diff --git a/bin/daisydiff/daisydiff.jar b/bin/daisydiff/daisydiff.jar
new file mode 100644
index 000000000..54659dbdd
Binary files /dev/null and b/bin/daisydiff/daisydiff.jar differ
diff --git a/build.js b/build.js
deleted file mode 100644
index 9d7a3dda8..000000000
--- a/build.js
+++ /dev/null
@@ -1,30 +0,0 @@
-({
- baseUrl: "widgy/static/widgy/js/",
- name: "widgy",
- out: "static/widgy/js/widgy-built",
- shim: {
- 'underscore': {
- exports: '_'
- },
- 'backbone': {
- deps: ['underscore', 'jquery', 'fusionbox'],
- exports: 'Backbone'
- },
- 'fusionbox': {
- deps: ['jquery'],
- exports: 'fusionbox'
- }
- },
- paths: {
- 'jquery': './lib/jquery',
- 'underscore': './lib/underscore',
- 'backbone': './lib/backbone',
- 'mustache': './lib/mustache',
- 'fusionbox': './lib/fusionbox',
- 'RelatedObjectLookups' : './lib/RelatedObjectLookups',
- 'text': 'require/text'
- },
- uglify: {
- beautify: false
- }
-})
diff --git a/clean_database b/clean_database
deleted file mode 100644
index 2cc912e37..000000000
Binary files a/clean_database and /dev/null differ
diff --git a/urlconf_include/__init__.py b/demo/demo_url/__init__.py
similarity index 100%
rename from urlconf_include/__init__.py
rename to demo/demo_url/__init__.py
diff --git a/doc/source/cms/models.rst b/demo/demo_url/models.py
similarity index 100%
rename from doc/source/cms/models.rst
rename to demo/demo_url/models.py
diff --git a/demo/demo_url/urls.py b/demo/demo_url/urls.py
new file mode 100644
index 000000000..f5e1c0508
--- /dev/null
+++ b/demo/demo_url/urls.py
@@ -0,0 +1,9 @@
+from django.conf.urls import patterns, include, url
+from django.views.generic import RedirectView
+
+from . import views
+
+urlpatterns = patterns('',
+ (r'^$', RedirectView.as_view(url='hello/')),
+ (r'^hello/', views.hello),
+)
diff --git a/demo/demo_url/views.py b/demo/demo_url/views.py
new file mode 100644
index 000000000..219def663
--- /dev/null
+++ b/demo/demo_url/views.py
@@ -0,0 +1,7 @@
+from django.http import HttpResponse
+
+def hello(request):
+ return HttpResponse(
+ ''
+ 'Demo url
Hello!'
+ )
diff --git a/demo/demo_widgets/admin.py b/demo/demo_widgets/admin.py
new file mode 100644
index 000000000..58c9908d9
--- /dev/null
+++ b/demo/demo_widgets/admin.py
@@ -0,0 +1,8 @@
+from django.contrib import admin
+
+from widgy.admin import WidgyAdmin
+
+from demo.demo_widgets.models import I18NThing
+
+
+admin.site.register(I18NThing, WidgyAdmin)
diff --git a/demo/demo_widgets/migrations/0001_initial.py b/demo/demo_widgets/migrations/0001_initial.py
index cecc392d1..90d830c18 100644
--- a/demo/demo_widgets/migrations/0001_initial.py
+++ b/demo/demo_widgets/migrations/0001_initial.py
@@ -6,6 +6,9 @@
class Migration(SchemaMigration):
+ depends_on = [
+ ('widgy', '0001_initial'),
+ ]
def forwards(self, orm):
# Adding model 'SiteListCalloutContent'
@@ -45,4 +48,4 @@ def backwards(self, orm):
}
}
- complete_apps = ['demo_widgets']
\ No newline at end of file
+ complete_apps = ['demo_widgets']
diff --git a/demo/demo_widgets/migrations/0002_auto__add_twocontentlayout.py b/demo/demo_widgets/migrations/0002_auto__add_twocontentlayout.py
new file mode 100644
index 000000000..3c7705f63
--- /dev/null
+++ b/demo/demo_widgets/migrations/0002_auto__add_twocontentlayout.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Adding model 'TwoContentLayout'
+ db.create_table('demo_widgets_twocontentlayout', (
+ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ))
+ db.send_create_signal('demo_widgets', ['TwoContentLayout'])
+
+
+ def backwards(self, orm):
+ # Deleting model 'TwoContentLayout'
+ db.delete_table('demo_widgets_twocontentlayout')
+
+
+ models = {
+ 'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'demo_widgets.sitelistcalloutcontent': {
+ 'Meta': {'object_name': 'SiteListCalloutContent'},
+ 'header': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ 'demo_widgets.twocontentlayout': {
+ 'Meta': {'object_name': 'TwoContentLayout'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ 'widgy.node': {
+ 'Meta': {'object_name': 'Node'},
+ 'content_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+ 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
+ }
+ }
+
+ complete_apps = ['demo_widgets']
\ No newline at end of file
diff --git a/demo/demo_widgets/migrations/0003_auto__del_sitelistcalloutcontent__add_i18nthing.py b/demo/demo_widgets/migrations/0003_auto__del_sitelistcalloutcontent__add_i18nthing.py
new file mode 100644
index 000000000..7e951d1da
--- /dev/null
+++ b/demo/demo_widgets/migrations/0003_auto__del_sitelistcalloutcontent__add_i18nthing.py
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Deleting model 'SiteListCalloutContent'
+ db.delete_table('demo_widgets_sitelistcalloutcontent')
+
+ # Adding model 'I18NThing'
+ db.create_table('demo_widgets_i18nthing', (
+ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
+ ('description', self.gf('widgy.db.fields.WidgyField')(to=orm['widgy.Node'], null=True, on_delete=models.SET_NULL, blank=True)),
+ ))
+ db.send_create_signal('demo_widgets', ['I18NThing'])
+
+
+ def backwards(self, orm):
+ # Adding model 'SiteListCalloutContent'
+ db.create_table('demo_widgets_sitelistcalloutcontent', (
+ ('header', self.gf('django.db.models.fields.CharField')(default='', max_length=255, blank=True)),
+ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ))
+ db.send_create_signal('demo_widgets', ['SiteListCalloutContent'])
+
+ # Deleting model 'I18NThing'
+ db.delete_table('demo_widgets_i18nthing')
+
+
+ models = {
+ 'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'demo_widgets.i18nthing': {
+ 'Meta': {'object_name': 'I18NThing'},
+ 'description': ('widgy.db.fields.WidgyField', [], {'to': "orm['widgy.Node']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+ },
+ 'demo_widgets.twocontentlayout': {
+ 'Meta': {'object_name': 'TwoContentLayout'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ 'widgy.node': {
+ 'Meta': {'object_name': 'Node'},
+ 'content_id': ('django.db.models.fields.PositiveIntegerField', [], {}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'depth': ('django.db.models.fields.PositiveIntegerField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_frozen': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'numchild': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+ 'path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
+ }
+ }
+
+ complete_apps = ['demo_widgets']
\ No newline at end of file
diff --git a/demo/demo_widgets/models.py b/demo/demo_widgets/models.py
index 7bae45e05..a1817c7f7 100644
--- a/demo/demo_widgets/models.py
+++ b/demo/demo_widgets/models.py
@@ -1,6 +1,53 @@
-from widgy.contrib.list_content_widget.models import ListContentBase
-from django.contrib.sites.models import Site
+from django.db import models
+from django.conf import settings
+from django.utils.translation import ugettext_lazy as _
+from widgy import registry
+from widgy.db.fields import WidgyField
+from widgy.contrib.page_builder.models import Layout, MainContent, Accordion
-class SiteListCalloutContent(ListContentBase):
- model = Site
+
+class TwoContentLayout(Layout):
+ default_children = [
+ ('main1', MainContent, (), {}),
+ ('main2', MainContent, (), {}),
+ ]
+
+ class Meta:
+ verbose_name = 'Two Content Layout'
+
+registry.register(TwoContentLayout)
+
+
+class DemoAccordion(Accordion):
+ class Meta:
+ proxy = True
+ verbose_name = 'Accordion'
+
+ def valid_parent_of(self, cls, obj=None):
+ if obj and obj in self.get_children():
+ return True
+ else:
+ sup = super(DemoAccordion, self).valid_parent_of(cls)
+ if isinstance(self.get_root(), TwoContentLayout):
+ return sup and len(self.get_children()) < 2
+ else:
+ return sup
+
+registry.unregister(Accordion)
+registry.register(DemoAccordion)
+
+
+class I18NThing(models.Model):
+ name = models.CharField(_('name'), max_length=255)
+
+ description = WidgyField(
+ site=settings.WIDGY_MEZZANINE_SITE,
+ verbose_name=_('description'),
+ root_choices=(
+ 'widgy_i18n.I18NLayoutContainer',
+ ))
+
+ class Meta:
+ verbose_name = _('event')
+ verbose_name_plural = _('events')
diff --git a/demo/demo_widgets/tests.py b/demo/demo_widgets/tests.py
deleted file mode 100644
index 501deb776..000000000
--- a/demo/demo_widgets/tests.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""
-This file demonstrates writing tests using the unittest module. These will pass
-when you run "manage.py test".
-
-Replace this with more appropriate tests for your application.
-"""
-
-from django.test import TestCase
-
-
-class SimpleTest(TestCase):
- def test_basic_addition(self):
- """
- Tests that 1 + 1 always equals 2.
- """
- self.assertEqual(1 + 1, 2)
diff --git a/demo/demo_widgets/views.py b/demo/demo_widgets/views.py
deleted file mode 100644
index 60f00ef0e..000000000
--- a/demo/demo_widgets/views.py
+++ /dev/null
@@ -1 +0,0 @@
-# Create your views here.
diff --git a/demo/manage.py b/demo/manage.py
new file mode 100755
index 000000000..a406c7b5c
--- /dev/null
+++ b/demo/manage.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+import os, sys
+
+if __name__ == "__main__":
+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "demo.settings")
+
+ from django.core.management import execute_from_command_line
+
+ execute_from_command_line(sys.argv)
diff --git a/media/.gitkeep b/demo/media/.gitkeep
similarity index 100%
rename from media/.gitkeep
rename to demo/media/.gitkeep
diff --git a/demo/public/css/bootstrap.css b/demo/public/css/bootstrap.css
index fdba77f55..799b9cf33 100644
--- a/demo/public/css/bootstrap.css
+++ b/demo/public/css/bootstrap.css
@@ -1778,7 +1778,7 @@ table .span24 {
*margin-right: .3em;
line-height: 14px;
vertical-align: text-top;
- background-image: url("/img/glyphicons-halflings.png");
+ background-image: url("../img/glyphicons-halflings.png");
background-position: 14px 14px;
background-repeat: no-repeat;
}
@@ -1789,7 +1789,7 @@ table .span24 {
}
.icon-white {
- background-image: url("/img/glyphicons-halflings-white.png");
+ background-image: url("../img/glyphicons-halflings-white.png");
}
.icon-glass {
diff --git a/demo/public/js/backbone.js b/demo/public/js/backbone.js
deleted file mode 100644
index 3373c952b..000000000
--- a/demo/public/js/backbone.js
+++ /dev/null
@@ -1,1431 +0,0 @@
-// Backbone.js 0.9.2
-
-// (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc.
-// Backbone may be freely distributed under the MIT license.
-// For all details and documentation:
-// http://backbonejs.org
-
-(function(){
-
- // Initial Setup
- // -------------
-
- // Save a reference to the global object (`window` in the browser, `global`
- // on the server).
- var root = this;
-
- // Save the previous value of the `Backbone` variable, so that it can be
- // restored later on, if `noConflict` is used.
- var previousBackbone = root.Backbone;
-
- // Create a local reference to slice/splice.
- var slice = Array.prototype.slice;
- var splice = Array.prototype.splice;
-
- // The top-level namespace. All public Backbone classes and modules will
- // be attached to this. Exported for both CommonJS and the browser.
- var Backbone;
- if (typeof exports !== 'undefined') {
- Backbone = exports;
- } else {
- Backbone = root.Backbone = {};
- }
-
- // Current version of the library. Keep in sync with `package.json`.
- Backbone.VERSION = '0.9.2';
-
- // Require Underscore, if we're on the server, and it's not already present.
- var _ = root._;
- if (!_ && (typeof require !== 'undefined')) _ = require('underscore');
-
- // For Backbone's purposes, jQuery, Zepto, or Ender owns the `$` variable.
- var $ = root.jQuery || root.Zepto || root.ender;
-
- // Set the JavaScript library that will be used for DOM manipulation and
- // Ajax calls (a.k.a. the `$` variable). By default Backbone will use: jQuery,
- // Zepto, or Ender; but the `setDomLibrary()` method lets you inject an
- // alternate JavaScript library (or a mock library for testing your views
- // outside of a browser).
- Backbone.setDomLibrary = function(lib) {
- $ = lib;
- };
-
- // Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable
- // to its previous owner. Returns a reference to this Backbone object.
- Backbone.noConflict = function() {
- root.Backbone = previousBackbone;
- return this;
- };
-
- // Turn on `emulateHTTP` to support legacy HTTP servers. Setting this option
- // will fake `"PUT"` and `"DELETE"` requests via the `_method` parameter and
- // set a `X-Http-Method-Override` header.
- Backbone.emulateHTTP = false;
-
- // Turn on `emulateJSON` to support legacy servers that can't deal with direct
- // `application/json` requests ... will encode the body as
- // `application/x-www-form-urlencoded` instead and will send the model in a
- // form param named `model`.
- Backbone.emulateJSON = false;
-
- // Backbone.Events
- // -----------------
-
- // Regular expression used to split event strings
- var eventSplitter = /\s+/;
-
- // A module that can be mixed in to *any object* in order to provide it with
- // custom events. You may bind with `on` or remove with `off` callback functions
- // to an event; trigger`-ing an event fires all callbacks in succession.
- //
- // var object = {};
- // _.extend(object, Backbone.Events);
- // object.on('expand', function(){ alert('expanded'); });
- // object.trigger('expand');
- //
- var Events = Backbone.Events = {
-
- // Bind one or more space separated events, `events`, to a `callback`
- // function. Passing `"all"` will bind the callback to all events fired.
- on: function(events, callback, context) {
-
- var calls, event, node, tail, list;
- if (!callback) return this;
- events = events.split(eventSplitter);
- calls = this._callbacks || (this._callbacks = {});
-
- // Create an immutable callback list, allowing traversal during
- // modification. The tail is an empty object that will always be used
- // as the next node.
- while (event = events.shift()) {
- list = calls[event];
- node = list ? list.tail : {};
- node.next = tail = {};
- node.context = context;
- node.callback = callback;
- calls[event] = {tail: tail, next: list ? list.next : node};
- }
-
- return this;
- },
-
- // Remove one or many callbacks. If `context` is null, removes all callbacks
- // with that function. If `callback` is null, removes all callbacks for the
- // event. If `events` is null, removes all bound callbacks for all events.
- off: function(events, callback, context) {
- var event, calls, node, tail, cb, ctx;
-
- // No events, or removing *all* events.
- if (!(calls = this._callbacks)) return;
- if (!(events || callback || context)) {
- delete this._callbacks;
- return this;
- }
-
- // Loop through the listed events and contexts, splicing them out of the
- // linked list of callbacks if appropriate.
- events = events ? events.split(eventSplitter) : _.keys(calls);
- while (event = events.shift()) {
- node = calls[event];
- delete calls[event];
- if (!node || !(callback || context)) continue;
- // Create a new list, omitting the indicated callbacks.
- tail = node.tail;
- while ((node = node.next) !== tail) {
- cb = node.callback;
- ctx = node.context;
- if ((callback && cb !== callback) || (context && ctx !== context)) {
- this.on(event, cb, ctx);
- }
- }
- }
-
- return this;
- },
-
- // Trigger one or many events, firing all bound callbacks. Callbacks are
- // passed the same arguments as `trigger` is, apart from the event name
- // (unless you're listening on `"all"`, which will cause your callback to
- // receive the true name of the event as the first argument).
- trigger: function(events) {
- var event, node, calls, tail, args, all, rest;
- if (!(calls = this._callbacks)) return this;
- all = calls.all;
- events = events.split(eventSplitter);
- rest = slice.call(arguments, 1);
-
- // For each event, walk through the linked list of callbacks twice,
- // first to trigger the event, then to trigger any `"all"` callbacks.
- while (event = events.shift()) {
- if (node = calls[event]) {
- tail = node.tail;
- while ((node = node.next) !== tail) {
- node.callback.apply(node.context || this, rest);
- }
- }
- if (node = all) {
- tail = node.tail;
- args = [event].concat(rest);
- while ((node = node.next) !== tail) {
- node.callback.apply(node.context || this, args);
- }
- }
- }
-
- return this;
- }
-
- };
-
- // Aliases for backwards compatibility.
- Events.bind = Events.on;
- Events.unbind = Events.off;
-
- // Backbone.Model
- // --------------
-
- // Create a new model, with defined attributes. A client id (`cid`)
- // is automatically generated and assigned for you.
- var Model = Backbone.Model = function(attributes, options) {
- var defaults;
- attributes || (attributes = {});
- if (options && options.parse) attributes = this.parse(attributes);
- if (defaults = getValue(this, 'defaults')) {
- attributes = _.extend({}, defaults, attributes);
- }
- if (options && options.collection) this.collection = options.collection;
- this.attributes = {};
- this._escapedAttributes = {};
- this.cid = _.uniqueId('c');
- this.changed = {};
- this._silent = {};
- this._pending = {};
- this.set(attributes, {silent: true});
- // Reset change tracking.
- this.changed = {};
- this._silent = {};
- this._pending = {};
- this._previousAttributes = _.clone(this.attributes);
- this.initialize.apply(this, arguments);
- };
-
- // Attach all inheritable methods to the Model prototype.
- _.extend(Model.prototype, Events, {
-
- // A hash of attributes whose current and previous value differ.
- changed: null,
-
- // A hash of attributes that have silently changed since the last time
- // `change` was called. Will become pending attributes on the next call.
- _silent: null,
-
- // A hash of attributes that have changed since the last `'change'` event
- // began.
- _pending: null,
-
- // The default name for the JSON `id` attribute is `"id"`. MongoDB and
- // CouchDB users may want to set this to `"_id"`.
- idAttribute: 'id',
-
- // Initialize is an empty function by default. Override it with your own
- // initialization logic.
- initialize: function(){},
-
- // Return a copy of the model's `attributes` object.
- toJSON: function(options) {
- return _.clone(this.attributes);
- },
-
- // Get the value of an attribute.
- get: function(attr) {
- return this.attributes[attr];
- },
-
- // Get the HTML-escaped value of an attribute.
- escape: function(attr) {
- var html;
- if (html = this._escapedAttributes[attr]) return html;
- var val = this.get(attr);
- return this._escapedAttributes[attr] = _.escape(val == null ? '' : '' + val);
- },
-
- // Returns `true` if the attribute contains a value that is not null
- // or undefined.
- has: function(attr) {
- return this.get(attr) != null;
- },
-
- // Set a hash of model attributes on the object, firing `"change"` unless
- // you choose to silence it.
- set: function(key, value, options) {
- var attrs, attr, val;
-
- // Handle both `"key", value` and `{key: value}` -style arguments.
- if (_.isObject(key) || key == null) {
- attrs = key;
- options = value;
- } else {
- attrs = {};
- attrs[key] = value;
- }
-
- // Extract attributes and options.
- options || (options = {});
- if (!attrs) return this;
- if (attrs instanceof Model) attrs = attrs.attributes;
- if (options.unset) for (attr in attrs) attrs[attr] = void 0;
-
- // Run validation.
- if (!this._validate(attrs, options)) return false;
-
- // Check for changes of `id`.
- if (this.idAttribute in attrs) this.id = attrs[this.idAttribute];
-
- var changes = options.changes = {};
- var now = this.attributes;
- var escaped = this._escapedAttributes;
- var prev = this._previousAttributes || {};
-
- // For each `set` attribute...
- for (attr in attrs) {
- val = attrs[attr];
-
- // If the new and current value differ, record the change.
- if (!_.isEqual(now[attr], val) || (options.unset && _.has(now, attr))) {
- delete escaped[attr];
- (options.silent ? this._silent : changes)[attr] = true;
- }
-
- // Update or delete the current value.
- options.unset ? delete now[attr] : now[attr] = val;
-
- // If the new and previous value differ, record the change. If not,
- // then remove changes for this attribute.
- if (!_.isEqual(prev[attr], val) || (_.has(now, attr) != _.has(prev, attr))) {
- this.changed[attr] = val;
- if (!options.silent) this._pending[attr] = true;
- } else {
- delete this.changed[attr];
- delete this._pending[attr];
- }
- }
-
- // Fire the `"change"` events.
- if (!options.silent) this.change(options);
- return this;
- },
-
- // Remove an attribute from the model, firing `"change"` unless you choose
- // to silence it. `unset` is a noop if the attribute doesn't exist.
- unset: function(attr, options) {
- (options || (options = {})).unset = true;
- return this.set(attr, null, options);
- },
-
- // Clear all attributes on the model, firing `"change"` unless you choose
- // to silence it.
- clear: function(options) {
- (options || (options = {})).unset = true;
- return this.set(_.clone(this.attributes), options);
- },
-
- // Fetch the model from the server. If the server's representation of the
- // model differs from its current attributes, they will be overriden,
- // triggering a `"change"` event.
- fetch: function(options) {
- options = options ? _.clone(options) : {};
- var model = this;
- var success = options.success;
- options.success = function(resp, status, xhr) {
- if (!model.set(model.parse(resp, xhr), options)) return false;
- if (success) success(model, resp);
- };
- options.error = Backbone.wrapError(options.error, model, options);
- return (this.sync || Backbone.sync).call(this, 'read', this, options);
- },
-
- // Set a hash of model attributes, and sync the model to the server.
- // If the server returns an attributes hash that differs, the model's
- // state will be `set` again.
- save: function(key, value, options) {
- var attrs, current;
-
- // Handle both `("key", value)` and `({key: value})` -style calls.
- if (_.isObject(key) || key == null) {
- attrs = key;
- options = value;
- } else {
- attrs = {};
- attrs[key] = value;
- }
- options = options ? _.clone(options) : {};
-
- // If we're "wait"-ing to set changed attributes, validate early.
- if (options.wait) {
- if (!this._validate(attrs, options)) return false;
- current = _.clone(this.attributes);
- }
-
- // Regular saves `set` attributes before persisting to the server.
- var silentOptions = _.extend({}, options, {silent: true});
- if (attrs && !this.set(attrs, options.wait ? silentOptions : options)) {
- return false;
- }
-
- // After a successful server-side save, the client is (optionally)
- // updated with the server-side state.
- var model = this;
- var success = options.success;
- options.success = function(resp, status, xhr) {
- var serverAttrs = model.parse(resp, xhr);
- if (options.wait) {
- delete options.wait;
- serverAttrs = _.extend(attrs || {}, serverAttrs);
- }
- if (!model.set(serverAttrs, options)) return false;
- if (success) {
- success(model, resp);
- } else {
- model.trigger('sync', model, resp, options);
- }
- };
-
- // Finish configuring and sending the Ajax request.
- options.error = Backbone.wrapError(options.error, model, options);
- var method = this.isNew() ? 'create' : 'update';
- var xhr = (this.sync || Backbone.sync).call(this, method, this, options);
- if (options.wait) this.set(current, silentOptions);
- return xhr;
- },
-
- // Destroy this model on the server if it was already persisted.
- // Optimistically removes the model from its collection, if it has one.
- // If `wait: true` is passed, waits for the server to respond before removal.
- destroy: function(options) {
- options = options ? _.clone(options) : {};
- var model = this;
- var success = options.success;
-
- var triggerDestroy = function() {
- model.trigger('destroy', model, model.collection, options);
- };
-
- if (this.isNew()) {
- triggerDestroy();
- return false;
- }
-
- options.success = function(resp) {
- if (options.wait) triggerDestroy();
- if (success) {
- success(model, resp);
- } else {
- model.trigger('sync', model, resp, options);
- }
- };
-
- options.error = Backbone.wrapError(options.error, model, options);
- var xhr = (this.sync || Backbone.sync).call(this, 'delete', this, options);
- if (!options.wait) triggerDestroy();
- return xhr;
- },
-
- // Default URL for the model's representation on the server -- if you're
- // using Backbone's restful methods, override this to change the endpoint
- // that will be called.
- url: function() {
- var base = getValue(this, 'urlRoot') || getValue(this.collection, 'url') || urlError();
- if (this.isNew()) return base;
- return base + (base.charAt(base.length - 1) == '/' ? '' : '/') + encodeURIComponent(this.id);
- },
-
- // **parse** converts a response into the hash of attributes to be `set` on
- // the model. The default implementation is just to pass the response along.
- parse: function(resp, xhr) {
- return resp;
- },
-
- // Create a new model with identical attributes to this one.
- clone: function() {
- return new this.constructor(this.attributes);
- },
-
- // A model is new if it has never been saved to the server, and lacks an id.
- isNew: function() {
- return this.id == null;
- },
-
- // Call this method to manually fire a `"change"` event for this model and
- // a `"change:attribute"` event for each changed attribute.
- // Calling this will cause all objects observing the model to update.
- change: function(options) {
- options || (options = {});
- var changing = this._changing;
- this._changing = true;
-
- // Silent changes become pending changes.
- for (var attr in this._silent) this._pending[attr] = true;
-
- // Silent changes are triggered.
- var changes = _.extend({}, options.changes, this._silent);
- this._silent = {};
- for (var attr in changes) {
- this.trigger('change:' + attr, this, this.get(attr), options);
- }
- if (changing) return this;
-
- // Continue firing `"change"` events while there are pending changes.
- while (!_.isEmpty(this._pending)) {
- this._pending = {};
- this.trigger('change', this, options);
- // Pending and silent changes still remain.
- for (var attr in this.changed) {
- if (this._pending[attr] || this._silent[attr]) continue;
- delete this.changed[attr];
- }
- this._previousAttributes = _.clone(this.attributes);
- }
-
- this._changing = false;
- return this;
- },
-
- // Determine if the model has changed since the last `"change"` event.
- // If you specify an attribute name, determine if that attribute has changed.
- hasChanged: function(attr) {
- if (!arguments.length) return !_.isEmpty(this.changed);
- return _.has(this.changed, attr);
- },
-
- // Return an object containing all the attributes that have changed, or
- // false if there are no changed attributes. Useful for determining what
- // parts of a view need to be updated and/or what attributes need to be
- // persisted to the server. Unset attributes will be set to undefined.
- // You can also pass an attributes object to diff against the model,
- // determining if there *would be* a change.
- changedAttributes: function(diff) {
- if (!diff) return this.hasChanged() ? _.clone(this.changed) : false;
- var val, changed = false, old = this._previousAttributes;
- for (var attr in diff) {
- if (_.isEqual(old[attr], (val = diff[attr]))) continue;
- (changed || (changed = {}))[attr] = val;
- }
- return changed;
- },
-
- // Get the previous value of an attribute, recorded at the time the last
- // `"change"` event was fired.
- previous: function(attr) {
- if (!arguments.length || !this._previousAttributes) return null;
- return this._previousAttributes[attr];
- },
-
- // Get all of the attributes of the model at the time of the previous
- // `"change"` event.
- previousAttributes: function() {
- return _.clone(this._previousAttributes);
- },
-
- // Check if the model is currently in a valid state. It's only possible to
- // get into an *invalid* state if you're using silent changes.
- isValid: function() {
- return !this.validate(this.attributes);
- },
-
- // Run validation against the next complete set of model attributes,
- // returning `true` if all is well. If a specific `error` callback has
- // been passed, call that instead of firing the general `"error"` event.
- _validate: function(attrs, options) {
- if (options.silent || !this.validate) return true;
- attrs = _.extend({}, this.attributes, attrs);
- var error = this.validate(attrs, options);
- if (!error) return true;
- if (options && options.error) {
- options.error(this, error, options);
- } else {
- this.trigger('error', this, error, options);
- }
- return false;
- }
-
- });
-
- // Backbone.Collection
- // -------------------
-
- // Provides a standard collection class for our sets of models, ordered
- // or unordered. If a `comparator` is specified, the Collection will maintain
- // its models in sort order, as they're added and removed.
- var Collection = Backbone.Collection = function(models, options) {
- options || (options = {});
- if (options.model) this.model = options.model;
- if (options.comparator) this.comparator = options.comparator;
- this._reset();
- this.initialize.apply(this, arguments);
- if (models) this.reset(models, {silent: true, parse: options.parse});
- };
-
- // Define the Collection's inheritable methods.
- _.extend(Collection.prototype, Events, {
-
- // The default model for a collection is just a **Backbone.Model**.
- // This should be overridden in most cases.
- model: Model,
-
- // Initialize is an empty function by default. Override it with your own
- // initialization logic.
- initialize: function(){},
-
- // The JSON representation of a Collection is an array of the
- // models' attributes.
- toJSON: function(options) {
- return this.map(function(model){ return model.toJSON(options); });
- },
-
- // Add a model, or list of models to the set. Pass **silent** to avoid
- // firing the `add` event for every new model.
- add: function(models, options) {
- var i, index, length, model, cid, id, cids = {}, ids = {}, dups = [];
- options || (options = {});
- models = _.isArray(models) ? models.slice() : [models];
-
- // Begin by turning bare objects into model references, and preventing
- // invalid models or duplicate models from being added.
- for (i = 0, length = models.length; i < length; i++) {
- if (!(model = models[i] = this._prepareModel(models[i], options))) {
- throw new Error("Can't add an invalid model to a collection");
- }
- cid = model.cid;
- id = model.id;
- if (cids[cid] || this._byCid[cid] || ((id != null) && (ids[id] || this._byId[id]))) {
- dups.push(i);
- continue;
- }
- cids[cid] = ids[id] = model;
- }
-
- // Remove duplicates.
- i = dups.length;
- while (i--) {
- models.splice(dups[i], 1);
- }
-
- // Listen to added models' events, and index models for lookup by
- // `id` and by `cid`.
- for (i = 0, length = models.length; i < length; i++) {
- (model = models[i]).on('all', this._onModelEvent, this);
- this._byCid[model.cid] = model;
- if (model.id != null) this._byId[model.id] = model;
- }
-
- // Insert models into the collection, re-sorting if needed, and triggering
- // `add` events unless silenced.
- this.length += length;
- index = options.at != null ? options.at : this.models.length;
- splice.apply(this.models, [index, 0].concat(models));
- if (this.comparator) this.sort({silent: true});
- if (options.silent) return this;
- for (i = 0, length = this.models.length; i < length; i++) {
- if (!cids[(model = this.models[i]).cid]) continue;
- options.index = i;
- model.trigger('add', model, this, options);
- }
- return this;
- },
-
- // Remove a model, or a list of models from the set. Pass silent to avoid
- // firing the `remove` event for every model removed.
- remove: function(models, options) {
- var i, l, index, model;
- options || (options = {});
- models = _.isArray(models) ? models.slice() : [models];
- for (i = 0, l = models.length; i < l; i++) {
- model = this.getByCid(models[i]) || this.get(models[i]);
- if (!model) continue;
- delete this._byId[model.id];
- delete this._byCid[model.cid];
- index = this.indexOf(model);
- this.models.splice(index, 1);
- this.length--;
- if (!options.silent) {
- options.index = index;
- model.trigger('remove', model, this, options);
- }
- this._removeReference(model);
- }
- return this;
- },
-
- // Add a model to the end of the collection.
- push: function(model, options) {
- model = this._prepareModel(model, options);
- this.add(model, options);
- return model;
- },
-
- // Remove a model from the end of the collection.
- pop: function(options) {
- var model = this.at(this.length - 1);
- this.remove(model, options);
- return model;
- },
-
- // Add a model to the beginning of the collection.
- unshift: function(model, options) {
- model = this._prepareModel(model, options);
- this.add(model, _.extend({at: 0}, options));
- return model;
- },
-
- // Remove a model from the beginning of the collection.
- shift: function(options) {
- var model = this.at(0);
- this.remove(model, options);
- return model;
- },
-
- // Get a model from the set by id.
- get: function(id) {
- if (id == null) return void 0;
- return this._byId[id.id != null ? id.id : id];
- },
-
- // Get a model from the set by client id.
- getByCid: function(cid) {
- return cid && this._byCid[cid.cid || cid];
- },
-
- // Get the model at the given index.
- at: function(index) {
- return this.models[index];
- },
-
- // Return models with matching attributes. Useful for simple cases of `filter`.
- where: function(attrs) {
- if (_.isEmpty(attrs)) return [];
- return this.filter(function(model) {
- for (var key in attrs) {
- if (attrs[key] !== model.get(key)) return false;
- }
- return true;
- });
- },
-
- // Force the collection to re-sort itself. You don't need to call this under
- // normal circumstances, as the set will maintain sort order as each item
- // is added.
- sort: function(options) {
- options || (options = {});
- if (!this.comparator) throw new Error('Cannot sort a set without a comparator');
- var boundComparator = _.bind(this.comparator, this);
- if (this.comparator.length == 1) {
- this.models = this.sortBy(boundComparator);
- } else {
- this.models.sort(boundComparator);
- }
- if (!options.silent) this.trigger('reset', this, options);
- return this;
- },
-
- // Pluck an attribute from each model in the collection.
- pluck: function(attr) {
- return _.map(this.models, function(model){ return model.get(attr); });
- },
-
- // When you have more items than you want to add or remove individually,
- // you can reset the entire set with a new list of models, without firing
- // any `add` or `remove` events. Fires `reset` when finished.
- reset: function(models, options) {
- models || (models = []);
- options || (options = {});
- for (var i = 0, l = this.models.length; i < l; i++) {
- this._removeReference(this.models[i]);
- }
- this._reset();
- this.add(models, _.extend({silent: true}, options));
- if (!options.silent) this.trigger('reset', this, options);
- return this;
- },
-
- // Fetch the default set of models for this collection, resetting the
- // collection when they arrive. If `add: true` is passed, appends the
- // models to the collection instead of resetting.
- fetch: function(options) {
- options = options ? _.clone(options) : {};
- if (options.parse === undefined) options.parse = true;
- var collection = this;
- var success = options.success;
- options.success = function(resp, status, xhr) {
- collection[options.add ? 'add' : 'reset'](collection.parse(resp, xhr), options);
- if (success) success(collection, resp);
- };
- options.error = Backbone.wrapError(options.error, collection, options);
- return (this.sync || Backbone.sync).call(this, 'read', this, options);
- },
-
- // Create a new instance of a model in this collection. Add the model to the
- // collection immediately, unless `wait: true` is passed, in which case we
- // wait for the server to agree.
- create: function(model, options) {
- var coll = this;
- options = options ? _.clone(options) : {};
- model = this._prepareModel(model, options);
- if (!model) return false;
- if (!options.wait) coll.add(model, options);
- var success = options.success;
- options.success = function(nextModel, resp, xhr) {
- if (options.wait) coll.add(nextModel, options);
- if (success) {
- success(nextModel, resp);
- } else {
- nextModel.trigger('sync', model, resp, options);
- }
- };
- model.save(null, options);
- return model;
- },
-
- // **parse** converts a response into a list of models to be added to the
- // collection. The default implementation is just to pass it through.
- parse: function(resp, xhr) {
- return resp;
- },
-
- // Proxy to _'s chain. Can't be proxied the same way the rest of the
- // underscore methods are proxied because it relies on the underscore
- // constructor.
- chain: function () {
- return _(this.models).chain();
- },
-
- // Reset all internal state. Called when the collection is reset.
- _reset: function(options) {
- this.length = 0;
- this.models = [];
- this._byId = {};
- this._byCid = {};
- },
-
- // Prepare a model or hash of attributes to be added to this collection.
- _prepareModel: function(model, options) {
- options || (options = {});
- if (!(model instanceof Model)) {
- var attrs = model;
- options.collection = this;
- model = new this.model(attrs, options);
- if (!model._validate(model.attributes, options)) model = false;
- } else if (!model.collection) {
- model.collection = this;
- }
- return model;
- },
-
- // Internal method to remove a model's ties to a collection.
- _removeReference: function(model) {
- if (this == model.collection) {
- delete model.collection;
- }
- model.off('all', this._onModelEvent, this);
- },
-
- // Internal method called every time a model in the set fires an event.
- // Sets need to update their indexes when models change ids. All other
- // events simply proxy through. "add" and "remove" events that originate
- // in other collections are ignored.
- _onModelEvent: function(event, model, collection, options) {
- if ((event == 'add' || event == 'remove') && collection != this) return;
- if (event == 'destroy') {
- this.remove(model, options);
- }
- if (model && event === 'change:' + model.idAttribute) {
- delete this._byId[model.previous(model.idAttribute)];
- this._byId[model.id] = model;
- }
- this.trigger.apply(this, arguments);
- }
-
- });
-
- // Underscore methods that we want to implement on the Collection.
- var methods = ['forEach', 'each', 'map', 'reduce', 'reduceRight', 'find',
- 'detect', 'filter', 'select', 'reject', 'every', 'all', 'some', 'any',
- 'include', 'contains', 'invoke', 'max', 'min', 'sortBy', 'sortedIndex',
- 'toArray', 'size', 'first', 'initial', 'rest', 'last', 'without', 'indexOf',
- 'shuffle', 'lastIndexOf', 'isEmpty', 'groupBy'];
-
- // Mix in each Underscore method as a proxy to `Collection#models`.
- _.each(methods, function(method) {
- Collection.prototype[method] = function() {
- return _[method].apply(_, [this.models].concat(_.toArray(arguments)));
- };
- });
-
- // Backbone.Router
- // -------------------
-
- // Routers map faux-URLs to actions, and fire events when routes are
- // matched. Creating a new one sets its `routes` hash, if not set statically.
- var Router = Backbone.Router = function(options) {
- options || (options = {});
- if (options.routes) this.routes = options.routes;
- this._bindRoutes();
- this.initialize.apply(this, arguments);
- };
-
- // Cached regular expressions for matching named param parts and splatted
- // parts of route strings.
- var namedParam = /:\w+/g;
- var splatParam = /\*\w+/g;
- var escapeRegExp = /[-[\]{}()+?.,\\^$|#\s]/g;
-
- // Set up all inheritable **Backbone.Router** properties and methods.
- _.extend(Router.prototype, Events, {
-
- // Initialize is an empty function by default. Override it with your own
- // initialization logic.
- initialize: function(){},
-
- // Manually bind a single named route to a callback. For example:
- //
- // this.route('search/:query/p:num', 'search', function(query, num) {
- // ...
- // });
- //
- route: function(route, name, callback) {
- Backbone.history || (Backbone.history = new History);
- if (!_.isRegExp(route)) route = this._routeToRegExp(route);
- if (!callback) callback = this[name];
- Backbone.history.route(route, _.bind(function(fragment) {
- var args = this._extractParameters(route, fragment);
- callback && callback.apply(this, args);
- this.trigger.apply(this, ['route:' + name].concat(args));
- Backbone.history.trigger('route', this, name, args);
- }, this));
- return this;
- },
-
- // Simple proxy to `Backbone.history` to save a fragment into the history.
- navigate: function(fragment, options) {
- Backbone.history.navigate(fragment, options);
- },
-
- // Bind all defined routes to `Backbone.history`. We have to reverse the
- // order of the routes here to support behavior where the most general
- // routes can be defined at the bottom of the route map.
- _bindRoutes: function() {
- if (!this.routes) return;
- var routes = [];
- for (var route in this.routes) {
- routes.unshift([route, this.routes[route]]);
- }
- for (var i = 0, l = routes.length; i < l; i++) {
- this.route(routes[i][0], routes[i][1], this[routes[i][1]]);
- }
- },
-
- // Convert a route string into a regular expression, suitable for matching
- // against the current location hash.
- _routeToRegExp: function(route) {
- route = route.replace(escapeRegExp, '\\$&')
- .replace(namedParam, '([^\/]+)')
- .replace(splatParam, '(.*?)');
- return new RegExp('^' + route + '$');
- },
-
- // Given a route, and a URL fragment that it matches, return the array of
- // extracted parameters.
- _extractParameters: function(route, fragment) {
- return route.exec(fragment).slice(1);
- }
-
- });
-
- // Backbone.History
- // ----------------
-
- // Handles cross-browser history management, based on URL fragments. If the
- // browser does not support `onhashchange`, falls back to polling.
- var History = Backbone.History = function() {
- this.handlers = [];
- _.bindAll(this, 'checkUrl');
- };
-
- // Cached regex for cleaning leading hashes and slashes .
- var routeStripper = /^[#\/]/;
-
- // Cached regex for detecting MSIE.
- var isExplorer = /msie [\w.]+/;
-
- // Has the history handling already been started?
- History.started = false;
-
- // Set up all inheritable **Backbone.History** properties and methods.
- _.extend(History.prototype, Events, {
-
- // The default interval to poll for hash changes, if necessary, is
- // twenty times a second.
- interval: 50,
-
- // Gets the true hash value. Cannot use location.hash directly due to bug
- // in Firefox where location.hash will always be decoded.
- getHash: function(windowOverride) {
- var loc = windowOverride ? windowOverride.location : window.location;
- var match = loc.href.match(/#(.*)$/);
- return match ? match[1] : '';
- },
-
- // Get the cross-browser normalized URL fragment, either from the URL,
- // the hash, or the override.
- getFragment: function(fragment, forcePushState) {
- if (fragment == null) {
- if (this._hasPushState || forcePushState) {
- fragment = window.location.pathname;
- var search = window.location.search;
- if (search) fragment += search;
- } else {
- fragment = this.getHash();
- }
- }
- if (!fragment.indexOf(this.options.root)) fragment = fragment.substr(this.options.root.length);
- return fragment.replace(routeStripper, '');
- },
-
- // Start the hash change handling, returning `true` if the current URL matches
- // an existing route, and `false` otherwise.
- start: function(options) {
- if (History.started) throw new Error("Backbone.history has already been started");
- History.started = true;
-
- // Figure out the initial configuration. Do we need an iframe?
- // Is pushState desired ... is it available?
- this.options = _.extend({}, {root: '/'}, this.options, options);
- this._wantsHashChange = this.options.hashChange !== false;
- this._wantsPushState = !!this.options.pushState;
- this._hasPushState = !!(this.options.pushState && window.history && window.history.pushState);
- var fragment = this.getFragment();
- var docMode = document.documentMode;
- var oldIE = (isExplorer.exec(navigator.userAgent.toLowerCase()) && (!docMode || docMode <= 7));
-
- if (oldIE) {
- this.iframe = $('').hide().appendTo('body')[0].contentWindow;
- this.navigate(fragment);
- }
-
- // Depending on whether we're using pushState or hashes, and whether
- // 'onhashchange' is supported, determine how we check the URL state.
- if (this._hasPushState) {
- $(window).bind('popstate', this.checkUrl);
- } else if (this._wantsHashChange && ('onhashchange' in window) && !oldIE) {
- $(window).bind('hashchange', this.checkUrl);
- } else if (this._wantsHashChange) {
- this._checkUrlInterval = setInterval(this.checkUrl, this.interval);
- }
-
- // Determine if we need to change the base url, for a pushState link
- // opened by a non-pushState browser.
- this.fragment = fragment;
- var loc = window.location;
- var atRoot = loc.pathname == this.options.root;
-
- // If we've started off with a route from a `pushState`-enabled browser,
- // but we're currently in a browser that doesn't support it...
- if (this._wantsHashChange && this._wantsPushState && !this._hasPushState && !atRoot) {
- this.fragment = this.getFragment(null, true);
- window.location.replace(this.options.root + '#' + this.fragment);
- // Return immediately as browser will do redirect to new url
- return true;
-
- // Or if we've started out with a hash-based route, but we're currently
- // in a browser where it could be `pushState`-based instead...
- } else if (this._wantsPushState && this._hasPushState && atRoot && loc.hash) {
- this.fragment = this.getHash().replace(routeStripper, '');
- window.history.replaceState({}, document.title, loc.protocol + '//' + loc.host + this.options.root + this.fragment);
- }
-
- if (!this.options.silent) {
- return this.loadUrl();
- }
- },
-
- // Disable Backbone.history, perhaps temporarily. Not useful in a real app,
- // but possibly useful for unit testing Routers.
- stop: function() {
- $(window).unbind('popstate', this.checkUrl).unbind('hashchange', this.checkUrl);
- clearInterval(this._checkUrlInterval);
- History.started = false;
- },
-
- // Add a route to be tested when the fragment changes. Routes added later
- // may override previous routes.
- route: function(route, callback) {
- this.handlers.unshift({route: route, callback: callback});
- },
-
- // Checks the current URL to see if it has changed, and if it has,
- // calls `loadUrl`, normalizing across the hidden iframe.
- checkUrl: function(e) {
- var current = this.getFragment();
- if (current == this.fragment && this.iframe) current = this.getFragment(this.getHash(this.iframe));
- if (current == this.fragment) return false;
- if (this.iframe) this.navigate(current);
- this.loadUrl() || this.loadUrl(this.getHash());
- },
-
- // Attempt to load the current URL fragment. If a route succeeds with a
- // match, returns `true`. If no defined routes matches the fragment,
- // returns `false`.
- loadUrl: function(fragmentOverride) {
- var fragment = this.fragment = this.getFragment(fragmentOverride);
- var matched = _.any(this.handlers, function(handler) {
- if (handler.route.test(fragment)) {
- handler.callback(fragment);
- return true;
- }
- });
- return matched;
- },
-
- // Save a fragment into the hash history, or replace the URL state if the
- // 'replace' option is passed. You are responsible for properly URL-encoding
- // the fragment in advance.
- //
- // The options object can contain `trigger: true` if you wish to have the
- // route callback be fired (not usually desirable), or `replace: true`, if
- // you wish to modify the current URL without adding an entry to the history.
- navigate: function(fragment, options) {
- if (!History.started) return false;
- if (!options || options === true) options = {trigger: options};
- var frag = (fragment || '').replace(routeStripper, '');
- if (this.fragment == frag) return;
-
- // If pushState is available, we use it to set the fragment as a real URL.
- if (this._hasPushState) {
- if (frag.indexOf(this.options.root) != 0) frag = this.options.root + frag;
- this.fragment = frag;
- window.history[options.replace ? 'replaceState' : 'pushState']({}, document.title, frag);
-
- // If hash changes haven't been explicitly disabled, update the hash
- // fragment to store history.
- } else if (this._wantsHashChange) {
- this.fragment = frag;
- this._updateHash(window.location, frag, options.replace);
- if (this.iframe && (frag != this.getFragment(this.getHash(this.iframe)))) {
- // Opening and closing the iframe tricks IE7 and earlier to push a history entry on hash-tag change.
- // When replace is true, we don't want this.
- if(!options.replace) this.iframe.document.open().close();
- this._updateHash(this.iframe.location, frag, options.replace);
- }
-
- // If you've told us that you explicitly don't want fallback hashchange-
- // based history, then `navigate` becomes a page refresh.
- } else {
- window.location.assign(this.options.root + fragment);
- }
- if (options.trigger) this.loadUrl(fragment);
- },
-
- // Update the hash location, either replacing the current entry, or adding
- // a new one to the browser history.
- _updateHash: function(location, fragment, replace) {
- if (replace) {
- location.replace(location.toString().replace(/(javascript:|#).*$/, '') + '#' + fragment);
- } else {
- location.hash = fragment;
- }
- }
- });
-
- // Backbone.View
- // -------------
-
- // Creating a Backbone.View creates its initial element outside of the DOM,
- // if an existing element is not provided...
- var View = Backbone.View = function(options) {
- this.cid = _.uniqueId('view');
- this._configure(options || {});
- this._ensureElement();
- this.initialize.apply(this, arguments);
- this.delegateEvents();
- };
-
- // Cached regex to split keys for `delegate`.
- var delegateEventSplitter = /^(\S+)\s*(.*)$/;
-
- // List of view options to be merged as properties.
- var viewOptions = ['model', 'collection', 'el', 'id', 'attributes', 'className', 'tagName'];
-
- // Set up all inheritable **Backbone.View** properties and methods.
- _.extend(View.prototype, Events, {
-
- // The default `tagName` of a View's element is `"div"`.
- tagName: 'div',
-
- // jQuery delegate for element lookup, scoped to DOM elements within the
- // current view. This should be prefered to global lookups where possible.
- $: function(selector) {
- return this.$el.find(selector);
- },
-
- // Initialize is an empty function by default. Override it with your own
- // initialization logic.
- initialize: function(){},
-
- // **render** is the core function that your view should override, in order
- // to populate its element (`this.el`), with the appropriate HTML. The
- // convention is for **render** to always return `this`.
- render: function() {
- return this;
- },
-
- // Remove this view from the DOM. Note that the view isn't present in the
- // DOM by default, so calling this method may be a no-op.
- remove: function() {
- this.$el.remove();
- return this;
- },
-
- // For small amounts of DOM Elements, where a full-blown template isn't
- // needed, use **make** to manufacture elements, one at a time.
- //
- // var el = this.make('li', {'class': 'row'}, this.model.escape('title'));
- //
- make: function(tagName, attributes, content) {
- var el = document.createElement(tagName);
- if (attributes) $(el).attr(attributes);
- if (content) $(el).html(content);
- return el;
- },
-
- // Change the view's element (`this.el` property), including event
- // re-delegation.
- setElement: function(element, delegate) {
- if (this.$el) this.undelegateEvents();
- this.$el = (element instanceof $) ? element : $(element);
- this.el = this.$el[0];
- if (delegate !== false) this.delegateEvents();
- return this;
- },
-
- // Set callbacks, where `this.events` is a hash of
- //
- // *{"event selector": "callback"}*
- //
- // {
- // 'mousedown .title': 'edit',
- // 'click .button': 'save'
- // 'click .open': function(e) { ... }
- // }
- //
- // pairs. Callbacks will be bound to the view, with `this` set properly.
- // Uses event delegation for efficiency.
- // Omitting the selector binds the event to `this.el`.
- // This only works for delegate-able events: not `focus`, `blur`, and
- // not `change`, `submit`, and `reset` in Internet Explorer.
- delegateEvents: function(events) {
- if (!(events || (events = getValue(this, 'events')))) return;
- this.undelegateEvents();
- for (var key in events) {
- var method = events[key];
- if (!_.isFunction(method)) method = this[events[key]];
- if (!method) throw new Error('Method "' + events[key] + '" does not exist');
- var match = key.match(delegateEventSplitter);
- var eventName = match[1], selector = match[2];
- method = _.bind(method, this);
- eventName += '.delegateEvents' + this.cid;
- if (selector === '') {
- this.$el.bind(eventName, method);
- } else {
- this.$el.delegate(selector, eventName, method);
- }
- }
- },
-
- // Clears all callbacks previously bound to the view with `delegateEvents`.
- // You usually don't need to use this, but may wish to if you have multiple
- // Backbone views attached to the same DOM element.
- undelegateEvents: function() {
- this.$el.unbind('.delegateEvents' + this.cid);
- },
-
- // Performs the initial configuration of a View with a set of options.
- // Keys with special meaning *(model, collection, id, className)*, are
- // attached directly to the view.
- _configure: function(options) {
- if (this.options) options = _.extend({}, this.options, options);
- for (var i = 0, l = viewOptions.length; i < l; i++) {
- var attr = viewOptions[i];
- if (options[attr]) this[attr] = options[attr];
- }
- this.options = options;
- },
-
- // Ensure that the View has a DOM element to render into.
- // If `this.el` is a string, pass it through `$()`, take the first
- // matching element, and re-assign it to `el`. Otherwise, create
- // an element from the `id`, `className` and `tagName` properties.
- _ensureElement: function() {
- if (!this.el) {
- var attrs = getValue(this, 'attributes') || {};
- if (this.id) attrs.id = this.id;
- if (this.className) attrs['class'] = this.className;
- this.setElement(this.make(this.tagName, attrs), false);
- } else {
- this.setElement(this.el, false);
- }
- }
-
- });
-
- // The self-propagating extend function that Backbone classes use.
- var extend = function (protoProps, classProps) {
- var child = inherits(this, protoProps, classProps);
- child.extend = this.extend;
- return child;
- };
-
- // Set up inheritance for the model, collection, and view.
- Model.extend = Collection.extend = Router.extend = View.extend = extend;
-
- // Backbone.sync
- // -------------
-
- // Map from CRUD to HTTP for our default `Backbone.sync` implementation.
- var methodMap = {
- 'create': 'POST',
- 'update': 'PUT',
- 'delete': 'DELETE',
- 'read': 'GET'
- };
-
- // Override this function to change the manner in which Backbone persists
- // models to the server. You will be passed the type of request, and the
- // model in question. By default, makes a RESTful Ajax request
- // to the model's `url()`. Some possible customizations could be:
- //
- // * Use `setTimeout` to batch rapid-fire updates into a single request.
- // * Send up the models as XML instead of JSON.
- // * Persist models via WebSockets instead of Ajax.
- //
- // Turn on `Backbone.emulateHTTP` in order to send `PUT` and `DELETE` requests
- // as `POST`, with a `_method` parameter containing the true HTTP method,
- // as well as all requests with the body as `application/x-www-form-urlencoded`
- // instead of `application/json` with the model in a param named `model`.
- // Useful when interfacing with server-side languages like **PHP** that make
- // it difficult to read the body of `PUT` requests.
- Backbone.sync = function(method, model, options) {
- var type = methodMap[method];
-
- // Default options, unless specified.
- options || (options = {});
-
- // Default JSON-request options.
- var params = {type: type, dataType: 'json'};
-
- // Ensure that we have a URL.
- if (!options.url) {
- params.url = getValue(model, 'url') || urlError();
- }
-
- // Ensure that we have the appropriate request data.
- if (!options.data && model && (method == 'create' || method == 'update')) {
- params.contentType = 'application/json';
- params.data = JSON.stringify(model.toJSON());
- }
-
- // For older servers, emulate JSON by encoding the request into an HTML-form.
- if (Backbone.emulateJSON) {
- params.contentType = 'application/x-www-form-urlencoded';
- params.data = params.data ? {model: params.data} : {};
- }
-
- // For older servers, emulate HTTP by mimicking the HTTP method with `_method`
- // And an `X-HTTP-Method-Override` header.
- if (Backbone.emulateHTTP) {
- if (type === 'PUT' || type === 'DELETE') {
- if (Backbone.emulateJSON) params.data._method = type;
- params.type = 'POST';
- params.beforeSend = function(xhr) {
- xhr.setRequestHeader('X-HTTP-Method-Override', type);
- };
- }
- }
-
- // Don't process data on a non-GET request.
- if (params.type !== 'GET' && !Backbone.emulateJSON) {
- params.processData = false;
- }
-
- // Make the request, allowing the user to override any Ajax options.
- return $.ajax(_.extend(params, options));
- };
-
- // Wrap an optional error callback with a fallback error event.
- Backbone.wrapError = function(onError, originalModel, options) {
- return function(model, resp) {
- resp = model === originalModel ? resp : model;
- if (onError) {
- onError(originalModel, resp, options);
- } else {
- originalModel.trigger('error', originalModel, resp, options);
- }
- };
- };
-
- // Helpers
- // -------
-
- // Shared empty constructor function to aid in prototype-chain creation.
- var ctor = function(){};
-
- // Helper function to correctly set up the prototype chain, for subclasses.
- // Similar to `goog.inherits`, but uses a hash of prototype properties and
- // class properties to be extended.
- var inherits = function(parent, protoProps, staticProps) {
- var child;
-
- // The constructor function for the new subclass is either defined by you
- // (the "constructor" property in your `extend` definition), or defaulted
- // by us to simply call the parent's constructor.
- if (protoProps && protoProps.hasOwnProperty('constructor')) {
- child = protoProps.constructor;
- } else {
- child = function(){ parent.apply(this, arguments); };
- }
-
- // Inherit class (static) properties from parent.
- _.extend(child, parent);
-
- // Set the prototype chain to inherit from `parent`, without calling
- // `parent`'s constructor function.
- ctor.prototype = parent.prototype;
- child.prototype = new ctor();
-
- // Add prototype properties (instance properties) to the subclass,
- // if supplied.
- if (protoProps) _.extend(child.prototype, protoProps);
-
- // Add static properties to the constructor function, if supplied.
- if (staticProps) _.extend(child, staticProps);
-
- // Correctly set child's `prototype.constructor`.
- child.prototype.constructor = child;
-
- // Set a convenience property in case the parent's prototype is needed later.
- child.__super__ = parent.prototype;
-
- return child;
- };
-
- // Helper function to get a value from a Backbone object as a property
- // or as a function.
- var getValue = function(object, prop) {
- if (!(object && object[prop])) return null;
- return _.isFunction(object[prop]) ? object[prop]() : object[prop];
- };
-
- // Throw an error when a URL is needed, and none is supplied.
- var urlError = function() {
- throw new Error('A "url" property or function must be specified');
- };
-
-}).call(this);
diff --git a/demo/public/js/backbone.min.js b/demo/public/js/backbone.min.js
deleted file mode 100644
index c1c0d4fff..000000000
--- a/demo/public/js/backbone.min.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Backbone.js 0.9.2
-
-// (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc.
-// Backbone may be freely distributed under the MIT license.
-// For all details and documentation:
-// http://backbonejs.org
-(function(){var l=this,y=l.Backbone,z=Array.prototype.slice,A=Array.prototype.splice,g;g="undefined"!==typeof exports?exports:l.Backbone={};g.VERSION="0.9.2";var f=l._;!f&&"undefined"!==typeof require&&(f=require("underscore"));var i=l.jQuery||l.Zepto||l.ender;g.setDomLibrary=function(a){i=a};g.noConflict=function(){l.Backbone=y;return this};g.emulateHTTP=!1;g.emulateJSON=!1;var p=/\s+/,k=g.Events={on:function(a,b,c){var d,e,f,g,j;if(!b)return this;a=a.split(p);for(d=this._callbacks||(this._callbacks=
-{});e=a.shift();)f=(j=d[e])?j.tail:{},f.next=g={},f.context=c,f.callback=b,d[e]={tail:g,next:j?j.next:f};return this},off:function(a,b,c){var d,e,h,g,j,q;if(e=this._callbacks){if(!a&&!b&&!c)return delete this._callbacks,this;for(a=a?a.split(p):f.keys(e);d=a.shift();)if(h=e[d],delete e[d],h&&(b||c))for(g=h.tail;(h=h.next)!==g;)if(j=h.callback,q=h.context,b&&j!==b||c&&q!==c)this.on(d,j,q);return this}},trigger:function(a){var b,c,d,e,f,g;if(!(d=this._callbacks))return this;f=d.all;a=a.split(p);for(g=
-z.call(arguments,1);b=a.shift();){if(c=d[b])for(e=c.tail;(c=c.next)!==e;)c.callback.apply(c.context||this,g);if(c=f){e=c.tail;for(b=[b].concat(g);(c=c.next)!==e;)c.callback.apply(c.context||this,b)}}return this}};k.bind=k.on;k.unbind=k.off;var o=g.Model=function(a,b){var c;a||(a={});b&&b.parse&&(a=this.parse(a));if(c=n(this,"defaults"))a=f.extend({},c,a);b&&b.collection&&(this.collection=b.collection);this.attributes={};this._escapedAttributes={};this.cid=f.uniqueId("c");this.changed={};this._silent=
-{};this._pending={};this.set(a,{silent:!0});this.changed={};this._silent={};this._pending={};this._previousAttributes=f.clone(this.attributes);this.initialize.apply(this,arguments)};f.extend(o.prototype,k,{changed:null,_silent:null,_pending:null,idAttribute:"id",initialize:function(){},toJSON:function(){return f.clone(this.attributes)},get:function(a){return this.attributes[a]},escape:function(a){var b;if(b=this._escapedAttributes[a])return b;b=this.get(a);return this._escapedAttributes[a]=f.escape(null==
-b?"":""+b)},has:function(a){return null!=this.get(a)},set:function(a,b,c){var d,e;f.isObject(a)||null==a?(d=a,c=b):(d={},d[a]=b);c||(c={});if(!d)return this;d instanceof o&&(d=d.attributes);if(c.unset)for(e in d)d[e]=void 0;if(!this._validate(d,c))return!1;this.idAttribute in d&&(this.id=d[this.idAttribute]);var b=c.changes={},h=this.attributes,g=this._escapedAttributes,j=this._previousAttributes||{};for(e in d){a=d[e];if(!f.isEqual(h[e],a)||c.unset&&f.has(h,e))delete g[e],(c.silent?this._silent:
-b)[e]=!0;c.unset?delete h[e]:h[e]=a;!f.isEqual(j[e],a)||f.has(h,e)!=f.has(j,e)?(this.changed[e]=a,c.silent||(this._pending[e]=!0)):(delete this.changed[e],delete this._pending[e])}c.silent||this.change(c);return this},unset:function(a,b){(b||(b={})).unset=!0;return this.set(a,null,b)},clear:function(a){(a||(a={})).unset=!0;return this.set(f.clone(this.attributes),a)},fetch:function(a){var a=a?f.clone(a):{},b=this,c=a.success;a.success=function(d,e,f){if(!b.set(b.parse(d,f),a))return!1;c&&c(b,d)};
-a.error=g.wrapError(a.error,b,a);return(this.sync||g.sync).call(this,"read",this,a)},save:function(a,b,c){var d,e;f.isObject(a)||null==a?(d=a,c=b):(d={},d[a]=b);c=c?f.clone(c):{};if(c.wait){if(!this._validate(d,c))return!1;e=f.clone(this.attributes)}a=f.extend({},c,{silent:!0});if(d&&!this.set(d,c.wait?a:c))return!1;var h=this,i=c.success;c.success=function(a,b,e){b=h.parse(a,e);if(c.wait){delete c.wait;b=f.extend(d||{},b)}if(!h.set(b,c))return false;i?i(h,a):h.trigger("sync",h,a,c)};c.error=g.wrapError(c.error,
-h,c);b=this.isNew()?"create":"update";b=(this.sync||g.sync).call(this,b,this,c);c.wait&&this.set(e,a);return b},destroy:function(a){var a=a?f.clone(a):{},b=this,c=a.success,d=function(){b.trigger("destroy",b,b.collection,a)};if(this.isNew())return d(),!1;a.success=function(e){a.wait&&d();c?c(b,e):b.trigger("sync",b,e,a)};a.error=g.wrapError(a.error,b,a);var e=(this.sync||g.sync).call(this,"delete",this,a);a.wait||d();return e},url:function(){var a=n(this,"urlRoot")||n(this.collection,"url")||t();
-return this.isNew()?a:a+("/"==a.charAt(a.length-1)?"":"/")+encodeURIComponent(this.id)},parse:function(a){return a},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return null==this.id},change:function(a){a||(a={});var b=this._changing;this._changing=!0;for(var c in this._silent)this._pending[c]=!0;var d=f.extend({},a.changes,this._silent);this._silent={};for(c in d)this.trigger("change:"+c,this,this.get(c),a);if(b)return this;for(;!f.isEmpty(this._pending);){this._pending=
-{};this.trigger("change",this,a);for(c in this.changed)!this._pending[c]&&!this._silent[c]&&delete this.changed[c];this._previousAttributes=f.clone(this.attributes)}this._changing=!1;return this},hasChanged:function(a){return!arguments.length?!f.isEmpty(this.changed):f.has(this.changed,a)},changedAttributes:function(a){if(!a)return this.hasChanged()?f.clone(this.changed):!1;var b,c=!1,d=this._previousAttributes,e;for(e in a)if(!f.isEqual(d[e],b=a[e]))(c||(c={}))[e]=b;return c},previous:function(a){return!arguments.length||
-!this._previousAttributes?null:this._previousAttributes[a]},previousAttributes:function(){return f.clone(this._previousAttributes)},isValid:function(){return!this.validate(this.attributes)},_validate:function(a,b){if(b.silent||!this.validate)return!0;var a=f.extend({},this.attributes,a),c=this.validate(a,b);if(!c)return!0;b&&b.error?b.error(this,c,b):this.trigger("error",this,c,b);return!1}});var r=g.Collection=function(a,b){b||(b={});b.model&&(this.model=b.model);b.comparator&&(this.comparator=b.comparator);
-this._reset();this.initialize.apply(this,arguments);a&&this.reset(a,{silent:!0,parse:b.parse})};f.extend(r.prototype,k,{model:o,initialize:function(){},toJSON:function(a){return this.map(function(b){return b.toJSON(a)})},add:function(a,b){var c,d,e,g,i,j={},k={},l=[];b||(b={});a=f.isArray(a)?a.slice():[a];c=0;for(d=a.length;c=b))this.iframe=i('').hide().appendTo("body")[0].contentWindow,this.navigate(a);this._hasPushState?i(window).bind("popstate",this.checkUrl):this._wantsHashChange&&"onhashchange"in window&&!b?i(window).bind("hashchange",this.checkUrl):this._wantsHashChange&&(this._checkUrlInterval=setInterval(this.checkUrl,
-this.interval));this.fragment=a;a=window.location;b=a.pathname==this.options.root;if(this._wantsHashChange&&this._wantsPushState&&!this._hasPushState&&!b)return this.fragment=this.getFragment(null,!0),window.location.replace(this.options.root+"#"+this.fragment),!0;this._wantsPushState&&this._hasPushState&&b&&a.hash&&(this.fragment=this.getHash().replace(s,""),window.history.replaceState({},document.title,a.protocol+"//"+a.host+this.options.root+this.fragment));if(!this.options.silent)return this.loadUrl()},
-stop:function(){i(window).unbind("popstate",this.checkUrl).unbind("hashchange",this.checkUrl);clearInterval(this._checkUrlInterval);m.started=!1},route:function(a,b){this.handlers.unshift({route:a,callback:b})},checkUrl:function(){var a=this.getFragment();a==this.fragment&&this.iframe&&(a=this.getFragment(this.getHash(this.iframe)));if(a==this.fragment)return!1;this.iframe&&this.navigate(a);this.loadUrl()||this.loadUrl(this.getHash())},loadUrl:function(a){var b=this.fragment=this.getFragment(a);return f.any(this.handlers,
-function(a){if(a.route.test(b))return a.callback(b),!0})},navigate:function(a,b){if(!m.started)return!1;if(!b||!0===b)b={trigger:b};var c=(a||"").replace(s,"");this.fragment!=c&&(this._hasPushState?(0!=c.indexOf(this.options.root)&&(c=this.options.root+c),this.fragment=c,window.history[b.replace?"replaceState":"pushState"]({},document.title,c)):this._wantsHashChange?(this.fragment=c,this._updateHash(window.location,c,b.replace),this.iframe&&c!=this.getFragment(this.getHash(this.iframe))&&(b.replace||
-this.iframe.document.open().close(),this._updateHash(this.iframe.location,c,b.replace))):window.location.assign(this.options.root+a),b.trigger&&this.loadUrl(a))},_updateHash:function(a,b,c){c?a.replace(a.toString().replace(/(javascript:|#).*$/,"")+"#"+b):a.hash=b}});var v=g.View=function(a){this.cid=f.uniqueId("view");this._configure(a||{});this._ensureElement();this.initialize.apply(this,arguments);this.delegateEvents()},F=/^(\S+)\s*(.*)$/,w="model,collection,el,id,attributes,className,tagName".split(",");
-f.extend(v.prototype,k,{tagName:"div",$:function(a){return this.$el.find(a)},initialize:function(){},render:function(){return this},remove:function(){this.$el.remove();return this},make:function(a,b,c){a=document.createElement(a);b&&i(a).attr(b);c&&i(a).html(c);return a},setElement:function(a,b){this.$el&&this.undelegateEvents();this.$el=a instanceof i?a:i(a);this.el=this.$el[0];!1!==b&&this.delegateEvents();return this},delegateEvents:function(a){if(a||(a=n(this,"events"))){this.undelegateEvents();
-for(var b in a){var c=a[b];f.isFunction(c)||(c=this[a[b]]);if(!c)throw Error('Method "'+a[b]+'" does not exist');var d=b.match(F),e=d[1],d=d[2],c=f.bind(c,this),e=e+(".delegateEvents"+this.cid);""===d?this.$el.bind(e,c):this.$el.delegate(d,e,c)}}},undelegateEvents:function(){this.$el.unbind(".delegateEvents"+this.cid)},_configure:function(a){this.options&&(a=f.extend({},this.options,a));for(var b=0,c=w.length;b.py'
-try:
- import imp, sys
- module_name = 'settings_' + HOST_NAME
- module_info = imp.find_module(module_name, [PROJECT_PATH] + sys.path)
- live_settings = imp.load_module(module_name, *module_info)
-except ImportError:
- pass
-else:
- try:
- attrlist = live_settings.__all__
- except AttributeError:
- attrlist = dir (live_settings)
- for attr in attrlist:
- if attr.startswith('__'):
- continue
- globals()[attr] = getattr (live_settings, attr)
-
-try:
- from settings_local import *
-except ImportError:
- pass
-
-# This import needs to happen after settings_local import due to how the cache loads
-from django.template.loader import add_to_builtins
-add_to_builtins('cachebuster.templatetags.cachebuster')
+REQUIRE_BUILD_PROFILE = 'widgy.build.js'
+REQUIRE_BASE_URL = 'widgy/js'
+STATICFILES_STORAGE = 'require.storage.OptimizedStaticFilesStorage'
+WIDGY_MEZZANINE_SITE = 'demo.widgy.widgy_site'
-DATABASE_ENGINE = DATABASES['default']['ENGINE']
+DATABASE_ENGINE = DATABASES['default']['ENGINE']
-####################
-# DYNAMIC SETTINGS #
-####################
+# easy_thumbnails' versions 2.0+ changed their migrations
+import easy_thumbnails
-# set_dynamic_settings() will rewrite globals based on what has been
-# defined so far, in order to provide some better defaults where
-# applicable.
-from mezzanine.utils.conf import set_dynamic_settings
-set_dynamic_settings(globals())
+if easy_thumbnails.VERSION >= 2:
+ SOUTH_MIGRATION_MODULES = {
+ 'easy_thumbnails': 'easy_thumbnails.south_migrations',
+ }
diff --git a/static/.gitkeep b/demo/static/.gitkeep
similarity index 100%
rename from static/.gitkeep
rename to demo/static/.gitkeep
diff --git a/demo/templates/base.html b/demo/templates/base.html
index bc7516266..ad9183e1c 100644
--- a/demo/templates/base.html
+++ b/demo/templates/base.html
@@ -1,6 +1,8 @@
{% load compress %}
{% load pages_tags %}
+{% load widgy_tags %}
+{% load staticfiles %}
@@ -8,20 +10,31 @@
{% block title %}Project name{% endblock %}
{% compress css %}
-
-
+ {% block css %}
+
+
+ {% for scss_file in 'WIDGY_MEZZANINE_SITE'|scss_files %}
+
+ {% endfor %}
+ {% endblock %}
{% endcompress %}
{% compress js %}
-
-
+ {% block js %}
+
+
+ {% for js_file in 'WIDGY_MEZZANINE_SITE'|js_files %}
+
+ {% endfor %}
+ {% endblock %}
{% endcompress %}
+ {% block body %}
{% page_menu 'pages/menus/top_nav.html' %}
', 'asdf
Ctrl+H",
+ headingexample: "Heading",
+
+ hr: "Horizontal Rule Ctrl+R",
+
+ undo: "Undo - Ctrl+Z",
+ redo: "Redo - Ctrl+Y",
+ redomac: "Redo - Ctrl+Shift+Z",
+
+ help: "Markdown Editing Help"
+ };
+
+
+ // -------------------------------------------------------------------
+ // YOUR CHANGES GO HERE
+ //
+ // I've tried to localize the things you are likely to change to
+ // this area.
+ // -------------------------------------------------------------------
+
+ // The default text that appears in the dialog input box when entering
+ // links.
+ var imageDefaultText = "http://";
+ var linkDefaultText = "http://";
+
+ // -------------------------------------------------------------------
+ // END OF YOUR CHANGES
+ // -------------------------------------------------------------------
+
+ // options, if given, can have the following properties:
+ // options.helpButton = { handler: yourEventHandler }
+ // options.strings = { italicexample: "slanted text" }
+ // `yourEventHandler` is the click handler for the help button.
+ // If `options.helpButton` isn't given, not help button is created.
+ // `options.strings` can have any or all of the same properties as
+ // `defaultStrings` above, so you can just override some string displayed
+ // to the user on a case-by-case basis, or translate all strings to
+ // a different language.
+ //
+ // For backwards compatibility reasons, the `options` argument can also
+ // be just the `helpButton` object, and `strings.help` can also be set via
+ // `helpButton.title`. This should be considered legacy.
+ //
+ // The constructed editor object has the methods:
+ // - getConverter() returns the markdown converter object that was passed to the constructor
+ // - run() actually starts the editor; should be called after all necessary plugins are registered. Calling this more than once is a no-op.
+ // - refreshPreview() forces the preview to be updated. This method is only available after run() was called.
+ Markdown.Editor = function (markdownConverter, textarea, preview, buttonBar, options) {
+
+ options = options || {};
+
+ if (typeof options.handler === "function") { //backwards compatible behavior
+ options = { helpButton: options };
+ }
+ options.strings = options.strings || {};
+ if (options.helpButton) {
+ options.strings.help = options.strings.help || options.helpButton.title;
+ }
+ var getString = function (identifier) { return options.strings[identifier] || defaultsStrings[identifier]; }
+
+ var postfix = idPostfix++;
+
+ var hooks = this.hooks = new Markdown.HookCollection();
+ hooks.addNoop("onPreviewRefresh"); // called with no arguments after the preview has been refreshed
+ hooks.addNoop("postBlockquoteCreation"); // called with the user's selection *after* the blockquote was created; should return the actual to-be-inserted text
+ hooks.addFalse("insertImageDialog"); /* called with one parameter: a callback to be called with the URL of the image. If the application creates
+ * its own image insertion dialog, this hook should return true, and the callback should be called with the chosen
+ * image url (or null if the user cancelled). If this hook returns false, the default dialog will be used.
+ */
+
+ this.getConverter = function () { return markdownConverter; }
+
+ var that = this,
+ panels;
+
+ this.run = function () {
+ if (panels)
+ return; // already initialized
+
+ panels = new PanelCollection(textarea, preview, buttonBar);
+ var commandManager = new CommandManager(hooks, getString);
+ var previewManager = new PreviewManager(markdownConverter, panels, function () { hooks.onPreviewRefresh(); });
+ var undoManager, uiManager;
+
+ if (!/\?noundo/.test(doc.location.href)) {
+ undoManager = new UndoManager(function () {
+ previewManager.refresh();
+ if (uiManager) // not available on the first call
+ uiManager.setUndoRedoButtonStates();
+ }, panels);
+ this.textOperation = function (f) {
+ undoManager.setCommandMode();
+ f();
+ that.refreshPreview();
+ }
+ }
+
+ uiManager = new UIManager(postfix, panels, undoManager, previewManager, commandManager, options.helpButton, getString);
+ uiManager.setUndoRedoButtonStates();
+
+ var forceRefresh = that.refreshPreview = function () { previewManager.refresh(true); };
+
+ forceRefresh();
+ };
+
+ }
+
+ // before: contains all the text in the input box BEFORE the selection.
+ // after: contains all the text in the input box AFTER the selection.
+ function Chunks() { }
+
+ // startRegex: a regular expression to find the start tag
+ // endRegex: a regular expresssion to find the end tag
+ Chunks.prototype.findTags = function (startRegex, endRegex) {
+
+ var chunkObj = this;
+ var regex;
+
+ if (startRegex) {
+
+ regex = util.extendRegExp(startRegex, "", "$");
+
+ this.before = this.before.replace(regex,
+ function (match) {
+ chunkObj.startTag = chunkObj.startTag + match;
+ return "";
+ });
+
+ regex = util.extendRegExp(startRegex, "^", "");
+
+ this.selection = this.selection.replace(regex,
+ function (match) {
+ chunkObj.startTag = chunkObj.startTag + match;
+ return "";
+ });
+ }
+
+ if (endRegex) {
+
+ regex = util.extendRegExp(endRegex, "", "$");
+
+ this.selection = this.selection.replace(regex,
+ function (match) {
+ chunkObj.endTag = match + chunkObj.endTag;
+ return "";
+ });
+
+ regex = util.extendRegExp(endRegex, "^", "");
+
+ this.after = this.after.replace(regex,
+ function (match) {
+ chunkObj.endTag = match + chunkObj.endTag;
+ return "";
+ });
+ }
+ };
+
+ // If remove is false, the whitespace is transferred
+ // to the before/after regions.
+ //
+ // If remove is true, the whitespace disappears.
+ Chunks.prototype.trimWhitespace = function (remove) {
+ var beforeReplacer, afterReplacer, that = this;
+ if (remove) {
+ beforeReplacer = afterReplacer = "";
+ } else {
+ beforeReplacer = function (s) { that.before += s; return ""; }
+ afterReplacer = function (s) { that.after = s + that.after; return ""; }
+ }
+
+ this.selection = this.selection.replace(/^(\s*)/, beforeReplacer).replace(/(\s*)$/, afterReplacer);
+ };
+
+
+ Chunks.prototype.skipLines = function (nLinesBefore, nLinesAfter, findExtraNewlines) {
+
+ if (nLinesBefore === undefined) {
+ nLinesBefore = 1;
+ }
+
+ if (nLinesAfter === undefined) {
+ nLinesAfter = 1;
+ }
+
+ nLinesBefore++;
+ nLinesAfter++;
+
+ var regexText;
+ var replacementText;
+
+ // chrome bug ... documented at: http://meta.stackoverflow.com/questions/63307/blockquote-glitch-in-editor-in-chrome-6-and-7/65985#65985
+ if (navigator.userAgent.match(/Chrome/)) {
+ "X".match(/()./);
+ }
+
+ this.selection = this.selection.replace(/(^\n*)/, "");
+
+ this.startTag = this.startTag + re.$1;
+
+ this.selection = this.selection.replace(/(\n*$)/, "");
+ this.endTag = this.endTag + re.$1;
+ this.startTag = this.startTag.replace(/(^\n*)/, "");
+ this.before = this.before + re.$1;
+ this.endTag = this.endTag.replace(/(\n*$)/, "");
+ this.after = this.after + re.$1;
+
+ if (this.before) {
+
+ regexText = replacementText = "";
+
+ while (nLinesBefore--) {
+ regexText += "\\n?";
+ replacementText += "\n";
+ }
+
+ if (findExtraNewlines) {
+ regexText = "\\n*";
+ }
+ this.before = this.before.replace(new re(regexText + "$", ""), replacementText);
+ }
+
+ if (this.after) {
+
+ regexText = replacementText = "";
+
+ while (nLinesAfter--) {
+ regexText += "\\n?";
+ replacementText += "\n";
+ }
+ if (findExtraNewlines) {
+ regexText = "\\n*";
+ }
+
+ this.after = this.after.replace(new re(regexText, ""), replacementText);
+ }
+ };
+
+ // end of Chunks
+
+ // A collection of the important regions on the page.
+ // Cached so we don't have to keep traversing the DOM.
+ // Also holds ieCachedRange and ieCachedScrollTop, where necessary; working around
+ // this issue:
+ // Internet explorer has problems with CSS sprite buttons that use HTML
+ // lists. When you click on the background image "button", IE will
+ // select the non-existent link text and discard the selection in the
+ // textarea. The solution to this is to cache the textarea selection
+ // on the button's mousedown event and set a flag. In the part of the
+ // code where we need to grab the selection, we check for the flag
+ // and, if it's set, use the cached area instead of querying the
+ // textarea.
+ //
+ // This ONLY affects Internet Explorer (tested on versions 6, 7
+ // and 8) and ONLY on button clicks. Keyboard shortcuts work
+ // normally since the focus never leaves the textarea.
+ //
+ // edited by Rocky Meza
+ // don't use an because we don't have control over IDs.
+ function PanelCollection(textarea, preview, buttonBar) {
+ this.buttonBar = buttonBar;
+ this.preview = preview;
+ this.input = textarea;
+ };
+
+ // Returns true if the DOM element is visible, false if it's hidden.
+ // Checks if display is anything other than none.
+ util.isVisible = function (elem) {
+
+ if (window.getComputedStyle) {
+ // Most browsers
+ return window.getComputedStyle(elem, null).getPropertyValue("display") !== "none";
+ }
+ else if (elem.currentStyle) {
+ // IE
+ return elem.currentStyle["display"] !== "none";
+ }
+ };
+
+
+ // Adds a listener callback to a DOM element which is fired on a specified
+ // event.
+ util.addEvent = function (elem, event, listener) {
+ if (elem.attachEvent) {
+ // IE only. The "on" is mandatory.
+ elem.attachEvent("on" + event, listener);
+ }
+ else {
+ // Other browsers.
+ elem.addEventListener(event, listener, false);
+ }
+ };
+
+
+ // Removes a listener callback from a DOM element which is fired on a specified
+ // event.
+ util.removeEvent = function (elem, event, listener) {
+ if (elem.detachEvent) {
+ // IE only. The "on" is mandatory.
+ elem.detachEvent("on" + event, listener);
+ }
+ else {
+ // Other browsers.
+ elem.removeEventListener(event, listener, false);
+ }
+ };
+
+ // Converts \r\n and \r to \n.
+ util.fixEolChars = function (text) {
+ text = text.replace(/\r\n/g, "\n");
+ text = text.replace(/\r/g, "\n");
+ return text;
+ };
+
+ // Extends a regular expression. Returns a new RegExp
+ // using pre + regex + post as the expression.
+ // Used in a few functions where we have a base
+ // expression and we want to pre- or append some
+ // conditions to it (e.g. adding "$" to the end).
+ // The flags are unchanged.
+ //
+ // regex is a RegExp, pre and post are strings.
+ util.extendRegExp = function (regex, pre, post) {
+
+ if (pre === null || pre === undefined) {
+ pre = "";
+ }
+ if (post === null || post === undefined) {
+ post = "";
+ }
+
+ var pattern = regex.toString();
+ var flags;
+
+ // Replace the flags with empty space and store them.
+ pattern = pattern.replace(/\/([gim]*)$/, function (wholeMatch, flagsPart) {
+ flags = flagsPart;
+ return "";
+ });
+
+ // Remove the slash delimiters on the regular expression.
+ pattern = pattern.replace(/(^\/|\/$)/g, "");
+ pattern = pre + pattern + post;
+
+ return new re(pattern, flags);
+ }
+
+ // UNFINISHED
+ // The assignment in the while loop makes jslint cranky.
+ // I'll change it to a better loop later.
+ position.getTop = function (elem, isInner) {
+ var result = elem.offsetTop;
+ if (!isInner) {
+ while (elem = elem.offsetParent) {
+ result += elem.offsetTop;
+ }
+ }
+ return result;
+ };
+
+ position.getHeight = function (elem) {
+ return elem.offsetHeight || elem.scrollHeight;
+ };
+
+ position.getWidth = function (elem) {
+ return elem.offsetWidth || elem.scrollWidth;
+ };
+
+ position.getPageSize = function () {
+
+ var scrollWidth, scrollHeight;
+ var innerWidth, innerHeight;
+
+ // It's not very clear which blocks work with which browsers.
+ if (self.innerHeight && self.scrollMaxY) {
+ scrollWidth = doc.body.scrollWidth;
+ scrollHeight = self.innerHeight + self.scrollMaxY;
+ }
+ else if (doc.body.scrollHeight > doc.body.offsetHeight) {
+ scrollWidth = doc.body.scrollWidth;
+ scrollHeight = doc.body.scrollHeight;
+ }
+ else {
+ scrollWidth = doc.body.offsetWidth;
+ scrollHeight = doc.body.offsetHeight;
+ }
+
+ if (self.innerHeight) {
+ // Non-IE browser
+ innerWidth = self.innerWidth;
+ innerHeight = self.innerHeight;
+ }
+ else if (doc.documentElement && doc.documentElement.clientHeight) {
+ // Some versions of IE (IE 6 w/ a DOCTYPE declaration)
+ innerWidth = doc.documentElement.clientWidth;
+ innerHeight = doc.documentElement.clientHeight;
+ }
+ else if (doc.body) {
+ // Other versions of IE
+ innerWidth = doc.body.clientWidth;
+ innerHeight = doc.body.clientHeight;
+ }
+
+ var maxWidth = Math.max(scrollWidth, innerWidth);
+ var maxHeight = Math.max(scrollHeight, innerHeight);
+ return [maxWidth, maxHeight, innerWidth, innerHeight];
+ };
+
+ // Handles pushing and popping TextareaStates for undo/redo commands.
+ // I should rename the stack variables to list.
+ function UndoManager(callback, panels) {
+
+ var undoObj = this;
+ var undoStack = []; // A stack of undo states
+ var stackPtr = 0; // The index of the current state
+ var mode = "none";
+ var lastState; // The last state
+ var timer; // The setTimeout handle for cancelling the timer
+ var inputStateObj;
+
+ // Set the mode for later logic steps.
+ var setMode = function (newMode, noSave) {
+ if (mode != newMode) {
+ mode = newMode;
+ if (!noSave) {
+ saveState();
+ }
+ }
+
+ if (!uaSniffed.isIE || mode != "moving") {
+ timer = setTimeout(refreshState, 1);
+ }
+ else {
+ inputStateObj = null;
+ }
+ };
+
+ var refreshState = function (isInitialState) {
+ inputStateObj = new TextareaState(panels, isInitialState);
+ timer = undefined;
+ };
+
+ this.setCommandMode = function () {
+ mode = "command";
+ saveState();
+ timer = setTimeout(refreshState, 0);
+ };
+
+ this.canUndo = function () {
+ return stackPtr > 1;
+ };
+
+ this.canRedo = function () {
+ if (undoStack[stackPtr + 1]) {
+ return true;
+ }
+ return false;
+ };
+
+ // Removes the last state and restores it.
+ this.undo = function () {
+
+ if (undoObj.canUndo()) {
+ if (lastState) {
+ // What about setting state -1 to null or checking for undefined?
+ lastState.restore();
+ lastState = null;
+ }
+ else {
+ undoStack[stackPtr] = new TextareaState(panels);
+ undoStack[--stackPtr].restore();
+
+ if (callback) {
+ callback();
+ }
+ }
+ }
+
+ mode = "none";
+ panels.input.focus();
+ refreshState();
+ };
+
+ // Redo an action.
+ this.redo = function () {
+
+ if (undoObj.canRedo()) {
+
+ undoStack[++stackPtr].restore();
+
+ if (callback) {
+ callback();
+ }
+ }
+
+ mode = "none";
+ panels.input.focus();
+ refreshState();
+ };
+
+ // Push the input area state to the stack.
+ var saveState = function () {
+ var currState = inputStateObj || new TextareaState(panels);
+
+ if (!currState) {
+ return false;
+ }
+ if (mode == "moving") {
+ if (!lastState) {
+ lastState = currState;
+ }
+ return;
+ }
+ if (lastState) {
+ if (undoStack[stackPtr - 1].text != lastState.text) {
+ undoStack[stackPtr++] = lastState;
+ }
+ lastState = null;
+ }
+ undoStack[stackPtr++] = currState;
+ undoStack[stackPtr + 1] = null;
+ if (callback) {
+ callback();
+ }
+ };
+
+ var handleCtrlYZ = function (event) {
+
+ var handled = false;
+
+ if (event.ctrlKey || event.metaKey) {
+
+ // IE and Opera do not support charCode.
+ var keyCode = event.charCode || event.keyCode;
+ var keyCodeChar = String.fromCharCode(keyCode);
+
+ switch (keyCodeChar.toLowerCase()) {
+
+ case "y":
+ undoObj.redo();
+ handled = true;
+ break;
+
+ case "z":
+ if (!event.shiftKey) {
+ undoObj.undo();
+ }
+ else {
+ undoObj.redo();
+ }
+ handled = true;
+ break;
+ }
+ }
+
+ if (handled) {
+ if (event.preventDefault) {
+ event.preventDefault();
+ }
+ if (window.event) {
+ window.event.returnValue = false;
+ }
+ return;
+ }
+ };
+
+ // Set the mode depending on what is going on in the input area.
+ var handleModeChange = function (event) {
+
+ if (!event.ctrlKey && !event.metaKey) {
+
+ var keyCode = event.keyCode;
+
+ if ((keyCode >= 33 && keyCode <= 40) || (keyCode >= 63232 && keyCode <= 63235)) {
+ // 33 - 40: page up/dn and arrow keys
+ // 63232 - 63235: page up/dn and arrow keys on safari
+ setMode("moving");
+ }
+ else if (keyCode == 8 || keyCode == 46 || keyCode == 127) {
+ // 8: backspace
+ // 46: delete
+ // 127: delete
+ setMode("deleting");
+ }
+ else if (keyCode == 13) {
+ // 13: Enter
+ setMode("newlines");
+ }
+ else if (keyCode == 27) {
+ // 27: escape
+ setMode("escape");
+ }
+ else if ((keyCode < 16 || keyCode > 20) && keyCode != 91) {
+ // 16-20 are shift, etc.
+ // 91: left window key
+ // I think this might be a little messed up since there are
+ // a lot of nonprinting keys above 20.
+ setMode("typing");
+ }
+ }
+ };
+
+ var setEventHandlers = function () {
+ util.addEvent(panels.input, "keypress", function (event) {
+ // keyCode 89: y
+ // keyCode 90: z
+ if ((event.ctrlKey || event.metaKey) && (event.keyCode == 89 || event.keyCode == 90)) {
+ event.preventDefault();
+ }
+ });
+
+ var handlePaste = function () {
+ if (uaSniffed.isIE || (inputStateObj && inputStateObj.text != panels.input.value)) {
+ if (timer == undefined) {
+ mode = "paste";
+ saveState();
+ refreshState();
+ }
+ }
+ };
+
+ util.addEvent(panels.input, "keydown", handleCtrlYZ);
+ util.addEvent(panels.input, "keydown", handleModeChange);
+ util.addEvent(panels.input, "mousedown", function () {
+ setMode("moving");
+ });
+
+ panels.input.onpaste = handlePaste;
+ panels.input.ondrop = handlePaste;
+ };
+
+ var init = function () {
+ setEventHandlers();
+ refreshState(true);
+ saveState();
+ };
+
+ init();
+ }
+
+ // end of UndoManager
+
+ // The input textarea state/contents.
+ // This is used to implement undo/redo by the undo manager.
+ function TextareaState(panels, isInitialState) {
+
+ // Aliases
+ var stateObj = this;
+ var inputArea = panels.input;
+ this.init = function () {
+ if (!util.isVisible(inputArea)) {
+ return;
+ }
+ if (!isInitialState && doc.activeElement && doc.activeElement !== inputArea) { // this happens when tabbing out of the input box
+ return;
+ }
+
+ this.setInputAreaSelectionStartEnd();
+ this.scrollTop = inputArea.scrollTop;
+ if (!this.text && inputArea.selectionStart || inputArea.selectionStart === 0) {
+ this.text = inputArea.value;
+ }
+
+ }
+
+ // Sets the selected text in the input box after we've performed an
+ // operation.
+ this.setInputAreaSelection = function () {
+
+ if (!util.isVisible(inputArea)) {
+ return;
+ }
+
+ if (inputArea.selectionStart !== undefined && !uaSniffed.isOpera) {
+
+ inputArea.focus();
+ inputArea.selectionStart = stateObj.start;
+ inputArea.selectionEnd = stateObj.end;
+ inputArea.scrollTop = stateObj.scrollTop;
+ }
+ else if (doc.selection) {
+
+ if (doc.activeElement && doc.activeElement !== inputArea) {
+ return;
+ }
+
+ inputArea.focus();
+ var range = inputArea.createTextRange();
+ range.moveStart("character", -inputArea.value.length);
+ range.moveEnd("character", -inputArea.value.length);
+ range.moveEnd("character", stateObj.end);
+ range.moveStart("character", stateObj.start);
+ range.select();
+ }
+ };
+
+ this.setInputAreaSelectionStartEnd = function () {
+
+ if (!panels.ieCachedRange && (inputArea.selectionStart || inputArea.selectionStart === 0)) {
+
+ stateObj.start = inputArea.selectionStart;
+ stateObj.end = inputArea.selectionEnd;
+ }
+ else if (doc.selection) {
+
+ stateObj.text = util.fixEolChars(inputArea.value);
+
+ // IE loses the selection in the textarea when buttons are
+ // clicked. On IE we cache the selection. Here, if something is cached,
+ // we take it.
+ var range = panels.ieCachedRange || doc.selection.createRange();
+
+ var fixedRange = util.fixEolChars(range.text);
+ var marker = "\x07";
+ var markedRange = marker + fixedRange + marker;
+ range.text = markedRange;
+ var inputText = util.fixEolChars(inputArea.value);
+
+ range.moveStart("character", -markedRange.length);
+ range.text = fixedRange;
+
+ stateObj.start = inputText.indexOf(marker);
+ stateObj.end = inputText.lastIndexOf(marker) - marker.length;
+
+ var len = stateObj.text.length - util.fixEolChars(inputArea.value).length;
+
+ if (len) {
+ range.moveStart("character", -fixedRange.length);
+ while (len--) {
+ fixedRange += "\n";
+ stateObj.end += 1;
+ }
+ range.text = fixedRange;
+ }
+
+ if (panels.ieCachedRange)
+ stateObj.scrollTop = panels.ieCachedScrollTop; // this is set alongside with ieCachedRange
+
+ panels.ieCachedRange = null;
+
+ this.setInputAreaSelection();
+ }
+ };
+
+ // Restore this state into the input area.
+ this.restore = function () {
+
+ if (stateObj.text != undefined && stateObj.text != inputArea.value) {
+ inputArea.value = stateObj.text;
+ }
+ this.setInputAreaSelection();
+ inputArea.scrollTop = stateObj.scrollTop;
+ };
+
+ // Gets a collection of HTML chunks from the inptut textarea.
+ this.getChunks = function () {
+
+ var chunk = new Chunks();
+ chunk.before = util.fixEolChars(stateObj.text.substring(0, stateObj.start));
+ chunk.startTag = "";
+ chunk.selection = util.fixEolChars(stateObj.text.substring(stateObj.start, stateObj.end));
+ chunk.endTag = "";
+ chunk.after = util.fixEolChars(stateObj.text.substring(stateObj.end));
+ chunk.scrollTop = stateObj.scrollTop;
+
+ return chunk;
+ };
+
+ // Sets the TextareaState properties given a chunk of markdown.
+ this.setChunks = function (chunk) {
+
+ chunk.before = chunk.before + chunk.startTag;
+ chunk.after = chunk.endTag + chunk.after;
+
+ this.start = chunk.before.length;
+ this.end = chunk.before.length + chunk.selection.length;
+ this.text = chunk.before + chunk.selection + chunk.after;
+ this.scrollTop = chunk.scrollTop;
+ };
+ this.init();
+ };
+
+ function PreviewManager(converter, panels, previewRefreshCallback) {
+
+ var managerObj = this;
+ var timeout;
+ var elapsedTime;
+ var oldInputText;
+ var maxDelay = 3000;
+ var startType = "delayed"; // The other legal value is "manual"
+
+ // Adds event listeners to elements
+ var setupEvents = function (inputElem, listener) {
+
+ util.addEvent(inputElem, "input", listener);
+ inputElem.onpaste = listener;
+ inputElem.ondrop = listener;
+
+ util.addEvent(inputElem, "keypress", listener);
+ util.addEvent(inputElem, "keydown", listener);
+ };
+
+ var getDocScrollTop = function () {
+
+ var result = 0;
+
+ if (window.innerHeight) {
+ result = window.pageYOffset;
+ }
+ else
+ if (doc.documentElement && doc.documentElement.scrollTop) {
+ result = doc.documentElement.scrollTop;
+ }
+ else
+ if (doc.body) {
+ result = doc.body.scrollTop;
+ }
+
+ return result;
+ };
+
+ var makePreviewHtml = function () {
+
+ // If there is no registered preview panel
+ // there is nothing to do.
+ if (!panels.preview)
+ return;
+
+
+ var text = panels.input.value;
+ if (text && text == oldInputText) {
+ return; // Input text hasn't changed.
+ }
+ else {
+ oldInputText = text;
+ }
+
+ var prevTime = new Date().getTime();
+
+ text = converter.makeHtml(text);
+
+ // Calculate the processing time of the HTML creation.
+ // It's used as the delay time in the event listener.
+ var currTime = new Date().getTime();
+ elapsedTime = currTime - prevTime;
+
+ pushPreviewHtml(text);
+ };
+
+ // setTimeout is already used. Used as an event listener.
+ var applyTimeout = function () {
+
+ if (timeout) {
+ clearTimeout(timeout);
+ timeout = undefined;
+ }
+
+ if (startType !== "manual") {
+
+ var delay = 0;
+
+ if (startType === "delayed") {
+ delay = elapsedTime;
+ }
+
+ if (delay > maxDelay) {
+ delay = maxDelay;
+ }
+ timeout = setTimeout(makePreviewHtml, delay);
+ }
+ };
+
+ var getScaleFactor = function (panel) {
+ if (panel.scrollHeight <= panel.clientHeight) {
+ return 1;
+ }
+ return panel.scrollTop / (panel.scrollHeight - panel.clientHeight);
+ };
+
+ var setPanelScrollTops = function () {
+ if (panels.preview) {
+ panels.preview.scrollTop = (panels.preview.scrollHeight - panels.preview.clientHeight) * getScaleFactor(panels.preview);
+ }
+ };
+
+ this.refresh = function (requiresRefresh) {
+
+ if (requiresRefresh) {
+ oldInputText = "";
+ makePreviewHtml();
+ }
+ else {
+ applyTimeout();
+ }
+ };
+
+ this.processingTime = function () {
+ return elapsedTime;
+ };
+
+ var isFirstTimeFilled = true;
+
+ // IE doesn't let you use innerHTML if the element is contained somewhere in a table
+ // (which is the case for inline editing) -- in that case, detach the element, set the
+ // value, and reattach. Yes, that *is* ridiculous.
+ var ieSafePreviewSet = function (text) {
+ var preview = panels.preview;
+ var parent = preview.parentNode;
+ var sibling = preview.nextSibling;
+ parent.removeChild(preview);
+ preview.innerHTML = text;
+ if (!sibling)
+ parent.appendChild(preview);
+ else
+ parent.insertBefore(preview, sibling);
+ }
+
+ var nonSuckyBrowserPreviewSet = function (text) {
+ panels.preview.innerHTML = text;
+ }
+
+ var previewSetter;
+
+ var previewSet = function (text) {
+ if (previewSetter)
+ return previewSetter(text);
+
+ try {
+ nonSuckyBrowserPreviewSet(text);
+ previewSetter = nonSuckyBrowserPreviewSet;
+ } catch (e) {
+ previewSetter = ieSafePreviewSet;
+ previewSetter(text);
+ }
+ };
+
+ var pushPreviewHtml = function (text) {
+
+ var emptyTop = position.getTop(panels.input) - getDocScrollTop();
+
+ if (panels.preview) {
+ previewSet(text);
+ previewRefreshCallback();
+ }
+
+ setPanelScrollTops();
+
+ if (isFirstTimeFilled) {
+ isFirstTimeFilled = false;
+ return;
+ }
+
+ var fullTop = position.getTop(panels.input) - getDocScrollTop();
+
+ if (uaSniffed.isIE) {
+ setTimeout(function () {
+ window.scrollBy(0, fullTop - emptyTop);
+ }, 0);
+ }
+ else {
+ window.scrollBy(0, fullTop - emptyTop);
+ }
+ };
+
+ var init = function () {
+
+ setupEvents(panels.input, applyTimeout);
+ makePreviewHtml();
+
+ if (panels.preview) {
+ panels.preview.scrollTop = 0;
+ }
+ };
+
+ init();
+ };
+
+ // Creates the background behind the hyperlink text entry box.
+ // And download dialog
+ // Most of this has been moved to CSS but the div creation and
+ // browser-specific hacks remain here.
+ ui.createBackground = function () {
+
+ var background = doc.createElement("div"),
+ style = background.style;
+
+ background.className = "wmd-prompt-background";
+
+ style.position = "absolute";
+ style.top = "0";
+
+ style.zIndex = "1000";
+
+ if (uaSniffed.isIE) {
+ style.filter = "alpha(opacity=50)";
+ }
+ else {
+ style.opacity = "0.5";
+ }
+
+ var pageSize = position.getPageSize();
+ style.height = pageSize[1] + "px";
+
+ if (uaSniffed.isIE) {
+ style.left = doc.documentElement.scrollLeft;
+ style.width = doc.documentElement.clientWidth;
+ }
+ else {
+ style.left = "0";
+ style.width = "100%";
+ }
+
+ doc.body.appendChild(background);
+ return background;
+ };
+
+ // This simulates a modal dialog box and asks for the URL when you
+ // click the hyperlink or image buttons.
+ //
+ // text: The html for the input box.
+ // defaultInputText: The default value that appears in the input box.
+ // callback: The function which is executed when the prompt is dismissed, either via OK or Cancel.
+ // It receives a single argument; either the entered text (if OK was chosen) or null (if Cancel
+ // was chosen).
+ ui.prompt = function (text, defaultInputText, callback) {
+
+ // These variables need to be declared at this level since they are used
+ // in multiple functions.
+ var dialog; // The dialog box.
+ var input; // The text box where you enter the hyperlink.
+
+
+ if (defaultInputText === undefined) {
+ defaultInputText = "";
+ }
+
+ // Used as a keydown event handler. Esc dismisses the prompt.
+ // Key code 27 is ESC.
+ var checkEscape = function (key) {
+ var code = (key.charCode || key.keyCode);
+ if (code === 27) {
+ close(true);
+ }
+ };
+
+ // Dismisses the hyperlink input box.
+ // isCancel is true if we don't care about the input text.
+ // isCancel is false if we are going to keep the text.
+ var close = function (isCancel) {
+ util.removeEvent(doc.body, "keydown", checkEscape);
+ var text = input.value;
+
+ if (isCancel) {
+ text = null;
+ }
+ else {
+ // Fixes common pasting errors.
+ text = text.replace(/^http:\/\/(https?|ftp):\/\//, '$1://');
+ if (!/^(?:https?|ftp):\/\//.test(text))
+ text = 'http://' + text;
+ }
+
+ dialog.parentNode.removeChild(dialog);
+
+ callback(text);
+ return false;
+ };
+
+
+
+ // Create the text input box form/window.
+ var createDialog = function () {
+
+ // The main dialog box.
+ dialog = doc.createElement("div");
+ dialog.className = "wmd-prompt-dialog";
+ dialog.style.padding = "10px;";
+ dialog.style.position = "fixed";
+ dialog.style.width = "400px";
+ dialog.style.zIndex = "1001";
+
+ // The dialog text.
+ var question = doc.createElement("div");
+ question.innerHTML = text;
+ question.style.padding = "5px";
+ dialog.appendChild(question);
+
+ // The web form container for the text box and buttons.
+ var form = doc.createElement("form"),
+ style = form.style;
+ form.onsubmit = function () { return close(false); };
+ style.padding = "0";
+ style.margin = "0";
+ style.cssFloat = "left";
+ style.width = "100%";
+ style.textAlign = "center";
+ style.position = "relative";
+ dialog.appendChild(form);
+
+ // The input text box
+ input = doc.createElement("input");
+ input.type = "text";
+ input.value = defaultInputText;
+ style = input.style;
+ style.display = "block";
+ style.width = "80%";
+ style.marginLeft = style.marginRight = "auto";
+ form.appendChild(input);
+
+ // The ok button
+ var okButton = doc.createElement("input");
+ okButton.type = "button";
+ okButton.onclick = function () { return close(false); };
+ okButton.value = "OK";
+ style = okButton.style;
+ style.margin = "10px";
+ style.display = "inline";
+ style.width = "7em";
+
+
+ // The cancel button
+ var cancelButton = doc.createElement("input");
+ cancelButton.type = "button";
+ cancelButton.onclick = function () { return close(true); };
+ cancelButton.value = "Cancel";
+ style = cancelButton.style;
+ style.margin = "10px";
+ style.display = "inline";
+ style.width = "7em";
+
+ form.appendChild(okButton);
+ form.appendChild(cancelButton);
+
+ util.addEvent(doc.body, "keydown", checkEscape);
+ dialog.style.top = "50%";
+ dialog.style.left = "50%";
+ dialog.style.display = "block";
+ if (uaSniffed.isIE_5or6) {
+ dialog.style.position = "absolute";
+ dialog.style.top = doc.documentElement.scrollTop + 200 + "px";
+ dialog.style.left = "50%";
+ }
+ doc.body.appendChild(dialog);
+
+ // This has to be done AFTER adding the dialog to the form if you
+ // want it to be centered.
+ dialog.style.marginTop = -(position.getHeight(dialog) / 2) + "px";
+ dialog.style.marginLeft = -(position.getWidth(dialog) / 2) + "px";
+
+ };
+
+ // Why is this in a zero-length timeout?
+ // Is it working around a browser bug?
+ setTimeout(function () {
+
+ createDialog();
+
+ var defTextLen = defaultInputText.length;
+ if (input.selectionStart !== undefined) {
+ input.selectionStart = 0;
+ input.selectionEnd = defTextLen;
+ }
+ else if (input.createTextRange) {
+ var range = input.createTextRange();
+ range.collapse(false);
+ range.moveStart("character", -defTextLen);
+ range.moveEnd("character", defTextLen);
+ range.select();
+ }
+
+ input.focus();
+ }, 0);
+ };
+
+ function UIManager(postfix, panels, undoManager, previewManager, commandManager, helpOptions, getString) {
+
+ var inputBox = panels.input,
+ buttons = {}; // buttons.undo, buttons.link, etc. The actual DOM elements.
+
+ makeSpritedButtonRow();
+
+ var keyEvent = "keydown";
+ if (uaSniffed.isOpera) {
+ keyEvent = "keypress";
+ }
+
+ util.addEvent(inputBox, keyEvent, function (key) {
+
+ // Check to see if we have a button key and, if so execute the callback.
+ if ((key.ctrlKey || key.metaKey) && !key.altKey && !key.shiftKey) {
+
+ var keyCode = key.charCode || key.keyCode;
+ var keyCodeStr = String.fromCharCode(keyCode).toLowerCase();
+
+ switch (keyCodeStr) {
+ case "b":
+ doClick(buttons.bold);
+ break;
+ case "i":
+ doClick(buttons.italic);
+ break;
+ case "l":
+ doClick(buttons.link);
+ break;
+ case "q":
+ doClick(buttons.quote);
+ break;
+ case "k":
+ doClick(buttons.code);
+ break;
+ case "g":
+ doClick(buttons.image);
+ break;
+ case "o":
+ doClick(buttons.olist);
+ break;
+ case "u":
+ doClick(buttons.ulist);
+ break;
+ case "h":
+ doClick(buttons.heading);
+ break;
+ case "r":
+ doClick(buttons.hr);
+ break;
+ case "y":
+ doClick(buttons.redo);
+ break;
+ case "z":
+ if (key.shiftKey) {
+ doClick(buttons.redo);
+ }
+ else {
+ doClick(buttons.undo);
+ }
+ break;
+ default:
+ return;
+ }
+
+
+ if (key.preventDefault) {
+ key.preventDefault();
+ }
+
+ if (window.event) {
+ window.event.returnValue = false;
+ }
+ }
+ });
+
+ // Auto-indent on shift-enter
+ util.addEvent(inputBox, "keyup", function (key) {
+ if (key.shiftKey && !key.ctrlKey && !key.metaKey) {
+ var keyCode = key.charCode || key.keyCode;
+ // Character 13 is Enter
+ if (keyCode === 13) {
+ var fakeButton = {};
+ fakeButton.textOp = bindCommand("doAutoindent");
+ doClick(fakeButton);
+ }
+ }
+ });
+
+ // special handler because IE clears the context of the textbox on ESC
+ if (uaSniffed.isIE) {
+ util.addEvent(inputBox, "keydown", function (key) {
+ var code = key.keyCode;
+ if (code === 27) {
+ return false;
+ }
+ });
+ }
+
+
+ // Perform the button's action.
+ function doClick(button) {
+
+ inputBox.focus();
+
+ if (button.textOp) {
+
+ if (undoManager) {
+ undoManager.setCommandMode();
+ }
+
+ var state = new TextareaState(panels);
+
+ if (!state) {
+ return;
+ }
+
+ var chunks = state.getChunks();
+
+ // Some commands launch a "modal" prompt dialog. Javascript
+ // can't really make a modal dialog box and the WMD code
+ // will continue to execute while the dialog is displayed.
+ // This prevents the dialog pattern I'm used to and means
+ // I can't do something like this:
+ //
+ // var link = CreateLinkDialog();
+ // makeMarkdownLink(link);
+ //
+ // Instead of this straightforward method of handling a
+ // dialog I have to pass any code which would execute
+ // after the dialog is dismissed (e.g. link creation)
+ // in a function parameter.
+ //
+ // Yes this is awkward and I think it sucks, but there's
+ // no real workaround. Only the image and link code
+ // create dialogs and require the function pointers.
+ var fixupInputArea = function () {
+
+ inputBox.focus();
+
+ if (chunks) {
+ state.setChunks(chunks);
+ }
+
+ state.restore();
+ previewManager.refresh();
+ };
+
+ var noCleanup = button.textOp(chunks, fixupInputArea);
+
+ if (!noCleanup) {
+ fixupInputArea();
+ }
+
+ }
+
+ if (button.execute) {
+ button.execute(undoManager);
+ }
+ };
+
+ function setupButton(button, isEnabled) {
+
+ var normalYShift = "0px";
+ var disabledYShift = "-20px";
+ var highlightYShift = "-40px";
+ var image = button.getElementsByTagName("span")[0];
+ if (isEnabled) {
+ image.style.backgroundPosition = button.XShift + " " + normalYShift;
+ button.onmouseover = function () {
+ image.style.backgroundPosition = this.XShift + " " + highlightYShift;
+ };
+
+ button.onmouseout = function () {
+ image.style.backgroundPosition = this.XShift + " " + normalYShift;
+ };
+
+ // IE tries to select the background image "button" text (it's
+ // implemented in a list item) so we have to cache the selection
+ // on mousedown.
+ if (uaSniffed.isIE) {
+ button.onmousedown = function () {
+ if (doc.activeElement && doc.activeElement !== panels.input) { // we're not even in the input box, so there's no selection
+ return;
+ }
+ panels.ieCachedRange = document.selection.createRange();
+ panels.ieCachedScrollTop = panels.input.scrollTop;
+ };
+ }
+
+ if (!button.isHelp) {
+ button.onclick = function () {
+ if (this.onmouseout) {
+ this.onmouseout();
+ }
+ doClick(this);
+ return false;
+ }
+ }
+ }
+ else {
+ image.style.backgroundPosition = button.XShift + " " + disabledYShift;
+ button.onmouseover = button.onmouseout = button.onclick = function () { };
+ }
+ }
+
+ function bindCommand(method) {
+ if (typeof method === "string")
+ method = commandManager[method];
+ return function () { method.apply(commandManager, arguments); }
+ }
+
+ function makeSpritedButtonRow() {
+
+ var buttonBar = panels.buttonBar;
+
+ var normalYShift = "0px";
+ var disabledYShift = "-20px";
+ var highlightYShift = "-40px";
+
+ var buttonRow = document.createElement("ul");
+ buttonRow.id = "wmd-button-row" + postfix;
+ buttonRow.className = 'wmd-button-row';
+ buttonRow = buttonBar.appendChild(buttonRow);
+ var xPosition = 0;
+ var makeButton = function (id, title, XShift, textOp) {
+ var button = document.createElement("li");
+ button.className = "wmd-button";
+ button.style.left = xPosition + "px";
+ xPosition += 25;
+ var buttonImage = document.createElement("span");
+ button.id = id + postfix;
+ button.appendChild(buttonImage);
+ button.title = title;
+ button.XShift = XShift;
+ if (textOp)
+ button.textOp = textOp;
+ setupButton(button, true);
+ buttonRow.appendChild(button);
+ return button;
+ };
+ var makeSpacer = function (num) {
+ var spacer = document.createElement("li");
+ spacer.className = "wmd-spacer wmd-spacer" + num;
+ spacer.id = "wmd-spacer" + num + postfix;
+ buttonRow.appendChild(spacer);
+ xPosition += 25;
+ }
+
+ buttons.bold = makeButton("wmd-bold-button", getString("bold"), "0px", bindCommand("doBold"));
+ buttons.italic = makeButton("wmd-italic-button", getString("italic"), "-20px", bindCommand("doItalic"));
+ makeSpacer(1);
+ buttons.link = makeButton("wmd-link-button", getString("link"), "-40px", bindCommand(function (chunk, postProcessing) {
+ return this.doLinkOrImage(chunk, postProcessing, false);
+ }));
+ buttons.quote = makeButton("wmd-quote-button", getString("quote"), "-60px", bindCommand("doBlockquote"));
+ buttons.code = makeButton("wmd-code-button", getString("code"), "-80px", bindCommand("doCode"));
+ buttons.image = makeButton("wmd-image-button", getString("image"), "-100px", bindCommand(function (chunk, postProcessing) {
+ return this.doLinkOrImage(chunk, postProcessing, true);
+ }));
+ makeSpacer(2);
+ buttons.olist = makeButton("wmd-olist-button", getString("olist"), "-120px", bindCommand(function (chunk, postProcessing) {
+ this.doList(chunk, postProcessing, true);
+ }));
+ buttons.ulist = makeButton("wmd-ulist-button", getString("ulist"), "-140px", bindCommand(function (chunk, postProcessing) {
+ this.doList(chunk, postProcessing, false);
+ }));
+ buttons.heading = makeButton("wmd-heading-button", getString("heading"), "-160px", bindCommand("doHeading"));
+ buttons.hr = makeButton("wmd-hr-button", getString("hr"), "-180px", bindCommand("doHorizontalRule"));
+ makeSpacer(3);
+ buttons.undo = makeButton("wmd-undo-button", getString("undo"), "-200px", null);
+ buttons.undo.execute = function (manager) { if (manager) manager.undo(); };
+
+ var redoTitle = /win/.test(nav.platform.toLowerCase()) ?
+ getString("redo") :
+ getString("redomac"); // mac and other non-Windows platforms
+
+ buttons.redo = makeButton("wmd-redo-button", redoTitle, "-220px", null);
+ buttons.redo.execute = function (manager) { if (manager) manager.redo(); };
+
+ if (helpOptions) {
+ var helpButton = document.createElement("li");
+ var helpButtonImage = document.createElement("span");
+ helpButton.appendChild(helpButtonImage);
+ helpButton.className = "wmd-button wmd-help-button";
+ helpButton.id = "wmd-help-button" + postfix;
+ helpButton.XShift = "-240px";
+ helpButton.isHelp = true;
+ helpButton.style.right = "0px";
+ helpButton.title = getString("help");
+ helpButton.onclick = helpOptions.handler;
+
+ setupButton(helpButton, true);
+ buttonRow.appendChild(helpButton);
+ buttons.help = helpButton;
+ }
+
+ setUndoRedoButtonStates();
+ }
+
+ function setUndoRedoButtonStates() {
+ if (undoManager) {
+ setupButton(buttons.undo, undoManager.canUndo());
+ setupButton(buttons.redo, undoManager.canRedo());
+ }
+ };
+
+ this.setUndoRedoButtonStates = setUndoRedoButtonStates;
+
+ }
+
+ function CommandManager(pluginHooks, getString) {
+ this.hooks = pluginHooks;
+ this.getString = getString;
+ }
+
+ var commandProto = CommandManager.prototype;
+
+ // The markdown symbols - 4 spaces = code, > = blockquote, etc.
+ commandProto.prefixes = "(?:\\s{4,}|\\s*>|\\s*-\\s+|\\s*\\d+\\.|=|\\+|-|_|\\*|#|\\s*\\[[^\n]]+\\]:)";
+
+ // Remove markdown symbols from the chunk selection.
+ commandProto.unwrap = function (chunk) {
+ var txt = new re("([^\\n])\\n(?!(\\n|" + this.prefixes + "))", "g");
+ chunk.selection = chunk.selection.replace(txt, "$1 $2");
+ };
+
+ commandProto.wrap = function (chunk, len) {
+ this.unwrap(chunk);
+ var regex = new re("(.{1," + len + "})( +|$\\n?)", "gm"),
+ that = this;
+
+ chunk.selection = chunk.selection.replace(regex, function (line, marked) {
+ if (new re("^" + that.prefixes, "").test(line)) {
+ return line;
+ }
+ return marked + "\n";
+ });
+
+ chunk.selection = chunk.selection.replace(/\s+$/, "");
+ };
+
+ commandProto.doBold = function (chunk, postProcessing) {
+ return this.doBorI(chunk, postProcessing, 2, this.getString("boldexample"));
+ };
+
+ commandProto.doItalic = function (chunk, postProcessing) {
+ return this.doBorI(chunk, postProcessing, 1, this.getString("italicexample"));
+ };
+
+ // chunk: The selected region that will be enclosed with */**
+ // nStars: 1 for italics, 2 for bold
+ // insertText: If you just click the button without highlighting text, this gets inserted
+ commandProto.doBorI = function (chunk, postProcessing, nStars, insertText) {
+
+ // Get rid of whitespace and fixup newlines.
+ chunk.trimWhitespace();
+ chunk.selection = chunk.selection.replace(/\n{2,}/g, "\n");
+
+ // Look for stars before and after. Is the chunk already marked up?
+ // note that these regex matches cannot fail
+ var starsBefore = /(\**$)/.exec(chunk.before)[0];
+ var starsAfter = /(^\**)/.exec(chunk.after)[0];
+
+ var prevStars = Math.min(starsBefore.length, starsAfter.length);
+
+ // Remove stars if we have to since the button acts as a toggle.
+ if ((prevStars >= nStars) && (prevStars != 2 || nStars != 1)) {
+ chunk.before = chunk.before.replace(re("[*]{" + nStars + "}$", ""), "");
+ chunk.after = chunk.after.replace(re("^[*]{" + nStars + "}", ""), "");
+ }
+ else if (!chunk.selection && starsAfter) {
+ // It's not really clear why this code is necessary. It just moves
+ // some arbitrary stuff around.
+ chunk.after = chunk.after.replace(/^([*_]*)/, "");
+ chunk.before = chunk.before.replace(/(\s?)$/, "");
+ var whitespace = re.$1;
+ chunk.before = chunk.before + starsAfter + whitespace;
+ }
+ else {
+
+ // In most cases, if you don't have any selected text and click the button
+ // you'll get a selected, marked up region with the default text inserted.
+ if (!chunk.selection && !starsAfter) {
+ chunk.selection = insertText;
+ }
+
+ // Add the true markup.
+ var markup = nStars <= 1 ? "*" : "**"; // shouldn't the test be = ?
+ chunk.before = chunk.before + markup;
+ chunk.after = markup + chunk.after;
+ }
+
+ return;
+ };
+
+ commandProto.stripLinkDefs = function (text, defsToAdd) {
+
+ text = text.replace(/^[ ]{0,3}\[(\d+)\]:[ \t]*\n?[ \t]*?[ \t]*\n?[ \t]*(?:(\n*)["(](.+?)[")][ \t]*)?(?:\n+|$)/gm,
+ function (totalMatch, id, link, newlines, title) {
+ defsToAdd[id] = totalMatch.replace(/\s*$/, "");
+ if (newlines) {
+ // Strip the title and return that separately.
+ defsToAdd[id] = totalMatch.replace(/["(](.+?)[")]$/, "");
+ return newlines + title;
+ }
+ return "";
+ });
+
+ return text;
+ };
+
+ commandProto.addLinkDef = function (chunk, linkDef) {
+
+ var refNumber = 0; // The current reference number
+ var defsToAdd = {}; //
+ // Start with a clean slate by removing all previous link definitions.
+ chunk.before = this.stripLinkDefs(chunk.before, defsToAdd);
+ chunk.selection = this.stripLinkDefs(chunk.selection, defsToAdd);
+ chunk.after = this.stripLinkDefs(chunk.after, defsToAdd);
+
+ var defs = "";
+ var regex = /(\[)((?:\[[^\]]*\]|[^\[\]])*)(\][ ]?(?:\n[ ]*)?\[)(\d+)(\])/g;
+
+ var addDefNumber = function (def) {
+ refNumber++;
+ def = def.replace(/^[ ]{0,3}\[(\d+)\]:/, " [" + refNumber + "]:");
+ defs += "\n" + def;
+ };
+
+ // note that
+ // a) the recursive call to getLink cannot go infinite, because by definition
+ // of regex, inner is always a proper substring of wholeMatch, and
+ // b) more than one level of nesting is neither supported by the regex
+ // nor making a lot of sense (the only use case for nesting is a linked image)
+ var getLink = function (wholeMatch, before, inner, afterInner, id, end) {
+ inner = inner.replace(regex, getLink);
+ if (defsToAdd[id]) {
+ addDefNumber(defsToAdd[id]);
+ return before + inner + afterInner + refNumber + end;
+ }
+ return wholeMatch;
+ };
+
+ chunk.before = chunk.before.replace(regex, getLink);
+
+ if (linkDef) {
+ addDefNumber(linkDef);
+ }
+ else {
+ chunk.selection = chunk.selection.replace(regex, getLink);
+ }
+
+ var refOut = refNumber;
+
+ chunk.after = chunk.after.replace(regex, getLink);
+
+ if (chunk.after) {
+ chunk.after = chunk.after.replace(/\n*$/, "");
+ }
+ if (!chunk.after) {
+ chunk.selection = chunk.selection.replace(/\n*$/, "");
+ }
+
+ chunk.after += "\n\n" + defs;
+
+ return refOut;
+ };
+
+ // takes the line as entered into the add link/as image dialog and makes
+ // sure the URL and the optinal title are "nice".
+ function properlyEncoded(linkdef) {
+ return linkdef.replace(/^\s*(.*?)(?:\s+"(.+)")?\s*$/, function (wholematch, link, title) {
+ link = link.replace(/\?.*$/, function (querypart) {
+ return querypart.replace(/\+/g, " "); // in the query string, a plus and a space are identical
+ });
+ link = decodeURIComponent(link); // unencode first, to prevent double encoding
+ link = encodeURI(link).replace(/'/g, '%27').replace(/\(/g, '%28').replace(/\)/g, '%29');
+ link = link.replace(/\?.*$/, function (querypart) {
+ return querypart.replace(/\+/g, "%2b"); // since we replaced plus with spaces in the query part, all pluses that now appear where originally encoded
+ });
+ if (title) {
+ title = title.trim ? title.trim() : title.replace(/^\s*/, "").replace(/\s*$/, "");
+ title = title.replace(/"/g, "quot;").replace(/\(/g, "(").replace(/\)/g, ")").replace(//g, ">");
+ }
+ return title ? link + ' "' + title + '"' : link;
+ });
+ }
+
+ commandProto.doLinkOrImage = function (chunk, postProcessing, isImage) {
+
+ chunk.trimWhitespace();
+ chunk.findTags(/\s*!?\[/, /\][ ]?(?:\n[ ]*)?(\[.*?\])?/);
+ var background;
+
+ if (chunk.endTag.length > 1 && chunk.startTag.length > 0) {
+
+ chunk.startTag = chunk.startTag.replace(/!?\[/, "");
+ chunk.endTag = "";
+ this.addLinkDef(chunk, null);
+
+ }
+ else {
+
+ // We're moving start and end tag back into the selection, since (as we're in the else block) we're not
+ // *removing* a link, but *adding* one, so whatever findTags() found is now back to being part of the
+ // link text. linkEnteredCallback takes care of escaping any brackets.
+ chunk.selection = chunk.startTag + chunk.selection + chunk.endTag;
+ chunk.startTag = chunk.endTag = "";
+
+ if (/\n\n/.test(chunk.selection)) {
+ this.addLinkDef(chunk, null);
+ return;
+ }
+ var that = this;
+ // The function to be executed when you enter a link and press OK or Cancel.
+ // Marks up the link and adds the ref.
+ var linkEnteredCallback = function (link) {
+
+ background.parentNode.removeChild(background);
+
+ if (link !== null) {
+ // ( $1
+ // [^\\] anything that's not a backslash
+ // (?:\\\\)* an even number (this includes zero) of backslashes
+ // )
+ // (?= followed by
+ // [[\]] an opening or closing bracket
+ // )
+ //
+ // In other words, a non-escaped bracket. These have to be escaped now to make sure they
+ // don't count as the end of the link or similar.
+ // Note that the actual bracket has to be a lookahead, because (in case of to subsequent brackets),
+ // the bracket in one match may be the "not a backslash" character in the next match, so it
+ // should not be consumed by the first match.
+ // The "prepend a space and finally remove it" steps makes sure there is a "not a backslash" at the
+ // start of the string, so this also works if the selection begins with a bracket. We cannot solve
+ // this by anchoring with ^, because in the case that the selection starts with two brackets, this
+ // would mean a zero-width match at the start. Since zero-width matches advance the string position,
+ // the first bracket could then not act as the "not a backslash" for the second.
+ chunk.selection = (" " + chunk.selection).replace(/([^\\](?:\\\\)*)(?=[[\]])/g, "$1\\").substr(1);
+
+ var linkDef = " [999]: " + properlyEncoded(link);
+
+ var num = that.addLinkDef(chunk, linkDef);
+ chunk.startTag = isImage ? "![" : "[";
+ chunk.endTag = "][" + num + "]";
+
+ if (!chunk.selection) {
+ if (isImage) {
+ chunk.selection = that.getString("imagedescription");
+ }
+ else {
+ chunk.selection = that.getString("linkdescription");
+ }
+ }
+ }
+ postProcessing();
+ };
+
+ background = ui.createBackground();
+
+ if (isImage) {
+ if (!this.hooks.insertImageDialog(linkEnteredCallback))
+ ui.prompt(this.getString("imagedialog"), imageDefaultText, linkEnteredCallback);
+ }
+ else {
+ ui.prompt(this.getString("linkdialog"), linkDefaultText, linkEnteredCallback);
+ }
+ return true;
+ }
+ };
+
+ // When making a list, hitting shift-enter will put your cursor on the next line
+ // at the current indent level.
+ commandProto.doAutoindent = function (chunk, postProcessing) {
+
+ var commandMgr = this,
+ fakeSelection = false;
+
+ chunk.before = chunk.before.replace(/(\n|^)[ ]{0,3}([*+-]|\d+[.])[ \t]*\n$/, "\n\n");
+ chunk.before = chunk.before.replace(/(\n|^)[ ]{0,3}>[ \t]*\n$/, "\n\n");
+ chunk.before = chunk.before.replace(/(\n|^)[ \t]+\n$/, "\n\n");
+
+ // There's no selection, end the cursor wasn't at the end of the line:
+ // The user wants to split the current list item / code line / blockquote line
+ // (for the latter it doesn't really matter) in two. Temporarily select the
+ // (rest of the) line to achieve this.
+ if (!chunk.selection && !/^[ \t]*(?:\n|$)/.test(chunk.after)) {
+ chunk.after = chunk.after.replace(/^[^\n]*/, function (wholeMatch) {
+ chunk.selection = wholeMatch;
+ return "";
+ });
+ fakeSelection = true;
+ }
+
+ if (/(\n|^)[ ]{0,3}([*+-]|\d+[.])[ \t]+.*\n$/.test(chunk.before)) {
+ if (commandMgr.doList) {
+ commandMgr.doList(chunk);
+ }
+ }
+ if (/(\n|^)[ ]{0,3}>[ \t]+.*\n$/.test(chunk.before)) {
+ if (commandMgr.doBlockquote) {
+ commandMgr.doBlockquote(chunk);
+ }
+ }
+ if (/(\n|^)(\t|[ ]{4,}).*\n$/.test(chunk.before)) {
+ if (commandMgr.doCode) {
+ commandMgr.doCode(chunk);
+ }
+ }
+
+ if (fakeSelection) {
+ chunk.after = chunk.selection + chunk.after;
+ chunk.selection = "";
+ }
+ };
+
+ commandProto.doBlockquote = function (chunk, postProcessing) {
+
+ chunk.selection = chunk.selection.replace(/^(\n*)([^\r]+?)(\n*)$/,
+ function (totalMatch, newlinesBefore, text, newlinesAfter) {
+ chunk.before += newlinesBefore;
+ chunk.after = newlinesAfter + chunk.after;
+ return text;
+ });
+
+ chunk.before = chunk.before.replace(/(>[ \t]*)$/,
+ function (totalMatch, blankLine) {
+ chunk.selection = blankLine + chunk.selection;
+ return "";
+ });
+
+ chunk.selection = chunk.selection.replace(/^(\s|>)+$/, "");
+ chunk.selection = chunk.selection || this.getString("quoteexample");
+
+ // The original code uses a regular expression to find out how much of the
+ // text *directly before* the selection already was a blockquote:
+
+ /*
+ if (chunk.before) {
+ chunk.before = chunk.before.replace(/\n?$/, "\n");
+ }
+ chunk.before = chunk.before.replace(/(((\n|^)(\n[ \t]*)*>(.+\n)*.*)+(\n[ \t]*)*$)/,
+ function (totalMatch) {
+ chunk.startTag = totalMatch;
+ return "";
+ });
+ */
+
+ // This comes down to:
+ // Go backwards as many lines a possible, such that each line
+ // a) starts with ">", or
+ // b) is almost empty, except for whitespace, or
+ // c) is preceeded by an unbroken chain of non-empty lines
+ // leading up to a line that starts with ">" and at least one more character
+ // and in addition
+ // d) at least one line fulfills a)
+ //
+ // Since this is essentially a backwards-moving regex, it's susceptible to
+ // catstrophic backtracking and can cause the browser to hang;
+ // see e.g. http://meta.stackoverflow.com/questions/9807.
+ //
+ // Hence we replaced this by a simple state machine that just goes through the
+ // lines and checks for a), b), and c).
+
+ var match = "",
+ leftOver = "",
+ line;
+ if (chunk.before) {
+ var lines = chunk.before.replace(/\n$/, "").split("\n");
+ var inChain = false;
+ for (var i = 0; i < lines.length; i++) {
+ var good = false;
+ line = lines[i];
+ inChain = inChain && line.length > 0; // c) any non-empty line continues the chain
+ if (/^>/.test(line)) { // a)
+ good = true;
+ if (!inChain && line.length > 1) // c) any line that starts with ">" and has at least one more character starts the chain
+ inChain = true;
+ } else if (/^[ \t]*$/.test(line)) { // b)
+ good = true;
+ } else {
+ good = inChain; // c) the line is not empty and does not start with ">", so it matches if and only if we're in the chain
+ }
+ if (good) {
+ match += line + "\n";
+ } else {
+ leftOver += match + line;
+ match = "\n";
+ }
+ }
+ if (!/(^|\n)>/.test(match)) { // d)
+ leftOver += match;
+ match = "";
+ }
+ }
+
+ chunk.startTag = match;
+ chunk.before = leftOver;
+
+ // end of change
+
+ if (chunk.after) {
+ chunk.after = chunk.after.replace(/^\n?/, "\n");
+ }
+
+ chunk.after = chunk.after.replace(/^(((\n|^)(\n[ \t]*)*>(.+\n)*.*)+(\n[ \t]*)*)/,
+ function (totalMatch) {
+ chunk.endTag = totalMatch;
+ return "";
+ }
+ );
+
+ var replaceBlanksInTags = function (useBracket) {
+
+ var replacement = useBracket ? "> " : "";
+
+ if (chunk.startTag) {
+ chunk.startTag = chunk.startTag.replace(/\n((>|\s)*)\n$/,
+ function (totalMatch, markdown) {
+ return "\n" + markdown.replace(/^[ ]{0,3}>?[ \t]*$/gm, replacement) + "\n";
+ });
+ }
+ if (chunk.endTag) {
+ chunk.endTag = chunk.endTag.replace(/^\n((>|\s)*)\n/,
+ function (totalMatch, markdown) {
+ return "\n" + markdown.replace(/^[ ]{0,3}>?[ \t]*$/gm, replacement) + "\n";
+ });
+ }
+ };
+
+ if (/^(?![ ]{0,3}>)/m.test(chunk.selection)) {
+ this.wrap(chunk, SETTINGS.lineLength - 2);
+ chunk.selection = chunk.selection.replace(/^/gm, "> ");
+ replaceBlanksInTags(true);
+ chunk.skipLines();
+ } else {
+ chunk.selection = chunk.selection.replace(/^[ ]{0,3}> ?/gm, "");
+ this.unwrap(chunk);
+ replaceBlanksInTags(false);
+
+ if (!/^(\n|^)[ ]{0,3}>/.test(chunk.selection) && chunk.startTag) {
+ chunk.startTag = chunk.startTag.replace(/\n{0,2}$/, "\n\n");
+ }
+
+ if (!/(\n|^)[ ]{0,3}>.*$/.test(chunk.selection) && chunk.endTag) {
+ chunk.endTag = chunk.endTag.replace(/^\n{0,2}/, "\n\n");
+ }
+ }
+
+ chunk.selection = this.hooks.postBlockquoteCreation(chunk.selection);
+
+ if (!/\n/.test(chunk.selection)) {
+ chunk.selection = chunk.selection.replace(/^(> *)/,
+ function (wholeMatch, blanks) {
+ chunk.startTag += blanks;
+ return "";
+ });
+ }
+ };
+
+ commandProto.doCode = function (chunk, postProcessing) {
+
+ var hasTextBefore = /\S[ ]*$/.test(chunk.before);
+ var hasTextAfter = /^[ ]*\S/.test(chunk.after);
+
+ // Use 'four space' markdown if the selection is on its own
+ // line or is multiline.
+ if ((!hasTextAfter && !hasTextBefore) || /\n/.test(chunk.selection)) {
+
+ chunk.before = chunk.before.replace(/[ ]{4}$/,
+ function (totalMatch) {
+ chunk.selection = totalMatch + chunk.selection;
+ return "";
+ });
+
+ var nLinesBack = 1;
+ var nLinesForward = 1;
+
+ if (/(\n|^)(\t|[ ]{4,}).*\n$/.test(chunk.before)) {
+ nLinesBack = 0;
+ }
+ if (/^\n(\t|[ ]{4,})/.test(chunk.after)) {
+ nLinesForward = 0;
+ }
+
+ chunk.skipLines(nLinesBack, nLinesForward);
+
+ if (!chunk.selection) {
+ chunk.startTag = " ";
+ chunk.selection = this.getString("codeexample");
+ }
+ else {
+ if (/^[ ]{0,3}\S/m.test(chunk.selection)) {
+ if (/\n/.test(chunk.selection))
+ chunk.selection = chunk.selection.replace(/^/gm, " ");
+ else // if it's not multiline, do not select the four added spaces; this is more consistent with the doList behavior
+ chunk.before += " ";
+ }
+ else {
+ chunk.selection = chunk.selection.replace(/^[ ]{4}/gm, "");
+ }
+ }
+ }
+ else {
+ // Use backticks (`) to delimit the code block.
+
+ chunk.trimWhitespace();
+ chunk.findTags(/`/, /`/);
+
+ if (!chunk.startTag && !chunk.endTag) {
+ chunk.startTag = chunk.endTag = "`";
+ if (!chunk.selection) {
+ chunk.selection = this.getString("codeexample");
+ }
+ }
+ else if (chunk.endTag && !chunk.startTag) {
+ chunk.before += chunk.endTag;
+ chunk.endTag = "";
+ }
+ else {
+ chunk.startTag = chunk.endTag = "";
+ }
+ }
+ };
+
+ commandProto.doList = function (chunk, postProcessing, isNumberedList) {
+
+ // These are identical except at the very beginning and end.
+ // Should probably use the regex extension function to make this clearer.
+ var previousItemsRegex = /(\n|^)(([ ]{0,3}([*+-]|\d+[.])[ \t]+.*)(\n.+|\n{2,}([*+-].*|\d+[.])[ \t]+.*|\n{2,}[ \t]+\S.*)*)\n*$/;
+ var nextItemsRegex = /^\n*(([ ]{0,3}([*+-]|\d+[.])[ \t]+.*)(\n.+|\n{2,}([*+-].*|\d+[.])[ \t]+.*|\n{2,}[ \t]+\S.*)*)\n*/;
+
+ // The default bullet is a dash but others are possible.
+ // This has nothing to do with the particular HTML bullet,
+ // it's just a markdown bullet.
+ var bullet = "-";
+
+ // The number in a numbered list.
+ var num = 1;
+
+ // Get the item prefix - e.g. " 1. " for a numbered list, " - " for a bulleted list.
+ var getItemPrefix = function () {
+ var prefix;
+ if (isNumberedList) {
+ prefix = " " + num + ". ";
+ num++;
+ }
+ else {
+ prefix = " " + bullet + " ";
+ }
+ return prefix;
+ };
+
+ // Fixes the prefixes of the other list items.
+ var getPrefixedItem = function (itemText) {
+
+ // The numbering flag is unset when called by autoindent.
+ if (isNumberedList === undefined) {
+ isNumberedList = /^\s*\d/.test(itemText);
+ }
+
+ // Renumber/bullet the list element.
+ itemText = itemText.replace(/^[ ]{0,3}([*+-]|\d+[.])\s/gm,
+ function (_) {
+ return getItemPrefix();
+ });
+
+ return itemText;
+ };
+
+ chunk.findTags(/(\n|^)*[ ]{0,3}([*+-]|\d+[.])\s+/, null);
+
+ if (chunk.before && !/\n$/.test(chunk.before) && !/^\n/.test(chunk.startTag)) {
+ chunk.before += chunk.startTag;
+ chunk.startTag = "";
+ }
+
+ if (chunk.startTag) {
+
+ var hasDigits = /\d+[.]/.test(chunk.startTag);
+ chunk.startTag = "";
+ chunk.selection = chunk.selection.replace(/\n[ ]{4}/g, "\n");
+ this.unwrap(chunk);
+ chunk.skipLines();
+
+ if (hasDigits) {
+ // Have to renumber the bullet points if this is a numbered list.
+ chunk.after = chunk.after.replace(nextItemsRegex, getPrefixedItem);
+ }
+ if (isNumberedList == hasDigits) {
+ return;
+ }
+ }
+
+ var nLinesUp = 1;
+
+ chunk.before = chunk.before.replace(previousItemsRegex,
+ function (itemText) {
+ if (/^\s*([*+-])/.test(itemText)) {
+ bullet = re.$1;
+ }
+ nLinesUp = /[^\n]\n\n[^\n]/.test(itemText) ? 1 : 0;
+ return getPrefixedItem(itemText);
+ });
+
+ if (!chunk.selection) {
+ chunk.selection = this.getString("litem");
+ }
+
+ var prefix = getItemPrefix();
+
+ var nLinesDown = 1;
+
+ chunk.after = chunk.after.replace(nextItemsRegex,
+ function (itemText) {
+ nLinesDown = /[^\n]\n\n[^\n]/.test(itemText) ? 1 : 0;
+ return getPrefixedItem(itemText);
+ });
+
+ chunk.trimWhitespace(true);
+ chunk.skipLines(nLinesUp, nLinesDown, true);
+ chunk.startTag = prefix;
+ var spaces = prefix.replace(/./g, " ");
+ this.wrap(chunk, SETTINGS.lineLength - spaces.length);
+ chunk.selection = chunk.selection.replace(/\n/g, "\n" + spaces);
+
+ };
+
+ commandProto.doHeading = function (chunk, postProcessing) {
+
+ // Remove leading/trailing whitespace and reduce internal spaces to single spaces.
+ chunk.selection = chunk.selection.replace(/\s+/g, " ");
+ chunk.selection = chunk.selection.replace(/(^\s+|\s+$)/g, "");
+
+ // If we clicked the button with no selected text, we just
+ // make a level 2 hash header around some default text.
+ if (!chunk.selection) {
+ chunk.startTag = "## ";
+ chunk.selection = this.getString("headingexample");
+ chunk.endTag = " ##";
+ return;
+ }
+
+ var headerLevel = 0; // The existing header level of the selected text.
+
+ // Remove any existing hash heading markdown and save the header level.
+ chunk.findTags(/#+[ ]*/, /[ ]*#+/);
+ if (/#+/.test(chunk.startTag)) {
+ headerLevel = re.lastMatch.length;
+ }
+ chunk.startTag = chunk.endTag = "";
+
+ // Try to get the current header level by looking for - and = in the line
+ // below the selection.
+ chunk.findTags(null, /\s?(-+|=+)/);
+ if (/=+/.test(chunk.endTag)) {
+ headerLevel = 1;
+ }
+ if (/-+/.test(chunk.endTag)) {
+ headerLevel = 2;
+ }
+
+ // Skip to the next line so we can create the header markdown.
+ chunk.startTag = chunk.endTag = "";
+ chunk.skipLines(1, 1);
+
+ // We make a level 2 header if there is no current header.
+ // If there is a header level, we substract one from the header level.
+ // If it's already a level 1 header, it's removed.
+ var headerLevelToCreate = headerLevel == 0 ? 2 : headerLevel - 1;
+
+ if (headerLevelToCreate > 0) {
+
+ // The button only creates level 1 and 2 underline headers.
+ // Why not have it iterate over hash header levels? Wouldn't that be easier and cleaner?
+ var headerChar = headerLevelToCreate >= 2 ? "-" : "=";
+ var len = chunk.selection.length;
+ if (len > SETTINGS.lineLength) {
+ len = SETTINGS.lineLength;
+ }
+ chunk.endTag = "\n";
+ while (len--) {
+ chunk.endTag += headerChar;
+ }
+ }
+ };
+
+ commandProto.doHorizontalRule = function (chunk, postProcessing) {
+ chunk.startTag = "----------\n";
+ chunk.selection = "";
+ chunk.skipLines(2, 1, true);
+ }
+
+
+})();
diff --git a/widgy/contrib/page_builder/static/widgy/js/components/markdown/lib/Markdown.Sanitizer.js b/widgy/contrib/page_builder/static/widgy/js/components/markdown/lib/Markdown.Sanitizer.js
new file mode 100644
index 000000000..cc5826fa8
--- /dev/null
+++ b/widgy/contrib/page_builder/static/widgy/js/components/markdown/lib/Markdown.Sanitizer.js
@@ -0,0 +1,108 @@
+(function () {
+ var output, Converter;
+ if (typeof exports === "object" && typeof require === "function") { // we're in a CommonJS (e.g. Node.js) module
+ output = exports;
+ Converter = require("./Markdown.Converter").Converter;
+ } else {
+ output = window.Markdown;
+ Converter = output.Converter;
+ }
+
+ output.getSanitizingConverter = function () {
+ var converter = new Converter();
+ converter.hooks.chain("postConversion", sanitizeHtml);
+ converter.hooks.chain("postConversion", balanceTags);
+ return converter;
+ }
+
+ function sanitizeHtml(html) {
+ return html.replace(/<[^>]*>?/gi, sanitizeTag);
+ }
+
+ // (tags that can be opened/closed) | (tags that stand alone)
+ var basic_tag_whitelist = /^(<\/?(b|blockquote|code|del|dd|dl|dt|em|h1|h2|h3|i|kbd|li|ol|p|pre|s|sup|sub|strong|strike|ul)>|<(br|hr)\s?\/?>)$/i;
+ // |
+ var a_white = /^(]+")?\s?>|<\/a>)$/i;
+
+ // ]*")?(\stitle="[^"<>]*")?\s?\/?>)$/i;
+
+ function sanitizeTag(tag) {
+ if (tag.match(basic_tag_whitelist) || tag.match(a_white) || tag.match(img_white))
+ return tag;
+ else
+ return "";
+ }
+
+ ///
+ /// attempt to balance HTML tags in the html string
+ /// by removing any unmatched opening or closing tags
+ /// IMPORTANT: we *assume* HTML has *already* been
+ /// sanitized and is safe/sane before balancing!
+ ///
+ /// adapted from CODESNIPPET: A8591DBA-D1D3-11DE-947C-BA5556D89593
+ ///
+ function balanceTags(html) {
+
+ if (html == "")
+ return "";
+
+ var re = /<\/?\w+[^>]*(\s|$|>)/g;
+ // convert everything to lower case; this makes
+ // our case insensitive comparisons easier
+ var tags = html.toLowerCase().match(re);
+
+ // no HTML tags present? nothing to do; exit now
+ var tagcount = (tags || []).length;
+ if (tagcount == 0)
+ return html;
+
+ var tagname, tag;
+ var ignoredtags = "
+ {% block commit_info %}
+ {{ commit.created_at|date:"SHORT_DATETIME_FORMAT" }}
+ {% if commit.author %}{% blocktrans with author=commit.author %} by {{ author }}.{% endblocktrans %}{% endif %}
+ {% if commit.publish_at > commit.created_at %}
+ (
+ {% if not commit.is_published %}
+
+ {% trans "Scheduled to be published at" %}
+ {% else %}
+ {% trans "Published at" %}
+ {% endif %}
+ {{ commit.publish_at|date:"SHORT_DATETIME_FORMAT" }}.
+ )
+ {% if not commit.is_published %}
+ *
+ {% endif %}
+ {% endif %}
+ {% endblock %}
+
+ {% block commit_actions %}
+ {% has_add_permission site commit as can_revert %}
+ {% if commit.root_node != commit.tracker.head.root_node and can_revert %}
+ {% trans "Revert to this Version" %}
+ {% elif can_revert %}
+ {% trans "Can't revert; this is the same as the current version." %}
+ {% endif %}
+ {% for diff_url in commit.diff_urls %}
+ {% trans "Diff" %}
+ {% endfor %}
+ {% for owner in object.owners %}
+ {% get_action_links owner commit.root_node as links %}
+ {% for link in links %}
+ {{ link.text }}
+ {% endfor %}
+ {% endfor %}
+ {% endblock %}
+
+
+ {% if commit.message %}
+
{{ commit.message|linebreaks }}
+ {% endif %}
+
+ {% endfor %}
+
+
+{% endblock %}
diff --git a/widgy/contrib/widgy_mezzanine/templates/widgy/mezzanine_base.html b/widgy/contrib/widgy_mezzanine/templates/widgy/mezzanine_base.html
new file mode 100644
index 000000000..6dd0650ee
--- /dev/null
+++ b/widgy/contrib/widgy_mezzanine/templates/widgy/mezzanine_base.html
@@ -0,0 +1,16 @@
+{% extends "layout_base.html" %}
+{% load pages_tags %}
+
+{% block metadata %}
+{{ page.meta_title }}
+
+
+{% endblock %}
+
+{% block leftnav %}
+ {% page_menu 'pages/menus/leftnav.html' %}
+{% endblock %}
+
+{% block breadcrumb %}
+{{ block.super }} {% page_menu 'pages/menus/breadcrumb.html' %}
+{% endblock %}
diff --git a/widgy/contrib/widgy_mezzanine/tests.py b/widgy/contrib/widgy_mezzanine/tests.py
new file mode 100644
index 000000000..e286f1314
--- /dev/null
+++ b/widgy/contrib/widgy_mezzanine/tests.py
@@ -0,0 +1,139 @@
+import mock
+
+from django.test import TestCase
+from django.utils.unittest import skipUnless
+from django.test.client import RequestFactory
+from django.test.utils import override_settings
+from django import forms
+from django.conf import settings
+
+from widgy.site import WidgySite
+from widgy.utils import get_user_model
+from widgy.contrib.widgy_mezzanine import get_widgypage_model
+
+User = get_user_model()
+widgy_site = WidgySite()
+WidgyPage = get_widgypage_model()
+
+FORM_BUILDER_INSTALLED = 'widgy.contrib.form_builder' in settings.INSTALLED_APPS
+
+if FORM_BUILDER_INSTALLED:
+ from widgy.contrib.form_builder.models import Form, FormInput
+ from widgy.contrib.widgy_mezzanine.views import handle_form
+
+PAGE_BUILDER_INSTALLED = 'widgy.contrib.page_builder' in settings.INSTALLED_APPS
+
+if PAGE_BUILDER_INSTALLED:
+ from widgy.contrib.page_builder.models import Button
+ from widgy.contrib.widgy_mezzanine.views import PreviewView
+
+
+@skipUnless(FORM_BUILDER_INSTALLED, 'form_builder not installed')
+class TestFormHandler(TestCase):
+ def setUp(self):
+ self.factory = RequestFactory()
+ self.form = Form.add_root(widgy_site)
+
+ def test_get(self):
+ req = self.factory.get('/?from=/foo/')
+ resp = handle_form(req, form_node_pk=self.form.node.pk)
+
+ self.assertEqual(resp['Location'], '/foo/')
+
+ def test_post(self):
+ req = self.factory.post('/?from=/foo/')
+
+ with mock.patch.object(Form, 'execute') as form_execute:
+ form_execute.return_value = object()
+ resp = handle_form(req, form_node_pk=self.form.node.pk)
+
+ args, kwargs = form_execute.call_args
+ self.assertIs(args[0], req)
+ self.assertIsInstance(args[1], forms.BaseForm)
+
+ # should use the form's response
+ self.assertIs(resp, form_execute.return_value)
+
+ def test_post_rerender(self):
+ self.form.children['fields'].add_child(widgy_site, FormInput,
+ label='foo',
+ required=True,
+ type='text',
+ )
+
+ req = self.factory.post('/?from=/foo/')
+ req.user = User(is_superuser=True)
+
+ with mock.patch.object(Form, 'execute') as form_execute:
+ with mock.patch('widgy.contrib.widgy_mezzanine.views.page_view') as page_view:
+ page_view.return_value = object()
+ resp = handle_form(req, form_node_pk=self.form.node.pk)
+
+ form_execute.assert_not_called()
+
+ self.assertIs(resp, page_view.return_value)
+
+ args, kwargs = page_view.call_args
+ self.assertIs(args[0], req)
+ extra_context = kwargs['extra_context']
+
+ self.assertEqual(extra_context['root_node_override'], self.form.node)
+
+ django_form = extra_context[self.form.context_var]
+ self.assertIsInstance(django_form, forms.BaseForm)
+ self.assertTrue(django_form.errors)
+
+ @override_settings(MIDDLEWARE_CLASSES=settings.MIDDLEWARE_CLASSES + (
+ 'mezzanine.pages.middleware.PageMiddleware',
+ ))
+ def test_post_no_404(self):
+ """
+ Mezzanine==3.1.2 introduced a change that caused calls to page view
+ (such as in the form_invalid of the handle_form view to 404. This test
+ ensures that there is no 404.
+ """
+ from widgy.contrib.widgy_mezzanine.models import WidgyPage
+ page = WidgyPage.objects.create(title='Test')
+
+ self.form.children['fields'].add_child(widgy_site, FormInput,
+ label='foo',
+ required=True,
+ type='text',
+ )
+
+ req = self.factory.post('/?from=/foo/')
+ req.user = User(is_superuser=True)
+
+ resp = handle_form(req, form_node_pk=self.form.node.pk, slug=page.slug)
+
+ self.assertEqual(resp.status_code, 200)
+
+
+@skipUnless(PAGE_BUILDER_INSTALLED, 'page_builder is not installed')
+@override_settings(MIDDLEWARE_CLASSES=settings.MIDDLEWARE_CLASSES + (
+ 'mezzanine.pages.middleware.PageMiddleware',
+))
+class TestPreviewView(TestCase):
+ def setUp(self):
+ self.factory = RequestFactory()
+
+ def test_preview(self):
+ preview_view = PreviewView.as_view(site=widgy_site)
+
+ page = WidgyPage.objects.create(title='Test')
+ root_node1 = Button.add_root(widgy_site, text='Test 1')
+ root_node2 = Button.add_root(widgy_site, text='Test 2')
+
+ req = self.factory.get('/')
+ req.user = User(is_superuser=True)
+
+ resp1 = preview_view(req, node_pk=root_node1.node.pk, slug=page.slug)
+
+ self.assertEqual(resp1.status_code, 200)
+ self.assertIn('Test 1', resp1.rendered_content)
+ self.assertEqual(resp1.context_data['page'].get_content_model(), page)
+
+ resp2 = preview_view(req, node_pk=root_node2.node.pk, slug=page.slug)
+
+ self.assertEqual(resp2.status_code, 200)
+ self.assertIn('Test 2', resp2.rendered_content)
diff --git a/widgy/contrib/widgy_mezzanine/urls.py b/widgy/contrib/widgy_mezzanine/urls.py
new file mode 100644
index 000000000..2b0ac5631
--- /dev/null
+++ b/widgy/contrib/widgy_mezzanine/urls.py
@@ -0,0 +1,7 @@
+from django.conf.urls import patterns, url
+
+urlpatterns = patterns('widgy.contrib.widgy_mezzanine.views',
+ url('^preview/(?P[^/]+)/$', 'preview'), # undelete
+ url('^preview/(?P[^/]+)/(?P.+)/$', 'preview'),
+ url('^form/(?P[^/]*)/(?P.+)/$', 'handle_form'),
+)
diff --git a/widgy/contrib/widgy_mezzanine/views.py b/widgy/contrib/widgy_mezzanine/views.py
new file mode 100644
index 000000000..82e88cb1d
--- /dev/null
+++ b/widgy/contrib/widgy_mezzanine/views.py
@@ -0,0 +1,113 @@
+from django.db.models import Q
+from django.views.generic import View
+from django.views.generic.detail import SingleObjectMixin
+from django.conf import settings
+from django.http import (
+ HttpResponseBadRequest,
+ HttpResponseForbidden,
+ HttpResponsePermanentRedirect,
+)
+from django.utils.http import is_safe_url
+
+from mezzanine.pages.views import page as page_view
+from mezzanine.pages.models import Page
+
+from widgy.contrib.form_builder.views import HandleFormMixin
+from widgy.contrib.widgy_mezzanine import get_widgypage_model
+from widgy.models import Node
+from widgy.views.base import AuthorizedMixin
+from widgy.utils import fancy_import
+
+WidgyPage = get_widgypage_model()
+
+
+def get_page_from_node(node):
+ root_node = node.get_root()
+ try:
+ # try to find a page that uses this root node
+ return WidgyPage.objects.distinct().get(
+ Q(root_node__commits__root_node=root_node) | Q(root_node__working_copy=root_node)
+ )
+ except WidgyPage.DoesNotExist:
+ # otherwise, use a fake page
+ return WidgyPage(
+ titles='restoring page',
+ content_model='widgypage',
+ )
+
+
+class PageViewMixin(object):
+ def get_page(self):
+ try:
+ return Page.objects.published(for_user=self.request.user).get(slug=self.kwargs['slug'])
+ except (KeyError, Page.DoesNotExist):
+ # restoring, use a fake page
+ return WidgyPage(
+ titles='restoring page',
+ content_model='widgypage',
+ )
+
+ def page_view(self, request, page, context):
+ # Before Mezzanine==3.1.2, the page view would check extra_context for
+ # the page object, so we would pass it in then, starting with 3.1.2 and
+ # the introduction of mezzanine.pages.context_processors.page,
+ # Mezzanine expects the PageMiddleware to set page on the request. The
+ # context_processor will add the page and _current_page values to the
+ # context for us, but we are still passing it in for Mezzanine<=3.1.1.
+ if hasattr(page, 'page_ptr'):
+ # mezzanine.pages.middleware.PageMiddleware sticks a Page object,
+ # not a WidgyPage object, to the request so we also need to get the
+ # raw Page object.
+ page = page.page_ptr
+
+ request.page = page
+
+ extra_context = {
+ 'page': page,
+ '_current_page': page,
+ }
+ extra_context.update(context)
+
+ return page_view(request, page.slug, extra_context=extra_context)
+
+
+class HandleFormView(HandleFormMixin, PageViewMixin, View):
+ def get(self, request, *args, **kwargs):
+ try:
+ if not is_safe_url(request.GET['from']):
+ return HttpResponseForbidden()
+ return HttpResponsePermanentRedirect(request.GET['from'])
+ except KeyError:
+ return HttpResponseBadRequest()
+
+ def form_invalid(self, form):
+ root_node = self.form_node.get_root()
+ page = self.get_page()
+
+ context = self.get_context_data(
+ form=form,
+ root_node_override=root_node,
+ )
+
+ return self.page_view(self.request, page, context)
+
+handle_form = HandleFormView.as_view()
+
+
+class PreviewView(AuthorizedMixin, SingleObjectMixin, PageViewMixin, View):
+ model = Node
+ pk_url_kwarg = 'node_pk'
+
+ def get(self, request, *args, **kwargs):
+ node = self.get_object()
+ page = self.get_page()
+
+ context = {
+ 'root_node_override': node,
+ }
+
+ return self.page_view(request, page, context)
+
+preview = PreviewView.as_view(
+ site=fancy_import(settings.WIDGY_MEZZANINE_SITE),
+)
diff --git a/widgy/db/__init__.py b/widgy/db/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/widgy/db/fields.py b/widgy/db/fields.py
new file mode 100644
index 000000000..b9cd63464
--- /dev/null
+++ b/widgy/db/fields.py
@@ -0,0 +1,189 @@
+from django.db import models
+from django.db.models.fields.related import ReverseSingleRelatedObjectDescriptor
+from django.db.models.loading import get_app
+from django.contrib.contenttypes.models import ContentType
+
+# WidgyContentType has a patched get_for_models that doesn't ignore proxy
+# models
+from widgy.generic.models import ContentType as WidgyContentType
+from widgy.utils import fancy_import, update_context
+
+from south.modelsinspector import add_introspection_rules
+
+add_introspection_rules([], ["^widgy\.db.fields\.WidgyField"])
+add_introspection_rules([], ["^widgy\.db.fields\.VersionedWidgyField"])
+
+
+def get_site(site):
+ if isinstance(site, basestring):
+ return fancy_import(site)
+ else:
+ return site
+
+
+class WidgyFieldObjectDescriptor(ReverseSingleRelatedObjectDescriptor):
+ """
+ .. note::
+ we need to transport the ContentType of the Node all the way to
+ ``pre_save``, without saving an instance of the node, because we don't
+ know if the rest of the model is valid yet.
+ """
+ def __set__(self, instance, value):
+ """
+ """
+ if isinstance(value, ContentType):
+ ModelClass = self.field.rel.to
+ value, value._ct = ModelClass(), value
+
+ super(WidgyFieldObjectDescriptor, self).__set__(instance, value)
+
+
+class WidgyField(models.ForeignKey):
+ """
+ Model field that inherits from ``models.ForeignKey``. Contains validation
+ and context switching that is needed for Widgy fields.
+ """
+ def __init__(self, site=None, to=None, root_choices=None, **kwargs):
+ if to is None:
+ to = 'widgy.Node'
+
+ self.root_choices = root_choices
+
+ self.site = get_site(site)
+
+ super(WidgyField, self).__init__(to, **kwargs)
+
+ def contribute_to_class(self, cls, name):
+ """
+
+ .. note:: we need to use WidgyFieldObjectDescriptor instead of
+ ``ReverseSingleRelatedObjectDescriptor`` because of the modifications
+ to __set__.
+ """
+ super(WidgyField, self).contribute_to_class(cls, name)
+ setattr(cls, self.name, WidgyFieldObjectDescriptor(self))
+
+ def add_root(self, model_instance, root_content_kwargs={}):
+ value = getattr(model_instance, self.name)
+ return value._ct.model_class().add_root(self.site, **root_content_kwargs).node
+
+ def pre_save(self, model_instance, add):
+ """
+ Relies on WidgyFieldObjectDescriptor to set the content type on an
+ unsaved throwaway Node so that we know how to properly instantiate a
+ real node later on.
+ """
+ try:
+ value = getattr(model_instance, self.name)
+ except models.ObjectDoesNotExist:
+ value = None
+
+ if hasattr(value, '_ct'):
+ node = self.add_root(model_instance)
+ setattr(model_instance, self.name, node)
+ setattr(model_instance, self.attname, node.pk)
+
+ return super(WidgyField, self).pre_save(model_instance, add)
+
+ def formfield(self, **kwargs):
+ from widgy.forms import WidgyFormField
+ defaults = {
+ 'form_class': WidgyFormField,
+ 'queryset': self.get_layout_contenttypes(self.root_choices),
+ 'site': self.site,
+ }
+ defaults.update(kwargs)
+ return super(WidgyField, self).formfield(**defaults)
+
+ def get_layout_contenttypes(self, layouts):
+ def normalize(layout):
+ try:
+ app_label, model_name = layout.split(".")
+ except ValueError:
+ app_label = self.model._meta.app_label
+ model_name = layout
+ except AttributeError:
+ app_label = layout._meta.app_label
+ model_name = layout._meta.object_name
+
+ # we cannot use models.get_model because this class could be
+ # abstract.
+ return getattr(get_app(app_label), model_name)
+
+ layouts = tuple(map(normalize, layouts))
+ classes = (cls for cls in self.site.get_all_content_classes()
+ if issubclass(cls, layouts))
+
+ # This method must return a queryset, because it is used as
+ # choices for a ModelChoiceField.
+ #
+ # If you are having trouble running tests because of this line,
+ # do not create WidgyFormMixin subclasses at the root level, the
+ # test databases haven't been set up yet, but we try to query
+ # the ContentType table.
+ return ContentType.objects.filter(pk__in=[
+ ct.pk for ct in WidgyContentType.objects.get_for_models(
+ for_concrete_models=False,
+ *classes
+ ).values()])
+
+ def get_render_node(self, model_instance, context):
+ return getattr(model_instance, self.name)
+
+ def render(self, model_instance, context=None, node=None):
+ root_node = node or self.get_render_node(model_instance, context)
+ if not root_node:
+ return 'no content'
+
+ root_node.prefetch_tree()
+ env = {
+ 'widgy': {
+ 'site': self.site,
+ 'owner': model_instance,
+ 'root_node': root_node,
+ 'parent': context and context.get('widgy'),
+ },
+ }
+ with update_context(context, env) as context:
+ return root_node.render(context)
+
+ def validate(self, value, model_instance):
+ # `value` is our root node's pk. If we're currently creating
+ # the root node, it isn't saved so it can't have a pk. The base
+ # field's validate will fail, even though pre_save will actually
+ # create a node and set the fk field.
+ if value is None and not self.blank and getattr(model_instance, self.name):
+ return
+ else:
+ return super(WidgyField, self).validate(value, model_instance)
+
+
+class VersionedWidgyField(WidgyField):
+ def __init__(self, site=None, to=None, root_choices=None, **kwargs):
+ if to is None:
+ to = get_site(site).get_version_tracker_model()
+ super(VersionedWidgyField, self).__init__(site, to, root_choices, **kwargs)
+
+ def add_root(self, model_instance, root_content_kwargs={}):
+ VersionTracker = self.site.get_version_tracker_model()
+ node = super(VersionedWidgyField, self).add_root(model_instance, root_content_kwargs)
+ version_tracker = VersionTracker.objects.create(
+ working_copy=node
+ )
+ return version_tracker
+
+ def formfield(self, **kwargs):
+ from widgy.forms import VersionedWidgyFormField
+ return super(VersionedWidgyField, self).formfield(
+ form_class=VersionedWidgyFormField,
+ **kwargs)
+
+ def get_render_node(self, model_instance, context):
+ version_tracker = getattr(model_instance, self.name)
+ if version_tracker:
+ node = version_tracker.get_published_node(context and context.get('request'))
+ if node is None:
+ node = version_tracker.working_copy
+ return node
+ else:
+ return None
diff --git a/widgy/debugtoolbar/__init__.py b/widgy/debugtoolbar/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/widgy/debugtoolbar/templates.py b/widgy/debugtoolbar/templates.py
new file mode 100644
index 000000000..02de38ac5
--- /dev/null
+++ b/widgy/debugtoolbar/templates.py
@@ -0,0 +1,76 @@
+from django.dispatch import Signal
+from django.template.loader import select_template, TemplateDoesNotExist
+from django.contrib.staticfiles import finders
+
+from debug_toolbar.panels import DebugPanel
+
+from widgy.models import Content
+
+template_hierarchy_called = Signal(providing_args=['cls', 'kwargs', 'templates', 'used'])
+
+
+def unique_list(lst):
+ """
+ Removes duplicates from a list while preserving order
+ """
+ res = []
+ for i, item in enumerate(lst):
+ if i == len(lst) - 1 or lst[i + 1] != item:
+ res.append(item)
+ return res
+
+
+def monkey_patch():
+ """
+ Monkey patch in our own, instrumented, get_templates_hierarchy. Make
+ sure to keep it a classmethod.
+ """
+ old_get_templates_hierarchy_unbound = Content.get_templates_hierarchy.im_func
+
+ def new_get_templates_hierarchy(cls, **kwargs):
+ res = old_get_templates_hierarchy_unbound(cls, **kwargs)
+ res = unique_list(res)
+ try:
+ name = select_template(res).name
+ except TemplateDoesNotExist:
+ name = [i for i in res if finders.find(i)]
+ template_hierarchy_called.send(sender=cls, cls=cls, kwargs=kwargs, templates=res, used=name)
+ return res
+ Content.get_templates_hierarchy = classmethod(new_get_templates_hierarchy)
+
+
+class TemplatePanel(DebugPanel):
+ name = 'Widgy templates'
+ template = 'widgy/debugtoolbar/templates.html'
+
+ def __init__(self, *args, **kwargs):
+ super(TemplatePanel, self).__init__(*args, **kwargs)
+ monkey_patch()
+ template_hierarchy_called.connect(self._store_info)
+ self.calls = []
+
+ def nav_title(self):
+ return 'Widgy templates'
+
+ def _store_info(self, **kwargs):
+ # A class can't be outputted directly in a template, because it's
+ # callable. `_meta` can't be accessed because it starts with an
+ # underscore.
+ kwargs['cls_name'] = '%s.%s' % (kwargs['cls']._meta.app_label,
+ kwargs['cls'].__name__)
+ self.calls.append(kwargs)
+
+ def process_response(self, request, response):
+ self.record_stats({
+ 'calls': self.calls,
+ })
+
+ def url(self):
+ return ''
+
+ def title(self):
+ return '%s widgets rendered' % len(self.calls)
+
+ @property
+ def has_content(self):
+ return bool(self.calls)
diff --git a/widgy/exceptions.py b/widgy/exceptions.py
index 3b5d82972..07f99ca4b 100644
--- a/widgy/exceptions.py
+++ b/widgy/exceptions.py
@@ -1,7 +1,10 @@
from django.core.exceptions import ValidationError
-class InvalidTreeMovement(ValidationError):
+class InvalidOperation(ValidationError):
+ pass
+
+class InvalidTreeMovement(InvalidOperation):
"""
Inherits from ``django.core.exceptions.ValidationError``.
@@ -25,22 +28,22 @@ def __init__(self):
super(ParentChildRejection, self).__init__({'message': self.message})
-class BadParentRejection(ParentChildRejection):
+class ParentWasRejected(ParentChildRejection):
"""
Raised by child to reject the requested parent.
"""
- message = "You can't put me in that"
+ message = "This content does not accept being a child of that parent."
-class BadChildRejection(ParentChildRejection):
+class ChildWasRejected(ParentChildRejection):
"""
Raised by parents to reject children that don't belong.
"""
- message = "You can't put that in me"
+ message = "The parent does not accept this content as a child."
-class OhHellNo(BadParentRejection, BadChildRejection):
+class MutualRejection(ParentWasRejected, ChildWasRejected):
"""
For instances where both child and parent reject the movement request.
"""
- message = "Everyone hates everything"
+ message = "Neither the parent or child accept this parent-child relationship."
diff --git a/widgy/forms.py b/widgy/forms.py
index 425c33fdf..5975a37c4 100644
--- a/widgy/forms.py
+++ b/widgy/forms.py
@@ -1,41 +1,27 @@
-"""
-A collection of model and form field classes.
-"""
-from operator import or_
-
-from django.db import models
-from django.db.models import Q
-from django.db.models.fields.related import ReverseSingleRelatedObjectDescriptor
+from __future__ import unicode_literals
+import time
+
from django import forms
+from django.template.loader import render_to_string
+from django.forms import widgets
from django.contrib.contenttypes.models import ContentType
-from django.template import Template, Context
+from django.utils.safestring import mark_safe
+from django.utils.translation import ugettext_lazy as _
+from django.core.urlresolvers import reverse
+from django.core.exceptions import ObjectDoesNotExist
+from django.conf import settings
-from fusionbox.core.templatetags.fusionbox_tags import json
-from south.modelsinspector import add_introspection_rules
+from widgy.utils import format_html
from widgy.models import Node
-add_introspection_rules([], ["^widgy\.forms\.WidgyField"])
-
-
-WIDGY_FIELD_TEMPLATE = u"""
-{% load compress %}
-{% compress css %}
-
-
-
-{% for sheet in stylesheets %}
-
-{% endfor %}
-{% endcompress %}
-
-
-
-
-"""
+
+class DisplayWidget(forms.Widget):
+ def __init__(self, display_name, *args, **kwargs):
+ super(DisplayWidget, self).__init__(*args, **kwargs)
+ self.display_name = display_name
+
+ def render(self, *args, **kwargs):
+ return format_html(u'{name}', name=self.display_name)
class WidgyWidget(forms.HiddenInput):
@@ -43,16 +29,62 @@ class WidgyWidget(forms.HiddenInput):
Django form widget that is used to load the backbone.js application code
for a Widgy field.
"""
- def render(self, name, value, attrs=None):
- node_json = json(self.node.to_json())
- t = Template(WIDGY_FIELD_TEMPLATE)
- return t.render(Context({
- 'name': name,
+ template_name = 'widgy/widgy_field.html'
+
+ def render(self, name, value, attrs=None, context={}):
+ # If this fails, perhaps they aren't using the WidgyFormMixin. If you
+ # can't use the WidgyFormMixin (report it) and make sure that you call
+ # conform_to_value on the WidgyFormField.
+ assert hasattr(self, 'node'), "You must set the node on a WidgyWidget prior to rendering it."
+
+ self.node.maybe_prefetch_tree()
+ defaults = {
+ 'html_name': name,
'value': value,
- 'stylesheets': self.stylesheets,
'html_id': attrs['id'],
- 'json': node_json
- }))
+ 'node_dict': self.node.to_json(self.site),
+ 'node': self.node,
+ 'api_url': reverse(self.site.node_view),
+ 'site': self.site,
+ 'owner': self.owner,
+ }
+
+ if settings.DEBUG:
+ defaults['cachebust'] = time.time()
+
+ defaults.update(context)
+ return render_to_string(self.template_name, defaults)
+
+
+class ContentTypeRadioInput(widgets.RadioInput):
+ def __init__(self, name, value, attrs, choice, index):
+ super(ContentTypeRadioInput, self).__init__(name, value, attrs, choice, index)
+ self.choice_label = format_html('{0}', self.choice_label)
+
+ def tag(self):
+ tag = super(ContentTypeRadioInput, self).tag()
+ ct = ContentType.objects.get_for_id(self.choice_value)
+ return format_html('{2}', ct.app_label, ct.model, tag)
+
+
+class ContentTypeRadioRenderer(widgets.RadioFieldRenderer):
+ def __iter__(self):
+ for i, choice in enumerate(self.choices):
+ yield ContentTypeRadioInput(self.name, self.value, self.attrs.copy(), choice, i)
+
+ def __getitem__(self, idx):
+ choice = self.choices[idx] # Let the IndexError propogate
+ return ContentTypeRadioInput(self.name, self.value, self.attrs.copy(), choice, idx)
+
+
+class ContentTypeRadioSelect(widgets.RadioSelect):
+ renderer = ContentTypeRadioRenderer
+
+ def render(self, *args, **kwargs):
+ return (mark_safe('
-
diff --git a/widgy/contrib/cms/templates/widgy/widgy.textcontent/textcontent.html b/widgy/contrib/cms/templates/widgy/widgy.textcontent/textcontent.html
deleted file mode 100644
index 88792c5e0..000000000
--- a/widgy/contrib/cms/templates/widgy/widgy.textcontent/textcontent.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% load widgy_tags %}
-
- {{ content.content }}
-
diff --git a/widgy/contrib/cms/templates/widgy/widgy.twocolumnlayout/preview.html b/widgy/contrib/cms/templates/widgy/widgy.twocolumnlayout/preview.html
deleted file mode 100644
index 2dd491d53..000000000
--- a/widgy/contrib/cms/templates/widgy/widgy.twocolumnlayout/preview.html
+++ /dev/null
@@ -1 +0,0 @@
-