Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'MDL-29333_rating_ajax_21' of git://github.com/andyjdavi…

…s/moodle into MOODLE_21_STABLE
  • Loading branch information...
commit b967bf600556be6d1f1fb98a553e30b7186be6ba 2 parents ded9134 + cfb909d
@nebgor nebgor authored
Showing with 21 additions and 24 deletions.
  1. +4 −9 rating/lib.php
  2. +17 −15 rating/module.js
View
13 rating/lib.php
@@ -397,13 +397,6 @@ class rating_manager {
protected $scales = array();
/**
- * Gets set to true when the JavaScript that controls AJAX rating has been
- * initialised (so that it only gets initialised once.
- * @var int
- */
- protected $javascriptinitialised = false;
-
- /**
* Delete one or more ratings. Specify either a rating id, an item id or just the context id.
*
* @global moodle_database $DB
@@ -1019,15 +1012,17 @@ public function check_rating_is_valid($params) {
public function initialise_rating_javascript(moodle_page $page) {
global $CFG;
- if ($this->javascriptinitialised) {
+ //only needs to be initialized once
+ static $done = false;
+ if ($done) {
return true;
}
if (!empty($CFG->enableajax)) {
$page->requires->js_init_call('M.core_rating.init');
}
+ $done = true;
- $this->javascriptinitialised = true;
return true;
}
View
32 rating/module.js
@@ -1,7 +1,7 @@
M.core_rating={
Y : null,
- transaction : [],
+ api: M.cfg.wwwroot+'/rating/rate_ajax.php',
init : function(Y){
this.Y = Y;
@@ -27,11 +27,10 @@ M.core_rating={
}
}
- this.Y.io.queue.stop();
- this.transaction.push({transaction:this.Y.io.queue(M.cfg.wwwroot+'/rating/rate_ajax.php', {
- method : 'POST',
- data : build_querystring(thedata),
- on : {
+ var scope = this;
+ var cfg = {
+ method: 'POST',
+ on: {
complete : function(tid, outcome, args) {
try {
if (!outcome) {
@@ -39,17 +38,17 @@ M.core_rating={
return false;
}
- var data = this.Y.JSON.parse(outcome.responseText);
+ var data = scope.Y.JSON.parse(outcome.responseText);
if (data.success){
//if the user has access to the aggregate then update it
if (data.itemid) { //do not test data.aggregate or data.count otherwise it doesn't refresh value=0 or no value
var itemid = data.itemid;
- var node = this.Y.one('#ratingaggregate'+itemid);
+ var node = scope.Y.one('#ratingaggregate'+itemid);
node.set('innerHTML',data.aggregate);
//empty the count value if no ratings
- var node = this.Y.one('#ratingcount'+itemid);
+ var node = scope.Y.one('#ratingcount'+itemid);
if (data.count > 0) {
node.set('innerHTML',"("+data.count+")");
} else {
@@ -67,11 +66,14 @@ M.core_rating={
return false;
}
},
- context : this,
- arguments : {
- //query : this.query.get('value')
- }
- }),complete:false,outcome:null});
- this.Y.io.queue.start();
+ arguments: {
+ scope: scope
+ },
+ headers: {
+ },
+ data: build_querystring(thedata)
+ };
+ this.Y.io(this.api, cfg);
+
}
};
Please sign in to comment.
Something went wrong with that request. Please try again.