github/shiny
1
1
Fork 0
mirror of https://github.com/rstudio/shiny.git synced 2026-04-07 03:00:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
david.zotloeterer
2015-12-01 13:29:41 +01:00
parent db4c41f420
commit 935a76d16b
5 changed files with 33 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
inst/www/shared/shiny.js
View File

@@ -973,8 +973,16 @@ var ShinyApp = function() {
var msgObj = {};
if(typeof data === "string") {
msgObj = JSON.parse(data);
} else {
msgObj = {buffer: data};
} else { // data is arraybuffer
var len = new DataView(data,0,1).getUint8(0);
var tagdv = new DataView(data,1,len);
var tagbuf = [];
for(var i=0; i<len; i++){
tagbuf.push(String.fromCharCode(tagdv.getUint8(i)));
}
var tag = tagbuf.join("");
data = data.slice(len+1);
msgObj[tag] = data;
}
var evt = jQuery.Event('shiny:message');
@@ -988,42 +996,18 @@ var ShinyApp = function() {
this.$updateConditionals();
};
//this._sendMessagesToBinaryHandlers = function(msgObj, handlers) {
// for (var i = 0; i < handlers.length; i++)
// if(handlers[i].call(this, msgObj.buffer))
// break;
//};
// A function for sending messages to the appropriate handlers.
// - msgObj: the object containing messages, with format {msgObj.foo, msObj.bar
this._sendMessagesToHandlers = function(msgObj, handlers, handlerOrder) {
var tag, buffer, i;
if(typeof data !== "string") {
buffer = msgObj.buffer;
var len = new DataView(buffer,0,1).getUint8(0);
var tagdv = new DataView(buffer,1,len);
var tagbuf = [];
for(i=0; i<len; i++){
tagbuf.push(String.fromCharCode(tagdv.getUint8(i)));
}
tag = tagbuf.join("");
buffer = buffer.slice(len+1);
}
// Dispatch messages to handlers, if handler is present
for (i = 0; i < handlerOrder.length; i++) {
var msgType = handlerOrder[i];
if(tag) {
if(tag == msgType) {
handlers[msgType].call(this, buffer);
}
} else {
if (msgObj.hasOwnProperty(msgType)) {
// Execute each handler with 'this' referring to the present value of
// 'this'
handlers[msgType].call(this, msgObj[msgType]);
}
if (msgObj.hasOwnProperty(msgType)) {
// Execute each handler with 'this' referring to the present value of
// 'this'
handlers[msgType].call(this, msgObj[msgType]);
}
}
};

2
inst/www/shared/shiny.js.map
View File

File diff suppressed because one or more lines are too long

6
inst/www/shared/shiny.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
inst/www/shared/shiny.min.js.map
View File

File diff suppressed because one or more lines are too long

44
srcjs/shinyapp.js
View File

@@ -381,8 +381,16 @@ var ShinyApp = function() {
var msgObj = {};
if(typeof data === "string") {
msgObj = JSON.parse(data);
} else {
msgObj = {buffer: data};
} else { // data is arraybuffer
var len = new DataView(data,0,1).getUint8(0);
var tagdv = new DataView(data,1,len);
var tagbuf = [];
for(var i=0; i<len; i++){
tagbuf.push(String.fromCharCode(tagdv.getUint8(i)));
}
var tag = tagbuf.join("");
data = data.slice(len+1);
msgObj[tag] = data;
}
var evt = jQuery.Event('shiny:message');
@@ -396,42 +404,18 @@ var ShinyApp = function() {
this.$updateConditionals();
};
//this._sendMessagesToBinaryHandlers = function(msgObj, handlers) {
// for (var i = 0; i < handlers.length; i++)
// if(handlers[i].call(this, msgObj.buffer))
// break;
//};
// A function for sending messages to the appropriate handlers.
// - msgObj: the object containing messages, with format {msgObj.foo, msObj.bar
this._sendMessagesToHandlers = function(msgObj, handlers, handlerOrder) {
var tag, buffer, i;
if(typeof data !== "string") {
buffer = msgObj.buffer;
var len = new DataView(buffer,0,1).getUint8(0);
var tagdv = new DataView(buffer,1,len);
var tagbuf = [];
for(i=0; i<len; i++){
tagbuf.push(String.fromCharCode(tagdv.getUint8(i)));
}
tag = tagbuf.join("");
buffer = buffer.slice(len+1);
}
// Dispatch messages to handlers, if handler is present
for (i = 0; i < handlerOrder.length; i++) {
var msgType = handlerOrder[i];
if(tag) {
if(tag == msgType) {
handlers[msgType].call(this, buffer);
}
} else {
if (msgObj.hasOwnProperty(msgType)) {
// Execute each handler with 'this' referring to the present value of
// 'this'
handlers[msgType].call(this, msgObj[msgType]);
}
if (msgObj.hasOwnProperty(msgType)) {
// Execute each handler with 'this' referring to the present value of
// 'this'
handlers[msgType].call(this, msgObj[msgType]);
}
}
};