Changeset 3577

Timestamp:

10/28/07 10:54:14 (1 year ago)

Author:

deets

Message:

added tg.mochikit_suppress as config-option

Files:

• branches/1.0/CHANGELOG.txt (modified) (1 diff)
• branches/1.0/turbogears/qstemplates/quickstart/+package+/config/app.cfg_tmpl (modified) (1 diff)
• branches/1.0/turbogears/tests/test_form_controllers.py (modified) (2 diffs)
• branches/1.0/turbogears/widgets/base.py (modified) (1 diff)

branches/1.0/CHANGELOG.txt

@@ -1 +1 @@
-TurboGears Changelog
-====================
+
+1.0.4:
+----------------------------
+
+*Changes*
+    * Introduction of tg.mochikit_suppress to prevent the inclusion of 
+      the shipped MochiKit 1.3.1. That allows to include custom mochikit versions.
+
+*Features*
+    * Introduction of tg.mochikit_suppress to prevent the inclusion of 
+      the shipped MochiKit 1.3.1. That allows to include custom mochikit versions.
-
-1.0.4b2 (October, 27, 2007):

branches/1.0/turbogears/qstemplates/quickstart/+package+/config/app.cfg_tmpl

@@ -28 +28 @@
-# tg.allow_json = False
-
+# Suppress the inclusion of the shipped MochiKit version, which is rather outdated.
+# Attention: setting this to True and listing 'turbogears.mochikit' in 'tg.include_widgets'
+# is a contradiction. This option will overrule the default-inclusion to prevent version
+# mismatch bugs.
+# tg.mochikit_suppress = True
+
-# List of Widgets to include on every page.
-e
+a
-# tg.include_widgets = []
-

branches/1.0/turbogears/tests/test_form_controllers.py

@@ -93 +93 @@
-    assert "MochiKit.js" in cherrypy.response.body[0]
-
+def test_suppress_mochikit():
+    "MochiKit inclusion can be suppressed"
+    root = cherrypy.root
+    turbogears.config.update({"global":{"tg.mochikit_suppress" : True}})
+    testutil.createRequest("/usemochi")
+    print cherrypy.response.body[0]
+    # repair the fixture
+    turbogears.config.update({"global":{"tg.mochikit_suppress" : False}})
+    assert "MochiKit.js" not in cherrypy.response.body[0]
+
-def test_mochikit_everywhere():
-    "MochiKit can be included everywhere by setting tg.mochikit_all"
@@ -101 +111 @@
-    print cherrypy.response.body[0]
-    assert "MochiKit.js" in cherrypy.response.body[0]
+
+def test_mochikit_nowhere():
+    "MochiKit can be included everywhere by setting tg.mochikit_all, but setting tg.mochikit_suppress will prevent that"
+    root = cherrypy.root
+    turbogears.config.update({"global":{"tg.mochikit_all" : True}})
+    turbogears.config.update({"global":{"tg.mochikit_suppress" : True}})
+    testutil.createRequest("/")
+    turbogears.config.update({"global":{"tg.mochikit_all" : False}})
+    turbogears.config.update({"global":{"tg.mochikit_suppress" : False}})
+    print cherrypy.response.body[0]
+    assert "MochiKit.js" not in cherrypy.response.body[0]
-
-def test_include_widgets():

branches/1.0/turbogears/widgets/base.py

@@ -542 +542 @@
-    retrieve_javascript = set_with_self
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-class JSI18NWidget(Widget):