Remove target="_blank" from wysihtml5 config and regenerate minificat…

…ions
tangentlabs · Feb 10, 2014 · caa9c7e · caa9c7e
1 parent 94ab2b1
commit caa9c7e
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,18 @@
 Changelog
 =========
 
+
+0.3.1
+-----
+
+* Remove the ``target="_blank"`` attribute that used to be added by
+  ``wysihtml5`` when sanitising link tags.
+* Rename the ``advance.js`` config file for ``wysihtml5`` to
+  ``wysihtml5-config.js``.
+* Minify ``wysihtml5-config.js`` used for customising ``wyshtmls5`` to
+  reduce size.
+
+
 0.3.0
 -----
 

diff --git a/Makefile b/Makefile
@@ -1,5 +1,9 @@
 .PHONY: dev sandbox
 
+smaller:
+	uglifyjs fancypages/static/fancypages/libs/wysihtml5/wysihtml5-config.js > fancypages/static/fancypages/libs/wysihtml5/wysihtml5-config.min.js
+	uglifyjs fancypages/static/fancypages/libs/wysihtml5/wysihtml5-0.3.0.js > fancypages/static/fancypages/libs/wysihtml5/wysihtml5-0.3.0.min.js
+
 dev:
 	pip install -e .
 	pip install -r requirements.txt

diff --git a/fancypages/static/fancypages/libs/wysihtml5/wysihtml5-0.3.0.min.js b/fancypages/static/fancypages/libs/wysihtml5/wysihtml5-0.3.0.min.js
diff --git a/...tic/fancypages/libs/wysihtml5/advanced.js → ...ypages/libs/wysihtml5/wysihtml5-config.js b/...tic/fancypages/libs/wysihtml5/advanced.js → ...ypages/libs/wysihtml5/wysihtml5-config.js
@@ -6,7 +6,7 @@
  *
  *    <a href="http://foobar.com">foo</a>
  *    ... becomes ...
- *    <a href="http://foobar.com" target="_blank" rel="nofollow">foo</a>
+ *    <a href="http://foobar.com" rel="nofollow">foo</a>
  *
  *    <img align="left" src="http://foobar.com/image.png">
  *    ... becomes ...
@@ -184,7 +184,6 @@ var wysihtml5ParserRules = {
             },
             "set_attributes": {
                 "rel": "nofollow",
-                "target": "_blank"
             }
         },
         "img": {

diff --git a/fancypages/static/fancypages/libs/wysihtml5/wysihtml5-config.min.js b/fancypages/static/fancypages/libs/wysihtml5/wysihtml5-config.min.js
diff --git a/fancypages/templates/fancypages/dashboard/layout.html b/fancypages/templates/fancypages/dashboard/layout.html
@@ -15,7 +15,7 @@
 
 {% block extrascripts %}
     {{ block.super }}
-    <script type="text/javascript" src="{% static "fancypages/libs/wysihtml5/advanced.js" %}"></script>
+    <script type="text/javascript" src="{% static "fancypages/libs/wysihtml5/wysihtml5-config.min.js" %}"></script>
     <script type="text/javascript" src="{% static "fancypages/libs/wysihtml5/wysihtml5-0.3.0.min.js" %}"></script>
     {% compress js %}
         <script src="{% static "fancypages/libs/elastislide/jquery.elastislide.js" %}" type="text/javascript" charset="utf-8"></script>

diff --git a/fancypages/templates/fancypages/editor/partials/extrascripts.html b/fancypages/templates/fancypages/editor/partials/extrascripts.html
@@ -1,5 +1,5 @@
 {% load staticfiles %}
-<script type="text/javascript" charset="utf-8" src="{% static "fancypages/libs/wysihtml5/advanced.js" %}"></script>
+<script type="text/javascript" charset="utf-8" src="{% static "fancypages/libs/wysihtml5/wysihtml5-config.min.js" %}"></script>
 <script type="text/javascript" charset="utf-8" src="{% static "fancypages/libs/wysihtml5/wysihtml5-0.3.0.min.js" %}"></script>
 
 <script type="text/javascript" charset="utf-8" src="{% static "fancypages/libs/scrollpane/jquery.jscrollpane.js" %}"></script>