diff options
author | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-08-19 01:19:29 +0400 |
---|---|---|
committer | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-08-19 01:19:29 +0400 |
commit | 1c274da64dd6ea5d681efd3808883f61942f951a (patch) | |
tree | 1f264ac60bbf1a243fbecb64dd403532797c361c /plugins/CoreHome | |
parent | 5254d5edfd37b1f139ddb34df205592c66282703 (diff) |
Refs #4087, rewrote UI integration tests to use phantomjs or slimerjs and added (disabled) UI tests to travis build config.
Notes:
* Modified main page-loading JavaScript to use ajaxHelper so it's possible to know when all AJAX requests are made.
* Add setUrl method to ajaxHelper so it can be used when a doing AJAX w/ a URL instead of an object containing query parameters.
Diffstat (limited to 'plugins/CoreHome')
-rw-r--r-- | plugins/CoreHome/javascripts/broadcast.js | 17 | ||||
-rw-r--r-- | plugins/CoreHome/stylesheets/coreHome.less | 1 |
2 files changed, 7 insertions, 11 deletions
diff --git a/plugins/CoreHome/javascripts/broadcast.js b/plugins/CoreHome/javascripts/broadcast.js index 7b0a3bfe24..761404efbd 100644 --- a/plugins/CoreHome/javascripts/broadcast.js +++ b/plugins/CoreHome/javascripts/broadcast.js @@ -394,16 +394,13 @@ var broadcast = { } } - var ajaxRequest = { - type: 'POST', - url: urlAjax, - dataType: 'html', - async: true, - error: broadcast.customAjaxHandleError, // Callback when the request fails - success: sectionLoaded, // Callback when the request succeeds - data: {} - }; - globalAjaxQueue.push($.ajax(ajaxRequest)); + var ajax = new ajaxHelper(); + ajax.setUrl(urlAjax); + ajax.setErrorCallback(broadcast.customAjaxHandleError); + ajax.setCallback(sectionLoaded); + ajax.setFormat('html'); + ajax.send(); + return false; }, diff --git a/plugins/CoreHome/stylesheets/coreHome.less b/plugins/CoreHome/stylesheets/coreHome.less index 2c82ad95b4..71a130f999 100644 --- a/plugins/CoreHome/stylesheets/coreHome.less +++ b/plugins/CoreHome/stylesheets/coreHome.less @@ -40,7 +40,6 @@ h3 { .pageWrap { border-left: 1px solid #DDDDDD; border-right: 1px solid #DDDDDD; - max-height: 681px; min-height: 10px; overflow: visible; padding: 15px 15px 0; |