[Testbot] Plone 5.0 - Python 2.7 - Build # 4182 - Still failing! - 0 failure(s)

jenkins at plone.org jenkins at plone.org
Tue Feb 10 22:51:18 UTC 2015


-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 4182 - Still Failing!
-------------------------------------------------------------------------------

http://jenkins.plone.org/job/plone-5.0-python-2.7/4182/


-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------

Repository: plone.app.discussion
Branch: refs/heads/master
Date: 2015-02-10T16:21:17-06:00
Author: vangheem (vangheem) <vangheem at gmail.com>
Commit: https://github.com/plone/plone.app.discussion/commit/ad3953f7942129e79cefbe792cfdc3fc4eca0d08

use requirejs if available

Files changed:
M CHANGES.rst
M plone/app/discussion/browser/javascripts/comments.js

diff --git a/CHANGES.rst b/CHANGES.rst
index 437ae9a..b0bbbb8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ Changelog
 2.4.0 (unreleased)
 ------------------
 
+- use requirejs if available
+  [vangheem]
+
 - Rename @@discussion-settings to @@discussion-controlpanel
   [maartenkling]
 
diff --git a/plone/app/discussion/browser/javascripts/comments.js b/plone/app/discussion/browser/javascripts/comments.js
index 927c00d..4b2ea30 100644
--- a/plone/app/discussion/browser/javascripts/comments.js
+++ b/plone/app/discussion/browser/javascripts/comments.js
@@ -3,7 +3,17 @@
  * jQuery functions for the plone.app.discussion comment viewlet and form.
  *
  ******************************************************************************/
-(function ($) {
+
+if(require === undefined){
+    require = function(reqs, torun){
+        'use strict';
+        return torun(window.jQuery);
+    }
+}
+
+require([
+    'jquery'
+], function ($) {
     // This unnamed function allows us to use $ inside of a block of code
     // without permanently overwriting $.
     // http://docs.jquery.com/Using_jQuery_with_Other_Libraries
@@ -249,4 +259,4 @@
 
     //#JSCOVERAGE_ENDIF
 
-}(jQuery));
+});




-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 1558 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20150210/e3940d1d/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 108750 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20150210/e3940d1d/attachment-0003.obj>


More information about the Testbot mailing list