conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
'draft-js-toolbar-plugin': path.join(__dirname, '..', 'draft-js-toolbar-plugin', 'src'),
=======
'draft-js-counter-plugin': path.join(__dirname, '..', 'draft-js-counter-plugin', 'src'),
>>>>>>>
'draft-js-toolbar-plugin': path.join(__dirname, '..', 'draft-js-toolbar-plugin', 'src'),
'draft-js-counter-plugin': path.join(__dirname, '..', 'draft-js-counter-plugin', 'src'),
<<<<<<<
path.join(__dirname, '..', 'draft-js-toolbar-plugin', 'src'),
=======
path.join(__dirname, '..', 'draft-js-counter-plugin', 'src'),
>>>>>>>
path.join(__dirname, '..', 'draft-js-toolbar-plugin', 'src'),
path.join(__dirname, '..', 'draft-js-counter-plugin', 'src'),
<<<<<<<
path.join(__dirname, '..', 'draft-js-toolbar-plugin', 'src'),
=======
path.join(__dirname, '..', 'draft-js-counter-plugin', 'src'),
>>>>>>>
path.join(__dirname, '..', 'draft-js-toolbar-plugin', 'src'),
path.join(__dirname, '..', 'draft-js-counter-plugin', 'src'), |
<<<<<<<
import mentionPlugin from 'draft-js-mention-plugin';
=======
import historyPlugin from 'draft-js-history-plugin';
>>>>>>>
import mentionPlugin from 'draft-js-mention-plugin';
import historyPlugin from 'draft-js-history-plugin';
<<<<<<<
const stickerPluginInstance = stickerPlugin({ stickers });
const mentionPluginInstance = mentionPlugin();
=======
const historyPluginInstance = historyPlugin();
const stickerPluginInstance = stickerPlugin({
stickers,
});
>>>>>>>
const mentionPluginInstance = mentionPlugin();
const historyPluginInstance = historyPlugin();
const stickerPluginInstance = stickerPlugin({
stickers,
});
<<<<<<<
mentionPluginInstance,
=======
historyPluginInstance,
>>>>>>>
mentionPluginInstance,
historyPluginInstance, |
<<<<<<<
const listeners = this.createEventListeners();
return (<Editor
{...pluginProps}
{...this.props}
{...listeners}
editorState={this.editorState}
blockRendererFn={this.blockRendererFn}
ref="editor"
/>);
=======
return (
<Editor
{...pluginProps}
{...this.props}
onChange={ this.onChange }
handleDroppedFiles={ this.handleDroppedFiles }
handleDrop={ this.handleDrop }
editorState={ this.editorState }
blockRendererFn={ this.blockRendererFn }
handleKeyCommand={ this.handleKeyCommand }
keyBindingFn={ this.keyBindingFn }
onDownArrow={ this.onDownArrow }
onTab={ this.onTab }
onUpArrow={ this.onUpArrow }
onEscape={ this.onEscape }
handleReturn={ this.handleReturn }
ref="editor"
/>
);
>>>>>>>
const listeners = this.createEventListeners();
return (
<Editor
{...pluginProps}
{...this.props}
{...listeners}
handleDroppedFiles={ this.handleDroppedFiles }
handleDrop={ this.handleDrop }
editorState={this.editorState}
blockRendererFn={this.blockRendererFn}
ref="editor"
/>
); |
<<<<<<<
<<<<<<< HEAD
var oldLabel = this.model.getLabel();
=======
>>>>>>>
<<<<<<<
=======
this.model.setText(text);
var changeEvent = {
newModel: this.model
};
dojo.publish("/davinci/ui/modelChanged", [changeEvent]);
>>>>>>> master
=======
var changeEvent = {
newModel: this.model
};
dojo.publish("/davinci/ui/modelChanged", [changeEvent]);
>>>>>>>
var changeEvent = {
newModel: this.model
};
dojo.publish("/davinci/ui/modelChanged", [changeEvent]); |
<<<<<<<
var location = Runtime.location().match(/http:\/\/.*:\d+\//);
=======
var location = location().match(/http:\/\/.*:\d+\//);
>>>>>>>
var location = Runtime.location().match(/http:\/\/.*:\d+\//);
<<<<<<<
var location = Runtime.location().match(/http:\/\/.*:\d+\//);
=======
var location = location().match(/http:\/\/.*:\d+\//);
>>>>>>>
var location = Runtime.location().match(/http:\/\/.*:\d+\//);
<<<<<<<
var location = Runtime.location().match(/http:\/\/.*:\d+\//);
=======
var location = location().match(/http:\/\/.*:\d+\//);
>>>>>>>
var location = Runtime.location().match(/http:\/\/.*:\d+\//);
<<<<<<<
Runtime.subscribe("/davinci/ui/selectionChanged",Runtime._selectionChanged);
=======
metadata.init();
Runtime.subscribe("/davinci/ui/selectionChanged", Runtime._selectionChanged);
>>>>>>>
Runtime.subscribe("/davinci/ui/selectionChanged",Runtime._selectionChanged);
<<<<<<<
=======
>>>>>>>
<<<<<<<
var newLocation = Runtime.location(); //
=======
var newLocation = location();
>>>>>>>
var newLocation = Runtime.location(); // |
<<<<<<<
'bower_components/showdown/src/showdown.js',
'bower_components/moment/min/moment-with-langs.js',
=======
'bower_components/showdown-ghost/src/showdown.js',
'bower_components/moment/moment.js',
>>>>>>>
'bower_components/showdown-ghost/src/showdown.js',
'bower_components/moment/min/moment-with-langs.js',
<<<<<<<
'bower_components/showdown/src/showdown.js',
'bower_components/moment/min/moment-with-langs.js',
=======
'bower_components/showdown-ghost/src/showdown.js',
'bower_components/moment/moment.js',
>>>>>>>
'bower_components/showdown-ghost/src/showdown.js',
'bower_components/moment/min/moment-with-langs.js', |
<<<<<<<
var revindex = ri.indexOf('Revision:'); //TODO: a regexp might be nice here
if(revindex>=0){
var s = ri.substr(revindex+9);
var barindex = s.indexOf('|');
var revnum = barindex>=0 ? s.substr(0, barindex) : s;
formHTML += "<div class='about_build'>"+dojo.string.substitute(langObj.build,[revnum])+"</div>";
}
=======
var barindex = ri.indexOf('|');
var revnum = barindex>=0 ? ri.substr(0, barindex) : ri;
formHTML += "<div class='about_build'>Build: "+revnum+"</div>";
>>>>>>>
var barindex = ri.indexOf('|');
var revnum = barindex>=0 ? ri.substr(0, barindex) : ri;
formHTML += "<div class='about_build'>"+dojo.string.substitute(langObj.build,[revnum])+"</div>"; |
<<<<<<<
title:langObj.aboutMaqetta,
style: "width: 365px", //TODO: move to stylesheet
=======
title:"About Maqetta",
>>>>>>>
title:langObj.aboutMaqetta,
<<<<<<<
+ "<div class='about_version'>"+dojo.string.substitute(langObj.productVersion,[davinci.version])+"</div>";
var ri = davinci.repositoryinfo;
if(ri){
formHTML += "<div class='about_build'>Build: <a href='https://github.com/maqetta/maqetta/commit/"+ri+"'>"+ri+"</a></div>";
=======
+ "<div class='about_version'>Version: "+davinci.version+"</div>";
var ri = davinci.repositoryinfo,
revision = ri.revision;
if(revision){
formHTML += "<div class='about_build'>Build: <a href='https://github.com/maqetta/maqetta/commit/"+revision+"'>"+revision.substr(0,15)+"...</a></div>";
>>>>>>>
+ "<div class='about_version'>"+dojo.string.substitute(langObj.productVersion,[davinci.version])+"</div>";
var ri = davinci.repositoryinfo,
revision = ri.revision;
if(revision){
formHTML += "<div class='about_build'>Build: <a href='https://github.com/maqetta/maqetta/commit/"+revision+"'>"+revision.substr(0,15)+"...</a></div>"; |
<<<<<<<
define([
"davinci/ve/widget",
"davinci/html/HTMLElement",
"davinci/html/HTMLText"
], function(
Widget,
HTMLElement,
HTMLText
) {
return {
=======
define([
"dojo/_base/declare",
"davinci/ve/widget"
], function(declare, Widget) {
return declare("davinci.libraries.dojo.dojox.grid.DataGridHelper", null, {
>>>>>>>
define([
"davinci/ve/widget",
"davinci/html/HTMLElement",
"davinci/html/HTMLText"
], function(
Widget,
HTMLElement,
HTMLText
) {
return {
<<<<<<<
=======
_serializeStructure: function(/*Object*/ structure){
// summary:
// Serialize the passed DataGrid's structure.
// DataGrid does additional parsing to a structure once the DataGrid loads it, so undo that work and return the JSON.
//
if(!structure){
return undefined;
}
var columns = undefined;
try{
columns = structure.cells;
}catch(e){
}
if(!columns){
return undefined;
}
// returned string
var s = "";
// serialize each column of the structure
// assumption: there is only one row declaration
dojo.forEach(columns, function(c){
var cs = "";
// parameters to serialize: field, name, width, editor
var field = c.field;
if(field || field === 0){
cs += "field: " + (dojo.isString(field) ? "\"" + field + "\"" : field);
}
var name = c.name;
if(name){
if(cs){
cs += ", ";
}
cs += "name: \"" + name + "\"";
}
var width = c.width;
if(width){
if(cs){
cs += ", ";
}
cs += "width: " + (dojo.isString(width) ? "\"" + width + "\"" : width);
}
var editor = c.editor;
if(editor){
// supported editors: Input, Bool, Select
if(cs){
cs += ", ";
}
if(editor == dojox.grid.editors.Input){
cs += "editor: dojox.grid.editors.Input";
}else if(editor == dojox.grid.editors.Bool){
cs += "editor: dojox.grid.editors.Bool";
}else if(editor == dojox.grid.editors.Select){
cs += "editor: dojox.grid.editors.Select";
var options = c.options;
if(options){
cs += ", options: " + dojo.toJson(options);
}
}
}
if(s){
s += ", ";
}
s += "{" + cs + "}";
});
return "{cells: [" + s + "]}";
},
create: function(widget, srcElement){
var storeId = srcElement.getAttribute("store");
if(storeId){
var storeWidget = Widget.byId(storeId);
if (storeWidget && widget.dijitWidget && widget.dijitWidget.store){
this._reparentTheStore(widget, storeWidget);
this.addScripts(widget);
this.updateStore(widget, storeWidget);
}
}
},
reparent: function(widget) {
var storeId = widget._srcElement.getAttribute("store");
if(storeId){
var storeWidget = Widget.byId(storeId);
if (storeWidget && widget.dijitWidget && widget.dijitWidget.store){
this._reparentTheStore(widget, storeWidget);
}
}
},
_reparentTheStore: function(widget, storeWidget) {
var dataGridParent = widget.getParent();
var storeParent = storeWidget.getParent();
if ( (dataGridParent != storeParent) || ((dataGridParent === storeParent) && (dataGridParent.indexOf(widget) < storeParent.indexOf(storeWidget))) ) {
var newIndex = (dataGridParent.indexOf(widget) < 1) ? 0 : dataGridParent.indexOf(widget)-1;
var command = new davinci.ve.commands.ReparentCommand(storeWidget, dataGridParent, newIndex);
//this._context.getCommandStack().execute(command);
command.execute();
}
},
updateStore: function(widget, storeWidget, w) {
var store = widget.dijitWidget.store;
var data = storeWidget._srcElement.getAttribute('data');
var url = storeWidget._srcElement.getAttribute('url');
if (data){
var value = data;
var storeData = eval('storeData = '+value);
var data = { identifier: storeData.identifier, items:[] };
var items = data.items;
var storeDataItems = storeData.items;
for (var r = 0; r < storeDataItems.length; r++){
var item = new Object();
var dataStoreItem = storeDataItems[r];
for (var name in dataStoreItem){
item[name] = dataStoreItem[name];
}
items.push(item);
}
store.clearOnClose = true;
store.data = data;
delete store.url; // wdr remove old url if switching
store.close();
store.fetch({
query: this.query,
queryOptions:{deep:true},
onComplete: dojo.hitch(this, function(items){
for (var i = 0; i < items.length; i++) {
var item = items[i];
console.warn("i=", i, "item=", item);
}
widget.dijitWidget.setStore(store);
})
});
}else{ // must be url data store
store.clearOnClose = true;
store.url = url;
delete store.data; // wdr remove old url if switching
store.close();
}
},
addScripts: function(widget){
var dj = widget.getContext().getDojo();
var o = dojo.getObject("io.xhrScriptPlugin", true, dojox);
try{
dj["require"]('dojo.data.ItemFileReadStore');
dj["require"]('dojox.io.xhrScriptPlugin');
}catch(e){
console.warn("FAILED: failure for module=dojo.data.ItemFileReadStore");
}
if (!widget.scripts) return;
for (x in widget.scripts){
this.addScript(widget, widget.scripts[x]);
}
},
addScript: function(widget, script){
var script = widget.scripts[x];
var elements = widget._edit_context._srcDocument.find({'elementType':"HTMLElement", 'tag': 'script'});
for(var i=0;i<elements.length;i++){
var n = elements[i];
if (n.script && n.script.indexOf(script.value) > -1){
return; // found it
}
}
var scriptTag = new davinci.html.HTMLElement('script');
scriptTag.addAttribute('type', 'text/javascript');
var text = new davinci.html.HTMLText(script.value);
scriptTag.addChild(text);
var head = widget._edit_context._srcDocument.find({elementType: 'HTMLElement', tag: 'head'}, true);
head.addChild(scriptTag);
}
});
>>>>>>> |
<<<<<<<
var widget = this._selectedWidget;
<<<<<<< HEAD
var helper = widget.getHelper();
=======
var helper = widget ? widget.getHelper() : undefined;
>>>>>>> master
if(helper && helper.onHideSelection){
// Don't know if any widgets actually use this helper
// Included for completeness
helper.onHideSelection({widget:widget, customDiv:this._custom});
}
=======
var widget = this._selectedWidget;
var helper = widget ? widget.getHelper() : undefined;
if(helper && helper.onHideSelection){
// Don't know if any widgets actually use this helper
// Included for completeness
helper.onHideSelection({widget:widget, customDiv:this._custom});
}
>>>>>>>
var widget = this._selectedWidget;
var helper = widget ? widget.getHelper() : undefined;
if(helper && helper.onHideSelection){
// Don't know if any widgets actually use this helper
// Included for completeness
helper.onHideSelection({widget:widget, customDiv:this._custom});
}
<<<<<<<
<<<<<<< HEAD
var userdoc = this._context.getDocument(); // inner document = user's document
userdoc.defaultView.focus(); // Make sure the userdoc is the focus object for keyboard events
=======
>>>>>>> master
=======
>>>>>>> |
<<<<<<<
dojo.require("dojo.i18n");
dojo.requireLocalization("davinci.ui", "uiLang");
=======
dojo.require("dijit.form.Button");
dojo.require("dijit.Dialog");
dojo.require("dijit.Tree");
dojo.require("dijit.form.TextBox");
dojo.require("dojox.form.FileUploader");
>>>>>>>
dojo.require("dojo.i18n");
dojo.requireLocalization("davinci.ui", "uiLang");
dojo.require("dijit.form.Button");
dojo.require("dijit.Dialog");
dojo.require("dijit.Tree");
dojo.require("dijit.form.TextBox");
dojo.require("dojox.form.FileUploader");
<<<<<<<
if(confirm(dojo.string.substitute(langObj.areYouSureDelete,[resource.getPath()]))){
=======
if(!confirm("Are you sure you want to delete "+resource.getPath()+"?")){
>>>>>>>
if(confirm(dojo.string.substitute(langObj.areYouSureDelete,[resource.getPath()]))){ |
<<<<<<<
{display:"<b>(padding)</b>", type:"multi", target:"padding", values:this._paddingMenu},
{display:" "+langObj.showtrbl, type:"toggleSection",
=======
{display:"<b>(padding)</b>", type:"multi", target:"padding", values:['', '0px', '1em']},
{display:" show t/r/b/l", type:"toggleSection",
>>>>>>>
{display:"<b>(padding)</b>", type:"multi", target:"padding", values:['', '0px', '1em']},
{display:" "+langObj.showtrbl, type:"toggleSection",
<<<<<<<
{display:"<b>(margin)</b>", type:"multi", target:"margin", values:this._paddingMenu},
{display:" "+langObj.showtrbl, type:"toggleSection",
=======
{display:"<b>(margin)</b>", type:"multi", target:"margin", values:['', '0px', '1em']},
{display:" show t/r/b/l", type:"toggleSection",
>>>>>>>
{display:"<b>(margin)</b>", type:"multi", target:"margin", values:['', '0px', '1em']},
{display:" "+langObj.showtrbl, type:"toggleSection",
<<<<<<<
{display:"<b>(border-radius)</b>", type:"multi", target:['border-radius','-moz-border-radius'], values:this._radiusMenu},
{display:langObj.showDetails, type:"toggleSection",
=======
{display:"<b>(border-radius)</b>", type:"multi", target:['border-radius','-moz-border-radius'], values:['', '0px', '6px']},
{display:"show details", type:"toggleSection",
>>>>>>>
{display:"<b>(border-radius)</b>", type:"multi", target:['border-radius','-moz-border-radius'], values:['', '0px', '6px']},
{display:langObj.showDetails, type:"toggleSection", |
<<<<<<<
it('returns an error on failed exit', (done) => {
Build({}, (err) => {
expect(err.message).to.equal('Conversion failed.');
=======
it('returns an error on failed exit', function (done) {
Build({}, function (err) {
expect(err.message).to.equal('Conversion failed.')
>>>>>>>
it('returns an error on failed exit', (done) => {
Build({}, (err) => {
expect(err.message).to.equal('Conversion failed.')
<<<<<<<
it('returns an error when the command fails', (done) => {
Build({}, (err) => {
expect(err.message).to.equal('failed');
=======
it('returns an error when the command fails', function (done) {
Build({}, function (err) {
expect(err.message).to.equal('failed')
>>>>>>>
it('returns an error when the command fails', (done) => {
Build({}, (err) => {
expect(err.message).to.equal('failed') |
<<<<<<<
sails.log.error(err);
=======
>>>>>>> |
<<<<<<<
var _ = require('@sailshq/lodash');
var sailsUtil = require('sails-util');
=======
var _ = require('lodash');
var detectVerb = require('../util/detect-verb');
>>>>>>>
var _ = require('@sailshq/lodash');
var detectVerb = require('../util/detect-verb'); |
<<<<<<<
// Waterline
var waterline = require('waterline');
=======
>>>>>>>
// Waterline
var waterline = require('waterline'); |
<<<<<<<
Types.raml = require('./raml.js');
Types.wadl = require('./wadl.js');
=======
Types.wadl = require('./wadl.js');
Types.raml = require('./raml.js');
>>>>>>>
Types.raml = require('./raml.js');
Types.wadl = require('./wadl.js');
Types.raml = require('./raml.js'); |
<<<<<<<
if (tile.canceled) {
Utils.log('debug', `stop tile build because tile after ${tile.debug.features} because it was removed: ${tile.key}`);
return;
}
let context = StyleParser.getFeatureParseContext(feature, tile);
=======
let context = StyleParser.getFeatureParseContext(feature, tile, config);
>>>>>>>
if (tile.canceled) {
Utils.log('debug', `stop tile build because tile after ${tile.debug.features} because it was removed: ${tile.key}`);
return;
}
let context = StyleParser.getFeatureParseContext(feature, tile, config);
<<<<<<<
context.layers = group.layers; // add matching draw layers
context.properties = group.properties; // add rule-specific properties to context
=======
>>>>>>>
context.layers = group.layers; // add matching draw layers |
<<<<<<<
=======
/***********************************
// BASIC SHAPES
************************************/
App.Shapes.registerpalette("basic_shapes", {
collectionName: 'basic shapes',
shapes: {
rectangle:App.Data.Rectangle,
circle:App.Data.Circle,
// end of circle
text: App.Data.Text,
// end of text
path: {
displayName: "path",
displayIcon: "brush.png",
displayIcon2: "brush.png",
toolAction: null
} // end of path
} // end of shapes
} // end of basic shapes
);
/***********************************
// SVG IMAGES
************************************/
App.Shapes.registerpalette("svg", {
collectionName: 'svg',
shapes: {
pathgroup1:App.Data.Anchor,
pathgroup2:App.Data.Thumb,
button:App.Data.Button
} //end of shapes
} // end of svg
);
/***********************************
// WIREFRAME TOOLS
************************************/
App.Shapes.registerpalette("wireframe", {
collectionName: 'wireframe',
shapes: {
label:App.Data.Label,
txt_button:App.Data.TxtButton,
textbox:App.Data.TextBox,
checkbox:App.Data.CheckBox,
radio:App.Data.Radio
} // end of shapes
} // end of wireframe
);
>>>>>>> |
<<<<<<<
this.position = this.middleSegment(segment);
this.bbox = this.computeBBox();
=======
this.position = Vector.add(this.middleSegment(segment), offset);
this.aabb = this.computeAABB();
>>>>>>>
this.position = this.middleSegment(segment);
this.aabb = this.computeAABB();
<<<<<<<
let x = merc_width * c - merc_height * s;
let y = merc_width * s + merc_height * c;
let max = Math.max(Math.abs(x), Math.abs(y)) * 0.5 + this.buffer;
let bbox = [
this.position[0] + this.offset[0] - max,
this.position[1] + this.offset[1] - max,
this.position[0] + this.offset[0] + max,
this.position[1] + this.offset[1] + max
];
return bbox;
=======
return aabb;
>>>>>>>
return aabb; |
<<<<<<<
const id = nanoid();
const { data } = message;
=======
const { data: log } = message;
>>>>>>>
const id = nanoid();
const { data: log } = message; |
<<<<<<<
hideKeyboardTimeout: null,
extraKeysVisible: false,
ctrlOn: false,
altOn: false,
=======
isTouchDevice: false,
>>>>>>>
hideKeyboardTimeout: null,
extraKeysVisible: false,
ctrlOn: false,
altOn: false,
isTouchDevice: false,
<<<<<<<
keepKeyboard: function() {
clearTimeout(UI.hideKeyboardTimeout);
if(UI.keyboardVisible === true) {
$D('keyboardinput').focus();
$D('showKeyboard').className = "noVNC_status_button_selected";
} else if(UI.keyboardVisible === false) {
$D('keyboardinput').blur();
$D('showKeyboard').className = "noVNC_status_button";
}
},
=======
// When keypress events are left uncought, catch the input events from
// the keyboardinput element instead and send the corresponding key events.
keyInput: function(event) {
var elem, input, len;
elem = $D('keyboardinput');
input = event.target.value;
len = (elem.selectionStart > input.length) ? elem.selectionStart : input.length;
if (len < 1) { // something removed?
UI.rfb.sendKey(0xff08); // send BACKSPACE
} else if (len > 1) { // new input?
for (var i = len-1; i > 0; i -= 1) {
// HTML does not consider trailing whitespaces as a part of the string
// and they are therefore undefined.
if (input[len-i] !== undefined) {
UI.rfb.sendKey(input.charCodeAt(len-i)); // send charCode
} else {
UI.rfb.sendKey(0x0020); // send SPACE
}
}
}
// In order to be able to delete text which has been written in
// another session there has to always be text in the
// keyboardinput element with which backspace can interact.
// We also need to reset the input field text to avoid overflow.
elem.value = "x";
},
>>>>>>>
keepKeyboard: function() {
clearTimeout(UI.hideKeyboardTimeout);
if(UI.keyboardVisible === true) {
$D('keyboardinput').focus();
$D('showKeyboard').className = "noVNC_status_button_selected";
} else if(UI.keyboardVisible === false) {
$D('keyboardinput').blur();
$D('showKeyboard').className = "noVNC_status_button";
}
},
// When keypress events are left uncought, catch the input events from
// the keyboardinput element instead and send the corresponding key events.
keyInput: function(event) {
var elem, input, len;
elem = $D('keyboardinput');
input = event.target.value;
len = (elem.selectionStart > input.length) ? elem.selectionStart : input.length;
if (len < 1) { // something removed?
UI.rfb.sendKey(0xff08); // send BACKSPACE
} else if (len > 1) { // new input?
for (var i = len-1; i > 0; i -= 1) {
// HTML does not consider trailing whitespaces as a part of the string
// and they are therefore undefined.
if (input[len-i] !== undefined) {
UI.rfb.sendKey(input.charCodeAt(len-i)); // send charCode
} else {
UI.rfb.sendKey(0x0020); // send SPACE
}
}
}
// In order to be able to delete text which has been written in
// another session there has to always be text in the
// keyboardinput element with which backspace can interact.
// We also need to reset the input field text to avoid overflow.
elem.value = "x";
}, |
<<<<<<<
assert.equal((await hydro.getAmountSupplied(USDAddr, u1)).toString(), '1000616438356164383000');
assert.equal((await hydro.getTotalBorrow(USDAddr)).toString(), '100616438356164383500');
assert.equal((await hydro.getAmountBorrowed(USDAddr, u2, 0)).toString(), '100616438356164383500');
=======
assert.equal((await hydro.getSupplyOf(USDAddr, u1)).toString(), '1000616438356164383000');
assert.equal((await hydro.getTotalBorrow(USDAddr)).toString(), '100616438356164383600');
assert.equal((await hydro.getBorrowOf(USDAddr, u2, 0)).toString(), '100616438356164383600');
>>>>>>>
assert.equal((await hydro.getAmountSupplied(USDAddr, u1)).toString(), '1000616438356164383000');
assert.equal((await hydro.getTotalBorrow(USDAddr)).toString(), '100616438356164383600');
assert.equal((await hydro.getAmountBorrowed(USDAddr, u2, 0)).toString(), '100616438356164383600');
<<<<<<<
assert.equal((await hydro.getAmountBorrowed(USDAddr, u2, 0)).toString(), '201232876712328767100');
=======
assert.equal((await hydro.getBorrowOf(USDAddr, u2, 0)).toString(), '201232876712328767202');
>>>>>>>
assert.equal((await hydro.getAmountBorrowed(USDAddr, u2, 0)).toString(), '201232876712328767202');
<<<<<<<
assert.equal((await hydro.getAmountBorrowed(USDAddr, u2, 0)).toString(), '51232876712328767100');
=======
assert.equal((await hydro.getBorrowOf(USDAddr, u2, 0)).toString(), '51232876712328767201');
>>>>>>>
assert.equal((await hydro.getAmountBorrowed(USDAddr, u2, 0)).toString(), '51232876712328767201'); |
<<<<<<<
//* Allowed Service URLS
var allowedURL = ["www.youtube.com", "music.youtube.com", "twitch.tv", "soundcloud.com", "www.netflix.com", "kissanime.ac", "kissanime.ru", "jkanime.net", "fimfiction.net", "www.crunchyroll.com", "www.masterani.me", "www.superanimes.site"]
=======
var allowedURL = ["www.youtube.com", "music.youtube.com", "twitch.tv", "soundcloud.com", "netflix.com", "kissanime.ac", "kissanime.ru", "jkanime.net", "fimfiction.net", "www.crunchyroll.com", "www.rabb.it", "www.masterani.me", "www.youtube.com/tv", "www.superanimes.site", "www1.9anime.to", "www.google.de"]
>>>>>>>
//* Allowed Service URLS
var allowedURL = ["www.youtube.com", "music.youtube.com", "twitch.tv", "soundcloud.com", "netflix.com", "kissanime.ac", "kissanime.ru", "jkanime.net", "fimfiction.net", "www.crunchyroll.com", "www.rabb.it", "www.masterani.me", "www.superanimes.site", "www1.9anime.to", "www.google.de"]
<<<<<<<
=======
break
case "www1.9anime.to":
return "9Anime"
break
case "www.google.de":
return "Google"
break
>>>>>>>
case "www1.9anime.to":
return "9Anime"
case "www.google.de":
return "Google" |
<<<<<<<
var allowedURL = ["www.youtube.com", "music.youtube.com", "twitch.tv", "soundcloud.com", "netflix.com", "kissanime.ac", "kissanime.ru", "jkanime.net", "fimfiction.net", "www.crunchyroll.com", "www.rabb.it", "www.masterani.me", "www.superanimes.site", "www1.9anime.to", "www.google.de", "www.anime4you.one"]
=======
var allowedURL = ["www.youtube.com", "music.youtube.com", "twitch.tv", "soundcloud.com", "netflix.com", "kissanime.ac", "kissanime.ru", "jkanime.net", "fimfiction.net", "www.crunchyroll.com", "www.rabb.it", "www.masterani.me", "www.superanimes.site", "www1.9anime.to", "www.google.de", "www.pandora.com", "hentaihaven.org", "hentaigasm.com"]
>>>>>>>
var allowedURL = ["www.youtube.com", "music.youtube.com", "twitch.tv", "soundcloud.com", "netflix.com", "kissanime.ac", "kissanime.ru", "jkanime.net", "fimfiction.net", "www.crunchyroll.com", "www.rabb.it", "www.masterani.me", "www.superanimes.site", "www1.9anime.to", "www.google.de", "www.pandora.com", "hentaihaven.org", "hentaigasm.com", "www.anime4you.one"]
<<<<<<<
return "Google"
case "www.anime4you.one":
return "Anime4You"
=======
return "Google"
case "www.pandora.com":
return "Pandora"
case "hentaihaven.org":
return "HentaiHaven"
case "hentaigasm.com":
return "HentaiGasm"
case "www.pokyun.tv":
return "Pokyun"
>>>>>>>
return "Google"
case "www.anime4you.one":
return "Anime4You"
case "www.pandora.com":
return "Pandora"
case "hentaihaven.org":
return "HentaiHaven"
case "hentaigasm.com":
return "HentaiGasm"
case "www.pokyun.tv":
return "Pokyun" |
<<<<<<<
it('should respect supported types', function(done) {
var method = givenSharedStaticMethod(
function(cb) {
cb(null, {key: 'value'});
},
{
returns: { arg: 'result', type: 'object' }
}
);
request(appSupportingJsonOnly).get(method.url)
.set('Accept', 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8')
.expect('Content-Type', 'application/json; charset=utf-8')
.expect(200, done);
});
=======
describe('xml support', function() {
it('should produce xml from json objects', function(done) {
var method = givenSharedStaticMethod(
function bar(a, cb) {
cb(null, a);
},
{
accepts: [
{ arg: 'a', type: 'object', http: {source: 'body' } }
],
returns: { arg: 'data', type: 'object', root: true },
http: { path: '/' }
}
);
request(app)['post'](method.classUrl)
.set('Accept', 'application/xml')
.set('Content-Type', 'application/json')
.send('{"x": 1, "y": "Y"}')
.expect('Content-Type', /xml/)
.expect(200, function(err, res) {
expect(res.text).to.equal('<?xml version="1.0" encoding="UTF-8"?>\n' +
'<response>\n <x>1</x>\n <y>Y</y>\n</response>');
done(err, res);
});
});
it('should produce xml from json array', function(done) {
var method = givenSharedStaticMethod(
function bar(cb) {
cb(null, [1, 2, 3]);
},
{
returns: { arg: 'data', type: ['number'], root: true },
http: { path: '/', verb: 'get'}
}
);
request(app)['get'](method.classUrl)
.set('Accept', 'application/xml')
.set('Content-Type', 'application/json')
.send('{"x": 1, "y": "Y"}')
.expect('Content-Type', /xml/)
.expect(200, function(err, res) {
expect(res.text).to.equal('<?xml version=\"1.0\" ' +
'encoding=\"UTF-8\"?>\n<response>\n <result>1</result>\n ' +
'<result>2</result>\n <result>3</result>\n</response>');
done(err, res);
});
});
it('should produce xml from json objects with toJSON()', function(done) {
var method = givenSharedStaticMethod(
function bar(a, cb) {
var result = a;
a.toJSON = function() {
return {
foo: a.y,
bar: a.x
};
};
cb(null, a);
},
{
accepts: [
{ arg: 'a', type: 'object', http: {source: 'body' } }
],
returns: { arg: 'data', type: 'object', root: true },
http: { path: '/' }
}
);
request(app)['post'](method.classUrl)
.set('Accept', 'application/xml')
.set('Content-Type', 'application/json')
.send('{"x": 1, "y": "Y"}')
.expect('Content-Type', /xml/)
.expect(200, function(err, res) {
expect(res.text).to.equal('<?xml version="1.0" encoding="UTF-8"?>\n' +
'<response>\n <foo>Y</foo>\n <bar>1</bar>\n</response>');
done(err, res);
});
});
it('should produce xml from json objects with toJSON() inside an array',
function(done) {
var method = givenSharedStaticMethod(
function bar(a, cb) {
a.toJSON = function() {
return {
foo: a.y,
bar: a.x
};
};
cb(null, [a, {c: 1}]);
},
{
accepts: [
{ arg: 'a', type: 'object', http: {source: 'body' } }
],
returns: { arg: 'data', type: 'object', root: true },
http: { path: '/' }
}
);
request(app)['post'](method.classUrl)
.set('Accept', 'application/xml')
.set('Content-Type', 'application/json')
.send('{"x": 1, "y": "Y"}')
.expect('Content-Type', /xml/)
.expect(200, function(err, res) {
expect(res.text).to.equal('<?xml version=\"1.0\" ' +
'encoding=\"UTF-8\"?>\n<response>\n <result>\n ' +
'<foo>Y</foo>\n <bar>1</bar>\n </result>\n <result>\n ' +
'<c>1</c>\n </result>\n</response>');
done(err, res);
});
});
it('should produce xml from json objects with toXML()', function(done) {
var method = givenSharedStaticMethod(
function bar(a, cb) {
var result = a;
a.toXML = function() {
return '<?xml version="1.0" encoding="UTF-8"?>' +
'<root><x>10</x></root>';
};
cb(null, a);
},
{
accepts: [
{ arg: 'a', type: 'object', http: {source: 'body' } }
],
returns: { arg: 'data', type: 'object', root: true },
http: { path: '/' }
}
);
request(app)['post'](method.classUrl)
.set('Accept', 'application/xml')
.set('Content-Type', 'application/json')
.send('{"x": 1, "y": "Y"}')
.expect('Content-Type', /xml/)
.expect(200, function(err, res) {
expect(res.text).to.equal('<?xml version="1.0" encoding="UTF-8"?>' +
'<root><x>10</x></root>');
done(err, res);
});
});
});
describe('_format support', function() {
it('should produce xml if _format is xml', function(done) {
var method = givenSharedStaticMethod(
function bar(a, cb) {
cb(null, a);
},
{
accepts: [
{ arg: 'a', type: 'object', http: {source: 'body' } }
],
returns: { arg: 'data', type: 'object', root: true },
http: { path: '/' }
}
);
request(app)['post'](method.classUrl+'?_format=xml')
.set('Accept', '*/*')
.set('Content-Type', 'application/json')
.send('{"x": 1, "y": "Y"}')
.expect('Content-Type', /xml/)
.expect(200, function(err, res) {
expect(res.text).to.equal('<?xml version="1.0" encoding="UTF-8"?>\n' +
'<response>\n <x>1</x>\n <y>Y</y>\n</response>');
done(err, res);
});
});
it('should produce json if _format is json', function(done) {
var method = givenSharedStaticMethod(
function bar(a, cb) {
cb(null, a);
},
{
accepts: [
{ arg: 'a', type: 'object', http: {source: 'body' } }
],
returns: { arg: 'data', type: 'object', root: true },
http: { path: '/' }
}
);
request(app)['post'](method.classUrl+'?_format=json')
.set('Accept', 'application/xml')
.set('Content-Type', 'application/json')
.send('{"x": 1, "y": "Y"}')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
expect(res.body).to.deep.equal({x: 1, y: 'Y'});
done(err, res);
});
});
});
>>>>>>>
it('should respect supported types', function(done) {
var method = givenSharedStaticMethod(
function(cb) {
cb(null, {key: 'value'});
},
{
returns: { arg: 'result', type: 'object' }
}
);
request(appSupportingJsonOnly).get(method.url)
.set('Accept', 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8')
.expect('Content-Type', 'application/json; charset=utf-8')
.expect(200, done);
});
describe('xml support', function() {
it('should produce xml from json objects', function(done) {
var method = givenSharedStaticMethod(
function bar(a, cb) {
cb(null, a);
},
{
accepts: [
{ arg: 'a', type: 'object', http: {source: 'body' } }
],
returns: { arg: 'data', type: 'object', root: true },
http: { path: '/' }
}
);
request(app)['post'](method.classUrl)
.set('Accept', 'application/xml')
.set('Content-Type', 'application/json')
.send('{"x": 1, "y": "Y"}')
.expect('Content-Type', /xml/)
.expect(200, function(err, res) {
expect(res.text).to.equal('<?xml version="1.0" encoding="UTF-8"?>\n' +
'<response>\n <x>1</x>\n <y>Y</y>\n</response>');
done(err, res);
});
});
it('should produce xml from json array', function(done) {
var method = givenSharedStaticMethod(
function bar(cb) {
cb(null, [1, 2, 3]);
},
{
returns: { arg: 'data', type: ['number'], root: true },
http: { path: '/', verb: 'get'}
}
);
request(app)['get'](method.classUrl)
.set('Accept', 'application/xml')
.set('Content-Type', 'application/json')
.send('{"x": 1, "y": "Y"}')
.expect('Content-Type', /xml/)
.expect(200, function(err, res) {
expect(res.text).to.equal('<?xml version=\"1.0\" ' +
'encoding=\"UTF-8\"?>\n<response>\n <result>1</result>\n ' +
'<result>2</result>\n <result>3</result>\n</response>');
done(err, res);
});
});
it('should produce xml from json objects with toJSON()', function(done) {
var method = givenSharedStaticMethod(
function bar(a, cb) {
var result = a;
a.toJSON = function() {
return {
foo: a.y,
bar: a.x
};
};
cb(null, a);
},
{
accepts: [
{ arg: 'a', type: 'object', http: {source: 'body' } }
],
returns: { arg: 'data', type: 'object', root: true },
http: { path: '/' }
}
);
request(app)['post'](method.classUrl)
.set('Accept', 'application/xml')
.set('Content-Type', 'application/json')
.send('{"x": 1, "y": "Y"}')
.expect('Content-Type', /xml/)
.expect(200, function(err, res) {
expect(res.text).to.equal('<?xml version="1.0" encoding="UTF-8"?>\n' +
'<response>\n <foo>Y</foo>\n <bar>1</bar>\n</response>');
done(err, res);
});
});
it('should produce xml from json objects with toJSON() inside an array',
function(done) {
var method = givenSharedStaticMethod(
function bar(a, cb) {
a.toJSON = function() {
return {
foo: a.y,
bar: a.x
};
};
cb(null, [a, {c: 1}]);
},
{
accepts: [
{ arg: 'a', type: 'object', http: {source: 'body' } }
],
returns: { arg: 'data', type: 'object', root: true },
http: { path: '/' }
}
);
request(app)['post'](method.classUrl)
.set('Accept', 'application/xml')
.set('Content-Type', 'application/json')
.send('{"x": 1, "y": "Y"}')
.expect('Content-Type', /xml/)
.expect(200, function(err, res) {
expect(res.text).to.equal('<?xml version=\"1.0\" ' +
'encoding=\"UTF-8\"?>\n<response>\n <result>\n ' +
'<foo>Y</foo>\n <bar>1</bar>\n </result>\n <result>\n ' +
'<c>1</c>\n </result>\n</response>');
done(err, res);
});
});
it('should produce xml from json objects with toXML()', function(done) {
var method = givenSharedStaticMethod(
function bar(a, cb) {
var result = a;
a.toXML = function() {
return '<?xml version="1.0" encoding="UTF-8"?>' +
'<root><x>10</x></root>';
};
cb(null, a);
},
{
accepts: [
{ arg: 'a', type: 'object', http: {source: 'body' } }
],
returns: { arg: 'data', type: 'object', root: true },
http: { path: '/' }
}
);
request(app)['post'](method.classUrl)
.set('Accept', 'application/xml')
.set('Content-Type', 'application/json')
.send('{"x": 1, "y": "Y"}')
.expect('Content-Type', /xml/)
.expect(200, function(err, res) {
expect(res.text).to.equal('<?xml version="1.0" encoding="UTF-8"?>' +
'<root><x>10</x></root>');
done(err, res);
});
});
});
describe('_format support', function() {
it('should produce xml if _format is xml', function(done) {
var method = givenSharedStaticMethod(
function bar(a, cb) {
cb(null, a);
},
{
accepts: [
{ arg: 'a', type: 'object', http: {source: 'body' } }
],
returns: { arg: 'data', type: 'object', root: true },
http: { path: '/' }
}
);
request(app)['post'](method.classUrl+'?_format=xml')
.set('Accept', '*/*')
.set('Content-Type', 'application/json')
.send('{"x": 1, "y": "Y"}')
.expect('Content-Type', /xml/)
.expect(200, function(err, res) {
expect(res.text).to.equal('<?xml version="1.0" encoding="UTF-8"?>\n' +
'<response>\n <x>1</x>\n <y>Y</y>\n</response>');
done(err, res);
});
});
it('should produce json if _format is json', function(done) {
var method = givenSharedStaticMethod(
function bar(a, cb) {
cb(null, a);
},
{
accepts: [
{ arg: 'a', type: 'object', http: {source: 'body' } }
],
returns: { arg: 'data', type: 'object', root: true },
http: { path: '/' }
}
);
request(app)['post'](method.classUrl+'?_format=json')
.set('Accept', 'application/xml')
.set('Content-Type', 'application/json')
.send('{"x": 1, "y": "Y"}')
.expect('Content-Type', /json/)
.expect(200, function(err, res) {
expect(res.body).to.deep.equal({x: 1, y: 'Y'});
done(err, res);
});
});
}); |
<<<<<<<
var DeviceAccessory, ThermostatAccessory, ProtectAccessory;
=======
var DeviceAccessory, ThermostatAccessory, CamAccessory;
>>>>>>>
var DeviceAccessory, ThermostatAccessory, ProtectAccessory, CamAccessory;
<<<<<<<
ProtectAccessory = require('./lib/nest-protect-accessory.js')(exportedTypes);
=======
CamAccessory = require('./lib/nest-cam-accessory.js')(exportedTypes);
>>>>>>>
ProtectAccessory = require('./lib/nest-protect-accessory.js')(exportedTypes);
CamAccessory = require('./lib/nest-cam-accessory.js')(exportedTypes);
<<<<<<<
loadDevices(ProtectAccessory);
=======
loadDevices(CamAccessory);
>>>>>>>
loadDevices(ProtectAccessory);
loadDevices(CamAccessory); |
<<<<<<<
thermostatService.getCharacteristic(Characteristic.CurrentTemperature)
.setProps({
minStep: 0.5
});
thermostatService.getCharacteristic(Characteristic.TargetTemperature)
.setProps({
minStep: 0.5
});
thermostatService.getCharacteristic(Characteristic.CoolingThresholdTemperature)
.setProps({
minStep: 0.5
});
thermostatService.getCharacteristic(Characteristic.HeatingThresholdTemperature)
.setProps({
minStep: 0.5
});
=======
// Only allow 0.5 increments for Celsius temperatures. HomeKit is already limited to 1-degree increments in Fahrenheit, and setting this value for Fahrenheit will causes HomeKit to incorrectly round values when convert From F to C and back.
if ( !this.usesFahrenheit() ) {
thermostatService.getCharacteristic(Characteristic.TargetTemperature)
.setProps({
minStep: 0.5
});
}
>>>>>>>
// Only allow 0.5 increments for Celsius temperatures. HomeKit is already limited to 1-degree increments in Fahrenheit, and setting this value for Fahrenheit will causes HomeKit to incorrectly round values when convert From F to C and back.
if ( !this.usesFahrenheit() ) {
thermostatService.getCharacteristic(Characteristic.CurrentTemperature)
.setProps({
minStep: 0.5
});
thermostatService.getCharacteristic(Characteristic.TargetTemperature)
.setProps({
minStep: 0.5
});
thermostatService.getCharacteristic(Characteristic.CoolingThresholdTemperature)
.setProps({
minStep: 0.5
});
thermostatService.getCharacteristic(Characteristic.HeatingThresholdTemperature)
.setProps({
minStep: 0.5
});
} |
<<<<<<<
makeDir.sync(objPath.dir);
objPath.base = objPath.name + '.min' + objPath.ext;
=======
// Suffix setting
let suffix;
if (settings.get('suffix') === true) {
suffix = '.min' + fullpath.ext;
} else {
suffix = fullpath.ext;
}
fullpath.base = fullpath.name + suffix;
>>>>>>>
makeDir.sync(objPath.dir);
// Suffix setting
let suffix;
if (settings.get('suffix') === true) {
suffix = '.min' + fullpath.ext;
} else {
suffix = fullpath.ext;
}
objPath.base = objPath.name + suffix; |
<<<<<<<
'handlebars-helpers':"resthub/handlebars-helpers"
=======
'handlebars-helpers':"libs/resthub/handlebars-helpers",
'bootstrap':'libs/bootstrap'
>>>>>>>
'handlebars-helpers':"resthub/handlebars-helpers"
'bootstrap':'libs/bootstrap' |
<<<<<<<
},
'bootstrap': {
deps: [
'jquery'
]
}
=======
},
'backbone-relational': {
deps: [
'backbone-orig',
'underscore'
]
}
>>>>>>>
},
'bootstrap': {
deps: [
'jquery'
]
},
'backbone-relational': {
deps: [
'backbone-orig',
'underscore'
]
}
<<<<<<<
=======
'backbone-validation': 'libs/backbone-validation',
'resthub-backbone-validation': 'libs/resthub/backbone-validation.ext',
'backbone-paginator': 'libs/backbone.paginator',
'backbone-relational': 'libs/backbone-relational',
'backbone-queryparams': 'libs/backbone.queryparams',
>>>>>>>
'backbone-relational': 'libs/backbone-relational', |
<<<<<<<
function doThenFireAfterRender(refresh, fn) {
try {
exports.globalRefresh = refresh;
exports.renderFinished = simplePromise();
=======
function doThenFireAfterRender(render, fn) {
try {
exports.currentRender = render;
exports.currentRender.finished = simplePromise();
exports.html.refresh = function (component) {
if (component) {
refreshComponent(component, render.requestRender);
} else {
render.refresh();
}
}
>>>>>>>
function doThenFireAfterRender(render, fn) {
try {
exports.currentRender = render;
exports.currentRender.finished = simplePromise();
exports.html.refresh = function (component) {
if (component) {
refreshComponent(component, render.requestRender);
} else {
render.refresh();
}
}
<<<<<<<
exports.renderFinished.fulfill();
exports.renderFinished = undefined;
exports.globalRefresh = undefined;
=======
exports.currentRender.finished.fulfill();
exports.currentRender.finished = undefined;
exports.currentRender = undefined;
exports.html.refresh = refreshOutOfRender;
>>>>>>>
exports.currentRender.finished.fulfill();
exports.currentRender.finished = undefined;
exports.currentRender = undefined;
exports.html.refresh = refreshOutOfRender;
<<<<<<<
doThenFireAfterRender(refresh, function () {
var vdom = render(model);
=======
doThenFireAfterRender(attachment, function () {
var vdom = render(model);
>>>>>>>
doThenFireAfterRender(attachment, function () {
var vdom = render(model);
<<<<<<<
doThenFireAfterRender(refresh, function () {
var vdom = render(model);
=======
doThenFireAfterRender(attachment, function () {
var vdom = render(model);
>>>>>>>
doThenFireAfterRender(attachment, function () {
var vdom = render(model);
<<<<<<<
function bindRoute(attributes, selector) {
var isAnchor = /^a\b/.test(selector);
if (isAnchor) {
attributes.href = attributes.route;
}
function onclick () {
router.push(attributes.route);
return false;
};
insertEventHandler(attributes, 'onclick', refreshifyEventHandler(onclick), true);
}
=======
exports.html.refresh = refreshOutOfRender;
>>>>>>>
exports.html.refresh = refreshOutOfRender;
function bindRoute(attributes, selector) {
var isAnchor = /^a\b/.test(selector);
if (isAnchor) {
attributes.href = attributes.route;
}
function onclick () {
router.push(attributes.route);
return false;
};
insertEventHandler(attributes, 'onclick', refreshifyEventHandler(onclick), true);
} |
<<<<<<<
renderExportTool() {
const controller = this.controller;
const _ = controller.gettext;
const EXPORT_LIST_HELP = [
_("Examples of frame lists to include/exclude in export"),
"",
_("Select frames 2, 5, and 12: \"2, 5, 12\""),
_("Select frames 5 to 8: \"5:8\""),
_("Select frames 5, 8, 11, 14, and 17: \"5:8:17\""),
_("Select frames 2, 5, and 10 to 15: \"2, 5, 10:15\"")
];
return h("div.properties", [
h("h1", _("Export to PDF")),
h("label", {for: "field-exportToPdfPageSize"}, _("Page size")),
this.renderSelectField("exportToPdfPageSize", controller.getPresentationProperty, controller.setPresentationProperty, {
A3: "A3",
A4: "A4",
A5: "A5",
Legal: "Legal",
Letter: "Letter",
Tabloid: "Tabloid"
}),
h("label", {for: "field-exportToPdfPageOrientation"}, _("Page orientation")),
this.renderSelectField("exportToPdfPageOrientation", controller.getPresentationProperty, controller.setPresentationProperty, {
landscape: _("Landscape"),
portrait: _("Portrait")
}),
h("label", {for: "field-exportToPdfInclude"}, [
_("List of frames to include"),
this.renderHelp(_("Click here to see the syntax for this field"), () => controller.info(EXPORT_LIST_HELP.join("<br>"), true))
]),
this.renderTextField("exportToPdfInclude", false, controller.getPresentationProperty, controller.setPresentationProperty, true),
h("label", {for: "field-exportToPdfExclude"}, [
_("List of frames to exclude"),
this.renderHelp(_("Click here to see the syntax for this field"), () => controller.info(EXPORT_LIST_HELP.join("<br>"), true))
]),
this.renderTextField("exportToPdfExclude", false, controller.getPresentationProperty, controller.setPresentationProperty, true),
h("div.btn-group", [
h("button", {
title: _("Export the presentation to PDF"),
onClick() { controller.exportToPDF(); }
}, _("Export"))
])
]);
}
=======
/** Create a help widget.
*
* @param {string} text - The tooltip text to show.
* @param {Function} onclick - An event handler for click events.
* @returns {VNode} - A virtual DOM tree.
*/
renderHelp(text, onclick) {
return h("span.help", {title: text, onclick}, h("i.fas.fa-question-circle"));
}
/** Create a text input field.
*
* A text field will render as a simple HTML input element.
*
* @param {string} property - The name of a property of the model.
* @param {boolean} disabled - Is this field disabled?
* @param {Function} getter - A function that returns the current value of the property in the model.
* @param {Function} setter - A function that updates the value of the property in the model.
* @param {boolean} acceptsEmpty - Is an empty field a valid entry?
* @returns {VNode} - A virtuel DOM tree.
*/
>>>>>>>
renderExportTool() {
const controller = this.controller;
const _ = controller.gettext;
const EXPORT_LIST_HELP = [
_("Examples of frame lists to include/exclude in export"),
"",
_("Select frames 2, 5, and 12: \"2, 5, 12\""),
_("Select frames 5 to 8: \"5:8\""),
_("Select frames 5, 8, 11, 14, and 17: \"5:8:17\""),
_("Select frames 2, 5, and 10 to 15: \"2, 5, 10:15\"")
];
return h("div.properties", [
h("h1", _("Export to PDF")),
h("label", {for: "field-exportToPdfPageSize"}, _("Page size")),
this.renderSelectField("exportToPdfPageSize", controller.getPresentationProperty, controller.setPresentationProperty, {
A3: "A3",
A4: "A4",
A5: "A5",
Legal: "Legal",
Letter: "Letter",
Tabloid: "Tabloid"
}),
h("label", {for: "field-exportToPdfPageOrientation"}, _("Page orientation")),
this.renderSelectField("exportToPdfPageOrientation", controller.getPresentationProperty, controller.setPresentationProperty, {
landscape: _("Landscape"),
portrait: _("Portrait")
}),
h("label", {for: "field-exportToPdfInclude"}, [
_("List of frames to include"),
this.renderHelp(_("Click here to see the syntax for this field"), () => controller.info(EXPORT_LIST_HELP.join("<br>"), true))
]),
this.renderTextField("exportToPdfInclude", false, controller.getPresentationProperty, controller.setPresentationProperty, true),
h("label", {for: "field-exportToPdfExclude"}, [
_("List of frames to exclude"),
this.renderHelp(_("Click here to see the syntax for this field"), () => controller.info(EXPORT_LIST_HELP.join("<br>"), true))
]),
this.renderTextField("exportToPdfExclude", false, controller.getPresentationProperty, controller.setPresentationProperty, true),
h("div.btn-group", [
h("button", {
title: _("Export the presentation to PDF"),
onClick() { controller.exportToPDF(); }
}, _("Export"))
])
]);
}
/** Create a help widget.
*
* @param {string} text - The tooltip text to show.
* @param {Function} onclick - An event handler for click events.
* @returns {VNode} - A virtual DOM tree.
*/
renderHelp(text, onclick) {
return h("span.help", {title: text, onclick}, h("i.fas.fa-question-circle"));
}
/** Create a text input field.
*
* A text field will render as a simple HTML input element.
*
* @param {string} property - The name of a property of the model.
* @param {boolean} disabled - Is this field disabled?
* @param {Function} getter - A function that returns the current value of the property in the model.
* @param {Function} setter - A function that updates the value of the property in the model.
* @param {boolean} acceptsEmpty - Is an empty field a valid entry?
* @returns {VNode} - A virtuel DOM tree.
*/ |
<<<<<<<
if (container) {
var component = container.add(config);
if (component instanceof Ext.Window) {
component.show();
} else {
container.doLayout();
}
this.output.push(component);
return component;
=======
var component = container.add(config);
component.on("removed", function(cmp) {
this.output.remove(cmp);
}, this, {single: true});
if (component instanceof Ext.Window) {
component.show();
>>>>>>>
if (container) {
var component = container.add(config);
component.on("removed", function(cmp) {
this.output.remove(cmp);
}, this, {single: true});
if (component instanceof Ext.Window) {
component.show();
} else {
container.doLayout();
}
this.output.push(component);
return component; |
<<<<<<<
import Router from 'express/lib/router'
=======
import { Router } from 'express'
import { makeNextHREF } from './helpers'
>>>>>>>
import Router from 'express/lib/router'
import { makeNextHREF } from './helpers' |
<<<<<<<
try {
json = $.parseJSON(result.innerHTML);
messages.refreshBox(form, json);
=======
form = dialog.container.find(selectors.importBlogPostsForm);
importModel = {
createRedirects: ko.observable(true),
reuseExistingCategories: ko.observable(false),
recreateCategoryTree: ko.observable(true),
fileName: ko.observable(''),
fixedFileName: ko.observable(''),
messageBox: messages.box({ container: form }),
form: form,
results: ko.observableArray(),
uploaded: ko.observable(false),
finished: ko.observable(false),
dialog: dialog,
fileId: '',
checkedAll: ko.observable(true)
};
importModel.fileName.subscribe(function (fileName) {
if (fileName) {
fileName = fileName.toUpperCase().replace('C:\\FAKEPATH\\', '');
}
importModel.fixedFileName(fileName);
});
importModel.reuseExistingCategories.subscribe(function (reuseExistingCategories) {
importModel.recreateCategoryTree(!reuseExistingCategories);
});
importModel.recreateCategoryTree.subscribe(function (recreateCategoryTree) {
importModel.reuseExistingCategories(!recreateCategoryTree);
});
importModel.checkedAll.subscribe(function(checked) {
for (i = 0; i < importModel.results().length; i ++) {
item = importModel.results()[i];
>>>>>>>
try {
json = $.parseJSON(result.innerHTML);
messages.refreshBox(form, json);
<<<<<<<
params = {
BlogPosts: [],
CreateRedirects: importModel.createRedirects(),
FileId: importModel.fileId
};
=======
if (!importModel.started) {
form.showLoading();
importModel.started = true;
importModel.form.submit();
}
}
} else {
params = {
BlogPosts: [],
CreateRedirects: importModel.createRedirects(),
ReuseExistingCategories: importModel.reuseExistingCategories(),
RecreateCategoryTree: importModel.recreateCategoryTree(),
FileId: importModel.fileId
};
>>>>>>>
params = {
BlogPosts: [],
CreateRedirects: importModel.createRedirects(),
ReuseExistingCategories: importModel.reuseExistingCategories(),
RecreateCategoryTree: importModel.recreateCategoryTree(),
FileId: importModel.fileId
}; |
<<<<<<<
=======
function ensureAuthenticated(req, res, next) {
if (req.isAuthenticated()) {
next();
return;
}
res.redirect('/auth');
}
function ensureGithubOrg(req, res, next) {
api.db.collection('users').findOne({ username: req.user.username },
function (err, user) {
if (user) {
next();
} else {
github.orgs.getFromUser({ user: req.user.username },
function (getFromUserErr, orgs) {
var inOrg = false;
orgs.forEach(function (org) {
if (org.login === process.env.GITHUB_ORG) {
inOrg = true;
}
});
if (inOrg) {
next();
} else {
res.redirect('/not-authorized.html');
}
});
}
});
}
function addToUsers(req, res, next) {
api.db.collection('users').findOne({ username: req.user.username },
function (err, user) {
var newUser;
if (!user) {
newUser = {
username: req.user.username,
earliestDueDate: new Date().setYear(3000),
fullName: req.user._json.name,
imgUrl: req.user._json.avatar_url
};
api.db.collection('users').insert(newUser);
}
next();
});
}
function includeBranding(req, res, next) {
res.locals.logoPath = process.env.BRAND_LOGO_PATH || '/private/img/18F-Logo-M.png';
res.locals.headerColor = process.env.BRAND_HEADER_COLOR || '#B3EFFF';
next();
}
app.engine('html', ejs.renderFile);
app.set('views', process.cwd() + '/views');
app.use(bodyParser());
app.use(bodyParser.json());
>>>>>>>
app.engine('html', ejs.renderFile);
app.set('views', process.cwd() + '/views'); |
<<<<<<<
console.log(rels);
console.log(xlsx);
=======
>>>>>>> |
<<<<<<<
config.css.forEach((file, i) => file.path = '/wrightinjected' + (i || '') + '.css')
config.debugPort = sessions.get('debugPort') || (config.port + 1)
config.debugProxyPort = sessions.get('debugProxyPort') || (config.debugPort + 1)
config.debugUrl = 'http://localhost:' + config.debugPort
=======
config.css.forEach((file, i) => file.path = 'wright' + (i || '') + '.css')
config.jsDelay = Number(config.jsDelay)
config.cssDelay = Number(config.cssDelay)
>>>>>>>
config.css.forEach((file, i) => file.path = '/wrightinjected' + (i || '') + '.css')
config.debugPort = sessions.get('debugPort') || (config.port + 1)
config.debugProxyPort = sessions.get('debugProxyPort') || (config.debugPort + 1)
config.debugUrl = 'http://localhost:' + config.debugPort
config.jsDelay = Number(config.jsDelay)
config.cssDelay = Number(config.cssDelay) |
<<<<<<<
<div style={[ styles.navlink, styles.leftNavLink ]}>{
previousPage &&
<Link to={previousPage.path} style={styles.link}>
=======
<div style={styles.navlink} key='left'>{
prevPage &&
<Link to={prevPage.path} style={[styles.link, styles.leftNavLink]}>
>>>>>>>
<div style={styles.navlink} key='left'>{
previousPage &&
<Link to={previousPage.path} style={[styles.link, styles.leftNavLink]}>
<<<<<<<
<h4 style={styles.linkSuperTitle}>{ previousPage.superTitle }</h4>
<h3 style={styles.linkTitle} key='left'>{ previousPage.title }</h3>
=======
<h4 style={styles.linkSuperTitle}>{ prevPage.superTitle }</h4>
<h3 style={styles.linkTitle}>{ prevPage.title }</h3>
>>>>>>>
<h4 style={styles.linkSuperTitle}>{ previousPage.superTitle }</h4>
<h3 style={styles.linkTitle}>{ previousPage.title }</h3> |
<<<<<<<
it("should handle editor if cell data is a function", function () {
spyOn(Handsontable.editors.AutocompleteEditor.prototype, 'updateChoicesList').andCallThrough();
var updateChoicesList = Handsontable.editors.AutocompleteEditor.prototype.updateChoicesList;
var afterValidateCallback = jasmine.createSpy('afterValidateCallbak');
var hot = handsontable({
data: [
Model({
id: 1,
name: "Ted Right",
address: ""
}),
Model({
id: 2,
name: "Frank Honest",
address: ""
}),
Model({
id: 3,
name: "Joan Well",
address: ""
})],
dataSchema: Model,
colHeaders: ['ID', 'Name', 'Address'],
columns: [{
data: createAccessorForProperty("id"),
type: 'autocomplete',
source: ['1', '2', '3'],
filter: false,
strict: true
}, {
data: createAccessorForProperty("name")
}, {
data: createAccessorForProperty("address")
}],
minSpareRows: 1,
afterValidate: afterValidateCallback
});
selectCell(0, 0);
expect(hot.getActiveEditor().isOpened()).toBe(false);
keyDownUp('enter');
waitsFor(function () {
return updateChoicesList.calls.length > 0;
}, 'UpdateChoicesList call', 1000);
runs(function () {
expect(hot.getActiveEditor().isOpened()).toBe(true);
afterValidateCallback.reset();
hot.getActiveEditor().$htContainer.find('tr:eq(1) td:eq(0)').mousedown();
});
waitsFor(function () {
return afterValidateCallback.calls.length > 0;
}, 'Autocomplete validation', 1000);
runs(function () {
expect(getDataAtCell(0, 0)).toEqual('2');
})
});
=======
it("should not call the `source` has been selected", function () {
var syncSources = jasmine.createSpy('syncSources');
syncSources.plan = function (query, process) {
process([]); // hardcoded empty result
};
handsontable({
data: [
['one', 'two'],
['three', 'four']
],
columns: [
{
type: 'autocomplete',
source: syncSources,
allowInvalid: false,
strict: true
},
{
}
],
cells: function (row, col) {
var cellProperties = {};
if (row === 0 && col == 0){
cellProperties.readOnly = true;
}
return cellProperties;
}
});
expect(getCellMeta(0, 0).readOnly).toBe(true);
expect(syncSources).not.toHaveBeenCalled();
selectCell(0, 0);
expect(syncSources).not.toHaveBeenCalled();
expect(getCellMeta(1, 0).readOnly).toBeFalsy();
selectCell(1, 0);
expect(syncSources).not.toHaveBeenCalled();
});
it("should not call the `source` method if cell is read only and the arrow has been clicked", function () {
var syncSources = jasmine.createSpy('syncSources');
syncSources.plan = function (query, process) {
process([]); // hardcoded empty result
};
handsontable({
data: [
['one', 'two'],
['three', 'four']
],
columns: [
{
type: 'autocomplete',
source: syncSources,
allowInvalid: false,
strict: true
},
{
}
],
cells: function (row, col) {
var cellProperties = {};
if (row === 0 && col == 0){
cellProperties.readOnly = true;
}
return cellProperties;
}
});
expect(getCellMeta(0, 0).readOnly).toBe(true);
expect(syncSources).not.toHaveBeenCalled();
selectCell(0, 0);
$(getCell(0, 0)).find('.htAutocompleteArrow').mousedown();
waits(100);
runs(function () {
expect(syncSources).not.toHaveBeenCalled();
syncSources.reset();
expect(getCellMeta(1, 0).readOnly).toBeFalsy();
selectCell(1, 0);
$(getCell(1, 0)).find('.htAutocompleteArrow').mousedown();
});
waitsFor(function () {
return syncSources.calls.length > 0;
}, 'SyncSources call', 1000);
runs(function () {
expect(syncSources).toHaveBeenCalled();
expect(syncSources.calls.length).toEqual(1);
});
});
>>>>>>>
it("should handle editor if cell data is a function", function () {
spyOn(Handsontable.editors.AutocompleteEditor.prototype, 'updateChoicesList').andCallThrough();
var updateChoicesList = Handsontable.editors.AutocompleteEditor.prototype.updateChoicesList;
var afterValidateCallback = jasmine.createSpy('afterValidateCallbak');
var hot = handsontable({
data: [
Model({
id: 1,
name: "Ted Right",
address: ""
}),
Model({
id: 2,
name: "Frank Honest",
address: ""
}),
Model({
id: 3,
name: "Joan Well",
address: ""
})],
dataSchema: Model,
colHeaders: ['ID', 'Name', 'Address'],
columns: [{
data: createAccessorForProperty("id"),
type: 'autocomplete',
source: ['1', '2', '3'],
filter: false,
strict: true
}, {
data: createAccessorForProperty("name")
}, {
data: createAccessorForProperty("address")
}],
minSpareRows: 1,
afterValidate: afterValidateCallback
});
selectCell(0, 0);
expect(hot.getActiveEditor().isOpened()).toBe(false);
keyDownUp('enter');
waitsFor(function () {
return updateChoicesList.calls.length > 0;
}, 'UpdateChoicesList call', 1000);
runs(function () {
expect(hot.getActiveEditor().isOpened()).toBe(true);
afterValidateCallback.reset();
hot.getActiveEditor().$htContainer.find('tr:eq(1) td:eq(0)').mousedown();
});
waitsFor(function () {
return afterValidateCallback.calls.length > 0;
}, 'Autocomplete validation', 1000);
runs(function () {
expect(getDataAtCell(0, 0)).toEqual('2');
})
});
it("should not call the `source` has been selected", function () {
var syncSources = jasmine.createSpy('syncSources');
syncSources.plan = function (query, process) {
process([]); // hardcoded empty result
};
handsontable({
data: [
['one', 'two'],
['three', 'four']
],
columns: [
{
type: 'autocomplete',
source: syncSources,
allowInvalid: false,
strict: true
},
{
}
],
cells: function (row, col) {
var cellProperties = {};
if (row === 0 && col == 0){
cellProperties.readOnly = true;
}
return cellProperties;
}
});
expect(getCellMeta(0, 0).readOnly).toBe(true);
expect(syncSources).not.toHaveBeenCalled();
selectCell(0, 0);
expect(syncSources).not.toHaveBeenCalled();
expect(getCellMeta(1, 0).readOnly).toBeFalsy();
selectCell(1, 0);
expect(syncSources).not.toHaveBeenCalled();
});
it("should not call the `source` method if cell is read only and the arrow has been clicked", function () {
var syncSources = jasmine.createSpy('syncSources');
syncSources.plan = function (query, process) {
process([]); // hardcoded empty result
};
handsontable({
data: [
['one', 'two'],
['three', 'four']
],
columns: [
{
type: 'autocomplete',
source: syncSources,
allowInvalid: false,
strict: true
},
{
}
],
cells: function (row, col) {
var cellProperties = {};
if (row === 0 && col == 0){
cellProperties.readOnly = true;
}
return cellProperties;
}
});
expect(getCellMeta(0, 0).readOnly).toBe(true);
expect(syncSources).not.toHaveBeenCalled();
selectCell(0, 0);
$(getCell(0, 0)).find('.htAutocompleteArrow').mousedown();
waits(100);
runs(function () {
expect(syncSources).not.toHaveBeenCalled();
syncSources.reset();
expect(getCellMeta(1, 0).readOnly).toBeFalsy();
selectCell(1, 0);
$(getCell(1, 0)).find('.htAutocompleteArrow').mousedown();
});
waitsFor(function () {
return syncSources.calls.length > 0;
}, 'SyncSources call', 1000);
runs(function () {
expect(syncSources).toHaveBeenCalled();
expect(syncSources.calls.length).toEqual(1);
});
}); |
<<<<<<<
if (instance) {
this.isCellEdited = false;
this.instance = instance;
this.createElements();
this.bindEvents();
}
this.emptyStringLabel = '\u00A0\u00A0\u00A0'; //3 non-breaking spaces
=======
this.isCellEdited = false;
this.instance = instance;
this.createElements();
this.bindEvents();
>>>>>>>
this.isCellEdited = false;
this.instance = instance;
this.createElements();
this.bindEvents();
this.emptyStringLabel = '\u00A0\u00A0\u00A0'; //3 non-breaking spaces |
<<<<<<<
grid.keepEmptyRows();
if (self.view) {
self.forceFullRender = true; //used when data was changed
=======
if (typeof settings.rowHeaders !== "undefined") {
if (settings.rowHeaders === false && priv.extensions["RowHeader"]) {
priv.extensions["RowHeader"].destroy();
}
else if (settings.rowHeaders !== false) {
priv.extensions["RowHeader"] = new Handsontable.RowHeader(self, settings.rowHeaders);
}
}
var blockedRowsCount = self.blockedRows.count();
var blockedColsCount = self.blockedCols.count();
if (blockedRowsCount && blockedColsCount && (typeof settings.rowHeaders !== "undefined" || typeof settings.colHeaders !== "undefined")) {
if (self.blockedCorner) {
self.blockedCorner.remove();
self.blockedCorner = null;
}
var position = self.table.position();
self.positionFix(position);
var div = document.createElement('div');
div.style.position = 'absolute';
div.style.top = position.top + 'px';
div.style.left = position.left + 'px';
var table = document.createElement('table');
table.className = 'htBlockedCorner htTable';
table.cellPadding = 0;
table.cellSpacing = 0;
div.appendChild(table);
var thead = document.createElement('thead');
table.appendChild(thead);
var tr, th;
for (i = 0; i < blockedRowsCount; i++) {
tr = document.createElement('tr');
for (j = blockedColsCount - 1; j >= 0; j--) {
th = document.createElement('th');
th.className = self.blockedCols.headers[j].className;
th.innerHTML = self.blockedCols.headerText(' ');
self.minWidthFix(th);
tr.appendChild(th);
}
thead.appendChild(tr);
}
self.blockedCorner = $(div);
self.blockedCorner.on('click', function () {
selection.selectAll();
});
self.container.append(self.blockedCorner);
}
else {
if (self.blockedCorner) {
self.blockedCorner.remove();
self.blockedCorner = null;
}
}
recreated = grid.keepEmptyRows();
if (!recreated) {
>>>>>>>
grid.keepEmptyRows();
if (self.view) {
self.forceFullRender = true; //used when data was changed
<<<<<<<
var isMouseDown
, dragInterval;
=======
that.instance.curScrollTop = that.instance.curScrollLeft = 0;
that.instance.lastScrollTop = that.instance.lastScrollLeft = null;
this.scrollbarSize = this.measureScrollbar();
var div = $('<div><table class="htCore htTable" cellspacing="0" cellpadding="0"><thead></thead><tbody></tbody></table></div>');
priv.tableContainer = div[0];
that.instance.table = $(priv.tableContainer.firstChild);
this.$tableBody = that.instance.table.find("tbody")[0];
that.instance.table.on('mousedown', 'td', interaction.onMouseDown);
that.instance.table.on('mouseover', 'td', interaction.onMouseOver);
that.instance.table.on('mousewheel', 'td', interaction.onMouseWheel);
that.instance.container.append(div);
>>>>>>>
var isMouseDown
, dragInterval;
<<<<<<<
Handsontable.TableView.prototype.applyCellTypeMethod = function (methodName, td, row, col) {
var prop = this.instance.colToProp(col)
, cellProperties = this.instance.getCellMeta(row, col);
if (cellProperties[methodName]) {
return cellProperties[methodName](this.instance, td, row, col, prop, this.instance.getDataAtCell(row, col), cellProperties);
=======
Handsontable.TableView.prototype.applyCellTypeMethod = function (methodName, td, coords, extraParam) {
var prop = this.instance.colToProp(coords.col)
, method
, cellProperties = this.instance.getCellMeta(coords.row, coords.col);
if (typeof cellProperties.type !== 'undefined' && typeof cellProperties.type[methodName] === "function") {
method = cellProperties.type[methodName];
}
if (typeof method !== "function") {
method = Handsontable.TextCell[methodName];
>>>>>>>
Handsontable.TableView.prototype.applyCellTypeMethod = function (methodName, td, row, col) {
var prop = this.instance.colToProp(col)
, cellProperties = this.instance.getCellMeta(row, col);
if (cellProperties[methodName]) {
return cellProperties[methodName](this.instance, td, row, col, prop, this.instance.getDataAtCell(row, col), cellProperties);
<<<<<<<
Handsontable.SelectionPoint = function () {
this._row = null; //private use intended
this._col = null;
=======
/**
* Handsontable BlockedRows class
* @param {Object} instance
*/
Handsontable.BlockedRows = function (instance) {
var that = this;
this.instance = instance;
this.headers = [];
var position = instance.table.position();
instance.positionFix(position);
this.main = $('<div style="position: absolute; top: ' + position.top + 'px; left: ' + position.left + 'px"><table class="htBlockedRows htTable" cellspacing="0" cellpadding="0"><thead></thead></table></div>');
this.instance.container.append(this.main);
this.hasCSS3 = !($.browser.msie && (parseInt($.browser.version, 10) <= 8)); //Used to get over IE8- not having :last-child selector
this.update();
this.instance.rootElement.on('cellrender.handsontable', function (event, changes, source) {
setTimeout(function () {
that.dimensions();
}, 10);
});
>>>>>>>
Handsontable.SelectionPoint = function () {
this._row = null; //private use intended
this._col = null;
<<<<<<<
Handsontable.PluginHooks.push('afterRender', function () {
=======
this.instance = instance;
this.headers = [];
var position = instance.table.position();
instance.positionFix(position);
this.main = $('<div style="position: absolute; top: ' + position.top + 'px; left: ' + position.left + 'px"><table class="htBlockedCols htTable" cellspacing="0" cellpadding="0"><thead><tr></tr></thead><tbody></tbody></table></div>');
this.instance.container.append(this.main);
this.heightMethod = this.determineCellHeightMethod();
this.instance.rootElement.on('cellrender.handsontable', function (/*event, changes, source*/) {
>>>>>>>
Handsontable.PluginHooks.push('afterRender', function () {
<<<<<<<
/**
* Cell type is just a shortcut for setting bunch of cellProperties (used in getCellMeta)
*/
=======
/**
* Date editor (uses jQuery UI Datepicker)
* @param {Object} instance Handsontable instance
* @param {Element} td Table cell where to render
* @param {Number} row
* @param {Number} col
* @param {String|Number} prop Row object property name
* @param {Object} keyboardProxy jQuery element of keyboard proxy that contains current editing value
* @param {Object} cellProperties Cell properites (shared by cell renderer and editor)
*/
Handsontable.DateEditor = function (instance, td, row, col, prop, keyboardProxy, cellProperties) {
//1. Editor preparation. Called when cell is selected.
var $td = $(td);
var textDestroyer = Handsontable.TextEditor(instance, td, row, col, prop, keyboardProxy, cellProperties);
var datePickerdiv = $("<div>");
datePickerdiv[0].style.position = 'absolute';
datePickerdiv[0].style.top = 0;
datePickerdiv[0].style.left = 0;
datePickerdiv[0].style.zIndex = 99;
instance.container[0].appendChild(datePickerdiv[0]);
//2. Event bindings. Listens when user uses key or mouse on cell.
function showDatepicker() {
var position = $td.position();
datePickerdiv[0].style.top = (position.top + $td.height()) + 'px';
datePickerdiv[0].style.left = position.left + 'px';
if (!datePickerdiv.data('datepicker')) {
var dateoptions = {
dateFormat: "yy-mm-dd",
defaultDate: instance.getDataAtCell(row, col),
dshowButtonPanel: true,
changeMonth: true,
changeYear: true,
altField: keyboardProxy,
onSelect: function () {
instance.selectCell(row, col);
}
};
datePickerdiv.datepicker(dateoptions);
}
else {
datePickerdiv.show();
}
}
keyboardProxy.on("keydown.editor", function (event) {
switch (event.keyCode) {
case 27: /* ESC */
hideCalendar();
break;
case 9: /* tab */
case 13: /* return/enter */
showDatepicker();
event.stopPropagation();
event.preventDefault();
}
});
function onDblClick() {
setTimeout(function () { //otherwise is misaligned in IE9
showDatepicker();
}, 1);
}
$td.on('dblclick.editor', onDblClick);
instance.container.find('.htBorder.current').on('dblclick.editor', onDblClick);
//3. Return destroyer function. Will be executed when cell is deselected.
function hideCalendar() {
datePickerdiv.hide();
}
return function () {
textDestroyer();
datePickerdiv.remove();
$td.off(".editor");
instance.container.find('.htBorder.current').off(".editor");
};
};
>>>>>>>
/**
* Date editor (uses jQuery UI Datepicker)
* @param {Object} instance Handsontable instance
* @param {Element} td Table cell where to render
* @param {Number} row
* @param {Number} col
* @param {String|Number} prop Row object property name
* @param value Original value (remember to escape unsafe HTML before inserting to DOM!)
* @param {Object} cellProperties Cell properites (shared by cell renderer and editor)
*/
Handsontable.DateEditor = function (instance, td, row, col, prop, value, cellProperties) {
if (!instance.dateEditor) {
instance.dateEditor = new HandsontableTextEditorClass(instance);
}
instance.dateEditor.TD = td;
instance.dateEditor.isCellEdited = false;
instance.dateEditor.originalValue = value;
//1. Editor preparation. Called when cell is selected.
var $td = $(td);
var datePickerdiv = $("<div>");
datePickerdiv[0].style.position = 'absolute';
datePickerdiv[0].style.top = 0;
datePickerdiv[0].style.left = 0;
datePickerdiv[0].style.zIndex = 99;
instance.rootElement[0].appendChild(datePickerdiv[0]);
//2. Event bindings. Listens when user uses key or mouse on cell.
function showDatepicker() {
var position = $td.position();
datePickerdiv[0].style.top = (position.top + $td.height()) + 'px';
datePickerdiv[0].style.left = position.left + 'px';
if (!datePickerdiv.data('datepicker')) {
var dateoptions = {
dateFormat: "yy-mm-dd",
defaultDate: instance.getDataAtCell(row, col),
dshowButtonPanel: true,
changeMonth: true,
changeYear: true,
altField: instance.dateEditor.TEXTAREA,
onSelect: function () {
instance.selectCell(row, col);
}
};
datePickerdiv.datepicker(dateoptions);
}
else {
datePickerdiv.show();
}
}
instance.$table.on('keydown.editor', function (event) {
switch (event.keyCode) {
case 27: /* ESC */
hideCalendar();
break;
case 9: /* tab */
case 13: /* return/enter */
showDatepicker();
instance.dateEditor.finishEditing(isCancelled);
event.stopPropagation();
event.preventDefault();
}
});
function onDblClick() {
setTimeout(function () { //otherwise is misaligned in IE9
showDatepicker();
}, 1);
}
instance.view.wt.update('onCellDblClick', onDblClick);
//3. Return destroyer function. Will be executed when cell is deselected.
function hideCalendar() {
datePickerdiv.hide();
}
return function (isCancelled) {
setTimeout(function () {
instance.dateEditor.finishEditing(isCancelled);
datePickerdiv.remove();
$td.off(".editor");
});
}
};
/**
* Cell type is just a shortcut for setting bunch of cellProperties (used in getCellMeta)
*/
<<<<<<<
Handsontable.NumericCell = {
renderer: Handsontable.NumericRenderer,
editor: Handsontable.TextEditor,
dataType: 'number'
};
Handsontable.cellTypes = {
autocomplete: Handsontable.AutocompleteCell,
checkbox: Handsontable.CheckboxCell,
text: Handsontable.TextCell,
numeric: Handsontable.NumericCell
}
=======
Handsontable.DateCell = {
renderer: Handsontable.AutocompleteRenderer, //displays small gray arrow on right side of the cell
editor: Handsontable.DateEditor
};
>>>>>>>
Handsontable.NumericCell = {
renderer: Handsontable.NumericRenderer,
editor: Handsontable.TextEditor,
dataType: 'number'
};
Handsontable.DateCell = {
renderer: Handsontable.AutocompleteRenderer, //displays small gray arrow on right side of the cell
editor: Handsontable.DateEditor
};
Handsontable.cellTypes = {
autocomplete: Handsontable.AutocompleteCell,
checkbox: Handsontable.CheckboxCell,
text: Handsontable.TextCell,
numeric: Handsontable.NumericCell
} |
<<<<<<<
if (top < 0 && (bottom - elem.offsetHeight) > 0) {
elem.style.top = -top + "px";
=======
if (top < 0) {
finalTop = -top + "px";
>>>>>>>
if (top < 0 && (bottom - elem.offsetHeight) > 0) {
finalTop = -top + "px"; |
<<<<<<<
this.render();
/* jshint ignore:end */
=======
>>>>>>>
<<<<<<<
/* jshint ignore:end */
=======
this.render();
>>>>>>>
this.render();
/* jshint ignore:end */ |
<<<<<<<
* @alias Handsontable.Core
=======
* Handsontable constructor
* @param rootElement The DOM element in which Handsontable DOM will be inserted
* @param userSettings
* @core
* @dependencies numeral
>>>>>>>
* Handsontable constructor
*
* @param rootElement The DOM element in which Handsontable DOM will be inserted
* @param userSettings
* @core
* @dependencies numeral
* @alias Handsontable.Core
<<<<<<<
* Return the current data object (the same that was passed by `data` configuration option or `loadData` method).
* Optionally you can provide cell range `row`, `col`, `row2`, `col2` to get only a fragment of grid data.
*
* @param {Number} [r] From row
* @param {Number} [c] From col
* @param {Number} [r2] To row
* @param {Number} [c2] To col
* @returns {Array|Object}
=======
* Return the current data object (the same that was passed by `data` configuration option or `loadData` method).
* Optionally you can provide cell range `r`, `c`, `r2`, `c2` to get only a fragment of grid data
* @public
* @param {Number} r (Optional) From row
* @param {Number} c (Optional) From col
* @param {Number} r2 (Optional) To row
* @param {Number} c2 (Optional) To col
* @return {Array|Object}
>>>>>>>
* Return the current data object (the same that was passed by `data` configuration option or `loadData` method).
* Optionally you can provide cell range `row`, `col`, `row2`, `col2` to get only a fragment of grid data.
*
* @param {Number} [r] From row
* @param {Number} [c] From col
* @param {Number} [r2] To row
* @param {Number} [c2] To col
* @returns {Array|Object}
<<<<<<<
var rendererLookup = Handsontable.helper.cellMethodLookupFactory('renderer');
/**
* Get rederer type by `row` and `col`.
*
* @since 0.11
* @param {Number} row
* @param {Number} col
* @returns {Function} Returns rederer type
*/
=======
var rendererLookup = helper.cellMethodLookupFactory('renderer');
>>>>>>>
var rendererLookup = helper.cellMethodLookupFactory('renderer');
/**
* Get rederer type by `row` and `col`.
*
* @since 0.11
* @param {Number} row
* @param {Number} col
* @returns {Function} Returns rederer type
*/
<<<<<<<
return Handsontable.renderers.getRenderer(renderer);
=======
return getRenderer(renderer);
>>>>>>>
return getRenderer(renderer); |
<<<<<<<
WalkontableTableRenderer.prototype.renderRowHeader = function(row, col, TH){
TH.className = '';
TH.removeAttribute('style');
this.rowHeaders[col](row, TH);
=======
WalkontableTableRenderer.prototype.renderRowHeader = function (row, col, TH) {
this.rowHeaders[col](row, TH, col);
>>>>>>>
WalkontableTableRenderer.prototype.renderRowHeader = function(row, col, TH){
TH.className = '';
TH.removeAttribute('style');
this.rowHeaders[col](row, TH, col);
<<<<<<<
WalkontableTableRenderer.prototype.renderColumnHeader = function (col, TH) {
TH.className = '';
TH.removeAttribute('style');
return this.columnHeaders[0](col, TH);
=======
WalkontableTableRenderer.prototype.renderColumnHeader = function (row, col, TH) {
return this.columnHeaders[row](col, TH, row);
>>>>>>>
WalkontableTableRenderer.prototype.renderColumnHeader = function (row, col, TH) {
TH.className = '';
TH.removeAttribute('style');
return this.columnHeaders[row](col, TH, row); |
<<<<<<<
if(!this.instance.getSettings().allowInsertRow) {
delete this.defaultOptions.items.row_above;
delete this.defaultOptions.items.row_below;
delete this.defaultOptions.items.hsep1;
}
if(!this.instance.getSettings().allowInsertColumn) {
delete this.defaultOptions.items.col_left;
delete this.defaultOptions.items.col_right;
delete this.defaultOptions.items.hsep2
}
var removeRow = false;
var removeCol = false;
if(!this.instance.getSettings().allowRemoveRow) {
delete this.defaultOptions.items.remove_row;
removeRow = true;
}
if(!this.instance.getSettings().allowRemoveColumn) {
delete this.defaultOptions.items.remove_col;
removeCol = true;
}
if (removeRow && removeCol) {
delete this.defaultOptions.items.hsep3;
}
=======
contextMenu.options = {};
Handsontable.helper.extend(contextMenu.options, this.defaultOptions);
this.updateOptions(customOptions, this.options);
this.bindMouseEvents();
this.markSelected = function (label) {
return "<span class='selected'>✓</span>" + label;
};
this.checkSelectionAlignment = function (hot, className){
var hasAlignment = false;
hot.getSelectedRange().forAll(function(r, c) {
var metaClassName = hot.getCellMeta(r, c).className;
if (metaClassName && metaClassName.indexOf(className)!= -1) {
hasAlignment = true;
return false;
}
});
return hasAlignment;
};
>>>>>>>
contextMenu.options = {};
Handsontable.helper.extend(contextMenu.options, this.defaultOptions);
this.updateOptions(customOptions, this.options);
this.bindMouseEvents();
this.markSelected = function (label) {
return "<span class='selected'>✓</span>" + label;
};
this.checkSelectionAlignment = function (hot, className){
var hasAlignment = false;
hot.getSelectedRange().forAll(function(r, c) {
var metaClassName = hot.getCellMeta(r, c).className;
if (metaClassName && metaClassName.indexOf(className)!= -1) {
hasAlignment = true;
return false;
}
});
return hasAlignment;
};
if(!this.instance.getSettings().allowInsertRow) {
delete this.defaultOptions.items.row_above;
delete this.defaultOptions.items.row_below;
delete this.defaultOptions.items.hsep1;
}
if(!this.instance.getSettings().allowInsertColumn) {
delete this.defaultOptions.items.col_left;
delete this.defaultOptions.items.col_right;
delete this.defaultOptions.items.hsep2
}
var removeRow = false;
var removeCol = false;
if(!this.instance.getSettings().allowRemoveRow) {
delete this.defaultOptions.items.remove_row;
removeRow = true;
}
if(!this.instance.getSettings().allowRemoveColumn) {
delete this.defaultOptions.items.remove_col;
removeCol = true;
}
if (removeRow && removeCol) {
delete this.defaultOptions.items.hsep3;
} |
<<<<<<<
=======
var priv, hooks, eventMap, datamap, grid, selection, editproxy, autofill, self = this;
>>>>>>>
<<<<<<<
GridSettings.prototype.data.splice(index, amount);
=======
priv.settings.data.splice(index, amount);
self.runHooks('afterRemoveRow', index, amount);
>>>>>>>
GridSettings.prototype.data.splice(index, amount);
self.runHooks('afterRemoveRow', index, amount);
<<<<<<<
priv.columnSettings.splice(index, amount);
=======
self.runHooks('afterRemoveCol', index, amount);
>>>>>>>
self.runHooks('afterRemoveCol', index, amount);
priv.columnSettings.splice(index, amount);
<<<<<<<
bindEvents();
this.updateSettings(priv.settings, true);
=======
this.updateSettings(settings);
>>>>>>>
this.updateSettings(priv.settings, true);
<<<<<<<
if (!init) {
for (i in settings) {
if (i === 'data') {
continue; //loadData will be triggered later
}
else if (settings.hasOwnProperty(i)) {
// Update settings
GridSettings.prototype[i] = settings[i];
//launch extensions
if (Handsontable.extension[i]) {
priv.extensions[i] = new Handsontable.extension[i](self, settings[i]);
}
=======
for (i in settings) {
if (i === 'data') {
continue; //loadData will be triggered later
}
else if (settings.hasOwnProperty(i)) {
if (i in hooks || i in eventMap) {
self.addHook(i, settings[i]);
}
else {
priv.settings[i] = settings[i];
//launch extensions
if (Handsontable.extension[i]) {
priv.extensions[i] = new Handsontable.extension[i](self, settings[i]);
}
>>>>>>>
if (!init) {
for (i in settings) {
if (i === 'data') {
continue; //loadData will be triggered later
}
else if (settings.hasOwnProperty(i)) {
if (i in hooks || i in eventMap) {
self.addHook(i, settings[i]);
}
else {
// Update settings
GridSettings.prototype[i] = settings[i];
//launch extensions
if (Handsontable.extension[i]) {
priv.extensions[i] = new Handsontable.extension[i](self, settings[i]);
}
<<<<<<<
cellProperties = new cellConstructor();
Handsontable.PluginHooks.run(self, 'beforeGetCellMeta', row, col, cellProperties);
=======
self.runHooks('beforeGetCellMeta', row, col, cellProperties);
>>>>>>>
cellProperties = new cellConstructor();
self.runHooks('beforeGetCellMeta', row, col, cellProperties);
<<<<<<<
Handsontable.PluginHooks.run(self, 'afterGetCellMeta', row, col, cellProperties);
=======
self.runHooks('afterGetCellMeta', row, col, cellProperties);
>>>>>>>
self.runHooks('afterGetCellMeta', row, col, cellProperties); |
<<<<<<<
* @constructor
* @private
=======
*
* @class MergeCells
* @plugin
>>>>>>>
*
* @class MergeCells
* @plugin
* @constructor
* @private |
<<<<<<<
if (!window.Handsontable) {
var Handsontable = {}; //required because Walkontable test suite uses this class directly
}
Handsontable.Dom = {};
=======
>>>>>>>
<<<<<<<
/**
* Goes up the DOM tree (including given element) until it finds an element that matches the nodes or nodes name.
* This method goes up through web components.
*
* @param {HTMLElement} element Element from which traversing is started
* @param {Array} nodes Array of elements or Array of elements name
* @param {HTMLElement} [until]
* @returns {HTMLElement|null}
*/
Handsontable.Dom.closest = function (element, nodes, until) {
while (element != null && element !== until) {
if (element.nodeType === Node.ELEMENT_NODE &&
(nodes.indexOf(element.nodeName) > -1 || nodes.indexOf(element) > -1)) {
return element;
}
if (element.host && element.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
element = element.host;
} else {
element = element.parentNode;
=======
//goes up the DOM tree (including given element) until it finds an element that matches the nodeName
export function closest(elem, nodeNames, until) {
while (elem != null && elem !== until) {
if (elem.nodeType === 1 && nodeNames.indexOf(elem.nodeName) > -1) {
return elem;
>>>>>>>
/**
* Goes up the DOM tree (including given element) until it finds an element that matches the nodes or nodes name.
* This method goes up through web components.
*
* @param {HTMLElement} element Element from which traversing is started
* @param {Array} nodes Array of elements or Array of elements name
* @param {HTMLElement} [until]
* @returns {HTMLElement|null}
*/
export function closest(element, nodes, until) {
while (element != null && element !== until) {
if (element.nodeType === Node.ELEMENT_NODE &&
(nodes.indexOf(element.nodeName) > -1 || nodes.indexOf(element) > -1)) {
return element;
}
if (element.host && element.nodeType === Node.DOCUMENT_FRAGMENT_NODE) {
element = element.host;
} else {
element = element.parentNode;
<<<<<<<
while (Handsontable.Dom.polymerUnwrap(next) !== document.documentElement) { //until <html> reached
=======
while (next !== document.documentElement) { //until <html> reached
>>>>>>>
while (polymerUnwrap(next) !== document.documentElement) { //until <html> reached
<<<<<<<
Handsontable.Dom.getTrimmingContainer = function (base) {
var el = base.parentNode;
while (el && el.style && document.body !== el) {
if (el.style.overflow !== 'visible' && el.style.overflow !== '') {
return el;
} else if (window.getComputedStyle) {
var computedStyle = window.getComputedStyle(el);
if (computedStyle.getPropertyValue('overflow') !== 'visible' && computedStyle.getPropertyValue('overflow') !== '') {
return el;
}
}
el = el.parentNode;
}
return window;
};
Handsontable.Dom.getStyle = function (elem, prop) {
if (!elem) {
return;
} else if (elem === window) {
if (prop === 'width') {
return window.innerWidth + 'px';
} else if (prop === 'height') {
return window.innerHeight + 'px';
}
return;
}
var styleProp = elem.style[prop],
computedStyle;
if (styleProp !== "" && styleProp !== void 0) {
return styleProp;
} else {
computedStyle = Handsontable.Dom.getComputedStyle(elem);
if (computedStyle.prop !== "" && computedStyle.prop !== void 0) {
return computedStyle.prop;
}
return void 0;
}
};
Handsontable.Dom.getComputedStyle = function (elem) {
=======
export function getComputedStyle(elem) {
>>>>>>>
export function getTrimmingContainer(base) {
var el = base.parentNode;
while (el && el.style && document.body !== el) {
if (el.style.overflow !== 'visible' && el.style.overflow !== '') {
return el;
} else if (window.getComputedStyle) {
var computedStyle = window.getComputedStyle(el);
if (computedStyle.getPropertyValue('overflow') !== 'visible' && computedStyle.getPropertyValue('overflow') !== '') {
return el;
}
}
el = el.parentNode;
}
return window;
}
export function getStyle(elem, prop) {
if (!elem) {
return;
} else if (elem === window) {
if (prop === 'width') {
return window.innerWidth + 'px';
} else if (prop === 'height') {
return window.innerHeight + 'px';
}
return;
}
var styleProp = elem.style[prop],
computedStyle;
if (styleProp !== "" && styleProp !== void 0) {
return styleProp;
} else {
computedStyle = getComputedStyle(elem);
if (computedStyle.prop !== "" && computedStyle.prop !== void 0) {
return computedStyle.prop;
}
return void 0;
}
}
export function getComputedStyle(elem) {
<<<<<<<
Handsontable.Dom.addEvent = function (element, event, callback) {
=======
export function addEvent(element, event, callback) {
>>>>>>>
export function addEvent(element, event, callback) {
<<<<<<<
Handsontable.Dom.removeEvent = function (element, event, callback) {
=======
export function removeEvent(element, event, callback) {
>>>>>>>
export function removeEvent(element, event, callback) {
<<<<<<<
/**
* Returns end of the selection in text input
* @return {Number}
*/
Handsontable.Dom.getSelectionEndPosition = function (el) {
if (el.selectionEnd) {
return el.selectionEnd;
} else if (document.selection) { //IE8
var r = document.selection.createRange();
if (r == null) {
return 0;
}
var re = el.createTextRange();
=======
return re.text.indexOf(r.text) + r.text.length;
}
}
>>>>>>>
return re.text.indexOf(r.text) + r.text.length;
}
}
<<<<<<<
/**
* Returns the computed width of the native browser scroll bar
* @return {Number} width
*/
Handsontable.Dom.getScrollbarWidth = function (mockWidth) {
if (cachedScrollbarWidth === void 0) {
cachedScrollbarWidth = walkontableCalculateScrollbarWidth();
}
if(mockWidth && cachedScrollbarWidth === 0) {
return 30;
}
return cachedScrollbarWidth;
};
=======
var _isIE8 = !(document.createTextNode('test').textContent);
>>>>>>>
var _isIE8 = !(document.createTextNode('test').textContent); |
<<<<<<<
WalkontableOverlay.prototype.refresh = function (fastDraw) {
this.clone && this.clone.draw(fastDraw);
=======
WalkontableOverlay.prototype.refresh = function (selectionsOnly) {
if (this.clone) {
this.clone.draw(selectionsOnly);
}
>>>>>>>
WalkontableOverlay.prototype.refresh = function (fastDraw) {
if (this.clone) {
this.clone.draw(fastDraw);
} |
<<<<<<<
onBeforeOnCellMouseUp(event, coords, TD) {
let priv = privatePool.get(this);
let blockMoving = {
rows: false
};
=======
onMouseUp(event, instance) {
let priv = privatePool.get(instance);
>>>>>>>
onMouseUp(event, instance) {
let priv = privatePool.get(instance);
let blockMoving = {
rows: false
}; |
<<<<<<<
Handsontable.TableView.prototype.beforeRender = function (force) {
if (force) {
Handsontable.PluginHooks.run(this.instance, 'beforeRender');
=======
Handsontable.TableView.prototype.render = function () {
var instance = this.instance;
if (instance.forceFullRender) {
instance.runHooks('beforeRender');
>>>>>>>
Handsontable.TableView.prototype.beforeRender = function (force) {
if (force) {
instance.runHooks('beforeRender'); |
<<<<<<<
* Date: Mon Jan 14 2013 07:50:14 GMT+0100 (Central European Standard Time)
=======
* Date: Mon Jan 14 2013 11:03:53 GMT+0100 (Central European Standard Time)
>>>>>>>
* Date: Mon Jan 14 2013 11:03:53 GMT+0100 (Central European Standard Time)
<<<<<<<
'asyncRendering': true,
'stretchH': 'last'
=======
'currentRowClassName': void 0,
'currentColClassName': void 0,
'asyncRendering': true
>>>>>>>
'currentRowClassName': void 0,
'currentColClassName': void 0,
'asyncRendering': true,
'stretchH': 'last' |
<<<<<<<
this.model.list.collection.board.bind('change:show_pending_checklist_item', this.renderChecklistsCollection);
=======
this.model.list.collection.board.acl_links.bind('add', this.refreshdock);
this.model.list.collection.board.acl_links.bind('remove', this.refreshdock);
>>>>>>>
this.model.list.collection.board.bind('change:show_pending_checklist_item', this.renderChecklistsCollection);
this.model.list.collection.board.acl_links.bind('add', this.refreshdock);
this.model.list.collection.board.acl_links.bind('remove', this.refreshdock); |
<<<<<<<
this.needFullRender = this.shouldBeRendered();
=======
this.needFullRender = this.isShouldBeFullyRendered();
this.isElementSizesAdjusted = false;
>>>>>>>
this.needFullRender = this.shouldBeRendered();
this.isElementSizesAdjusted = false; |
<<<<<<<
beforeChangeResult = Handsontable.hooks.run(instance, "beforeChange", changes, source);
=======
beforeChangeResult = Handsontable.hooks.execute(instance, "beforeChange", changes, source);
>>>>>>>
beforeChangeResult = Handsontable.hooks.run(instance, "beforeChange", changes, source);
<<<<<<<
value = Handsontable.hooks.run(instance, "beforeValidate", value, cellProperties.row, cellProperties.prop, source);
=======
value = Handsontable.hooks.execute(instance, "beforeValidate", value, cellProperties.row, cellProperties.prop, source);
>>>>>>>
value = Handsontable.hooks.run(instance, "beforeValidate", value, cellProperties.row, cellProperties.prop, source);
<<<<<<<
cellProperties.valid = valid;
valid = Handsontable.hooks.run(instance, "afterValidate", valid, value, cellProperties.row, cellProperties.prop, source);
=======
valid = Handsontable.hooks.execute(instance, "afterValidate", valid, value, cellProperties.row, cellProperties.prop, source);
cellProperties.valid = valid;
>>>>>>>
valid = Handsontable.hooks.run(instance, "afterValidate", valid, value, cellProperties.row, cellProperties.prop, source);
cellProperties.valid = valid; |
<<<<<<<
getScrollableElement,
getScrollbarWidth,
getScrollLeft,
getScrollTop,
} from './../../../helpers/dom/element';
=======
getScrollableElement,
getScrollbarWidth,
getScrollLeft,
getScrollTop,
} from './../../../helpers/dom/element';
>>>>>>>
getScrollableElement,
getScrollbarWidth,
getScrollLeft,
getScrollTop,
} from './../../../helpers/dom/element';
<<<<<<<
import {WalkontableCornerOverlay} from './overlay/corner';
import {WalkontableDebugOverlay} from './overlay/debug';
import {WalkontableLeftOverlay} from './overlay/left';
import {WalkontableTopOverlay} from './overlay/top';
=======
>>>>>>>
<<<<<<<
left: {
=======
'bottom': {
top: null,
left: 0
},
'left': {
>>>>>>>
'bottom': {
top: null,
left: 0
},
left: { |
<<<<<<<
that.instance.getSetting('onCellMouseOver', event, that.instance.wtTable.getCoords(TD), TD, that.instance);
=======
if (TD.nodeName === 'TD' || TD.nodeName === 'TH') {
that.instance.getSetting('onCellMouseOver', event, that.instance.wtTable.getCoords(TD), TD, that.instance);
}
>>>>>>>
if (TD.nodeName === 'TD' || TD.nodeName === 'TH') {
that.instance.getSetting('onCellMouseOver', event, that.instance.wtTable.getCoords(TD), TD, that.instance);
}
that.instance.getSetting('onCellMouseOver', event, that.instance.wtTable.getCoords(TD), TD, that.instance); |
<<<<<<<
if (priv.settings.columns && priv.settings.columns.length) {
return priv.settings.columns.length;
}
else {
return Math.max((priv.settings.columns && priv.settings.columns.length) || 0, (priv.settings.data && priv.settings.data[0] && priv.settings.data[0].length) || 0);
}
=======
if(priv.settings.columns && priv.settings.columns.length) {
return priv.settings.columns.length;
}
else if(priv.settings.data && priv.settings.data[0] && priv.settings.data[0].length) {
return priv.settings.data[0].length;
}
else {
return 0;
}
>>>>>>>
if (priv.settings.columns && priv.settings.columns.length) {
return priv.settings.columns.length;
}
else if (priv.settings.data && priv.settings.data[0] && priv.settings.data[0].length) {
return priv.settings.data[0].length;
}
else {
return 0;
} |
<<<<<<<
var bottom = Math.ceil(box.bottom);
=======
var finalLeft
, finalTop;
>>>>>>>
var finalLeft
, finalTop;
var bottom = Math.ceil(box.bottom);
<<<<<<<
if (top < 0 && (bottom - elem.offsetHeight) > 0) {
elem.style.top = -top + "px";
=======
if (top < 0) {
finalTop = -top + "px";
>>>>>>>
if (top < 0 && (bottom - elem.offsetHeight) > 0) {
finalTop = -top + "px"; |
<<<<<<<
displayRows: null,
displayColumns: null,
width: this.getWidth(),
height: this.getHeight(),
frozenColumns: that.settings.rowHeaders ? [instance.getRowHeader] : null,
columnHeaders: that.settings.colHeaders ? instance.getColHeader : null,
=======
width: this.containerWidth,
height: this.containerHeight,
rowHeaders: settings.rowHeaders ? [instance.getRowHeader] : null,
columnHeaders: settings.colHeaders ? instance.getColHeader : null,
>>>>>>>
width: this.getWidth(),
height: this.getHeight(),
rowHeaders: that.settings.rowHeaders ? [instance.getRowHeader] : null,
columnHeaders: that.settings.colHeaders ? instance.getColHeader : null, |
<<<<<<<
it("should push empty cells to the end of sorted column", function () {
var hot = handsontable({
data: [
[1, "Ted", "Right"],
[2, "", "Honest"],
[3, "", "Well"],
[4, "Sid", "Strong"],
[5, "Jane", "Neat"],
],
colHeaders: true,
rowHeaders: true,
columnSorting: true,
minSpareRows: 1
});
this.sortByColumn(1);
expect(getDataAtCol(0)).toEqual([5, 4, 1, 2, 3, null]);
expect(getDataAtCol(1)).toEqual(["Jane", "Sid", "Ted", "", "", null]);
this.sortByColumn(1);
expect(getDataAtCol(0)).toEqual([1, 4, 5, 2, 3, null]);
expect(getDataAtCol(1)).toEqual(["Ted", "Sid", "Jane", "", "", null]);
});
=======
it("should ignore case when sorting", function () {
var hot = handsontable({
data: [
[1, "albuquerque"],
[2, "Alabama"],
[3, "Missouri"]
],
colHeaders: true,
columnSorting: true
});
this.sortByColumn(1);
expect(getDataAtCol(0)).toEqual([2, 1, 3]);
expect(getDataAtCol(1)).toEqual(["Alabama", "albuquerque", "Missouri"]);
this.sortByColumn(1);
expect(getDataAtCol(0)).toEqual([3, 1, 2]);
expect(getDataAtCol(1)).toEqual(["Missouri", "albuquerque", "Alabama"]);
});
>>>>>>>
it("should ignore case when sorting", function () {
var hot = handsontable({
data: [
[1, "albuquerque"],
[2, "Alabama"],
[3, "Missouri"]
],
colHeaders: true,
columnSorting: true
});
this.sortByColumn(1);
expect(getDataAtCol(0)).toEqual([2, 1, 3]);
expect(getDataAtCol(1)).toEqual(["Alabama", "albuquerque", "Missouri"]);
this.sortByColumn(1);
expect(getDataAtCol(0)).toEqual([3, 1, 2]);
expect(getDataAtCol(1)).toEqual(["Missouri", "albuquerque", "Alabama"]);
});
it("should push empty cells to the end of sorted column", function () {
var hot = handsontable({
data: [
[1, "Ted", "Right"],
[2, "", "Honest"],
[3, "", "Well"],
[4, "Sid", "Strong"],
[5, "Jane", "Neat"],
],
colHeaders: true,
rowHeaders: true,
columnSorting: true,
minSpareRows: 1
});
this.sortByColumn(1);
expect(getDataAtCol(0)).toEqual([5, 4, 1, 2, 3, null]);
expect(getDataAtCol(1)).toEqual(["Jane", "Sid", "Ted", "", "", null]);
this.sortByColumn(1);
expect(getDataAtCol(0)).toEqual([1, 4, 5, 2, 3, null]);
expect(getDataAtCol(1)).toEqual(["Ted", "Sid", "Jane", "", "", null]);
}); |
<<<<<<<
* Return the current data object (the same that was passed by `data` configuration option
* or `loadData` method). Optionally you can provide cell range `r`, `c`, `r2`, `c2` to get only a fragment of grid data
* @public
* @param {Number} r (Optional) From row
* @param {Number} c (Optional) From col
* @param {Number} r2 (Optional) To row
* @param {Number} c2 (Optional) To col
* @return {Array|Object}
=======
* Return the current data object (the same that was passed by `data` configuration option or `loadData` method).
* Optionally you can provide cell range `row`, `col`, `row2`, `col2` to get only a fragment of grid data.
*
* @param {Number} [r] From row
* @param {Number} [c] From col
* @param {Number} [r2] To row
* @param {Number} [c2] To col
* @returns {Array|Object}
>>>>>>>
* Return the current data object (the same that was passed by `data` configuration option or `loadData` method).
* Optionally you can provide cell range `row`, `col`, `row2`, `col2` to get only a fragment of grid data.
*
* @param {Number} [r] From row
* @param {Number} [c] From col
* @param {Number} [r2] To row
* @param {Number} [c2] To col
* @returns {Array|Object}
<<<<<<<
width = Handsontable.hooks.run(instance, 'modifyColWidth', width, col);
=======
width = Handsontable.hooks.execute(instance, 'modifyColWidth', width, col);
>>>>>>>
width = Handsontable.hooks.run(instance, 'modifyColWidth', width, col);
<<<<<<<
* Return number of rendered columns (including columns partially or fully rendered outside viewport). Returns -1 if table is not visible
* @return {Number}
*/
this.countRenderedCols = function () {
return instance.view.wt.drawn ? instance.view.wt.wtTable.getRenderedColumnsCount() : -1;
};
/**
* Return number of visible columns. Returns -1 if table is not visible
* @return {Number}
=======
* Return number of visible columns.
*
* @returns {Number} Returns -1 if table is not visible
>>>>>>>
* Return number of visible columns.
*
* @returns {Number} Returns -1 if table is not visible
*/
this.countRenderedCols = function () {
return instance.view.wt.drawn ? instance.view.wt.wtTable.getRenderedColumnsCount() : -1;
};
/**
* Return number of visible columns. Returns -1 if table is not visible
* @return {Number}
<<<<<<<
return Handsontable.hooks.run(instance, key, p1, p2, p3, p4, p5, p6);
=======
Handsontable.hooks.run(instance, key, p1, p2, p3, p4, p5, p6);
};
/**
* {@link Handsontable.Hooks#execute}
*
* @param {String} key
* @param {*} p1
* @param {*} p2
* @param {*} p3
* @param {*} p4
* @param {*} p5
* @param {*} p6
* @returns {*}
*/
this.runHooksAndReturn = function (key, p1, p2, p3, p4, p5, p6) {
return Handsontable.hooks.execute(instance, key, p1, p2, p3, p4, p5, p6);
>>>>>>>
return Handsontable.hooks.run(instance, key, p1, p2, p3, p4, p5, p6);
<<<<<<<
manualColumnFreeze: void 0,
viewportRowRenderingOffset: 10, //number of rows to be prerendered before and after the viewport
viewportColumnRenderingOffset: 10, // number of columns to be prerendered before and after the viewport
groups: void 0,
trimWhitespace: true,
settings: void 0,
source: void 0,
title: void 0,
checkedTemplate: void 0,
uncheckedTemplate: void 0,
renderer: void 0,
format: void 0
=======
/**
* @description
* Setting to true or array enables the mergeCells plugin, which enables the merging of the cells. (see [demo](http://handsontable.com/demo/merge_cells.html)).
* You can provide the merged cells on the pageload if you feed the mergeCells option with an array.
*
* @type {Boolean|Array}
* @default false
*/
mergeCells: false,
/**
* Number of rows to be prerendered before and after the viewport is changed.
*
* @type {Number}
* @default 10
*/
viewportRowRenderingOffset: 10,
/**
* @description
* If `true`, enables Grouping plugin, which enables applying expandable row and column groups.
* To initialize Handsontable with predefined groups, provide row or column group start and end coordinates in form of an array.
*
* See [Grouping](http://handsontable.com/demo/grouping.html) demo for examples.
*
* @type {Boolean|Array}
* @default undefined
* @since 0.11.4
* @example
* ...
* // as boolean
* groups: true,
* ...
*
* ...
* // as array
* groups: [{cols: [0, 2]}, {cols: [5, 15], rows: [0, 5]}],
* ...
*/
groups: void 0,
/**
* A usually small function or regular expression that validates the input.
* After you determine if the input is valid, execute `callback(true)` or `callback(false)` to proceed with the execution.
* In function, `this` binds to cellProperties.
*
* @type {Function|RegExp}
* @default undefined
* @since 0.9.5
*/
validator: void 0
>>>>>>>
/**
* @description
* Setting to true or array enables the mergeCells plugin, which enables the merging of the cells. (see [demo](http://handsontable.com/demo/merge_cells.html)).
* You can provide the merged cells on the pageload if you feed the mergeCells option with an array.
*
* @type {Boolean|Array}
* @default false
*/
mergeCells: false,
/**
* Number of rows to be prerendered before and after the viewport is changed.
*
* @type {Number}
* @default 10
*/
viewportRowRenderingOffset: 10,
/**
* Number of columns to be prerendered before and after the viewport is changed.
*
* @type {Number}
* @default 10
*/
viewportColumnRenderingOffset: 10,
/**
* @description
* If `true`, enables Grouping plugin, which enables applying expandable row and column groups.
* To initialize Handsontable with predefined groups, provide row or column group start and end coordinates in form of an array.
*
* See [Grouping](http://handsontable.com/demo/grouping.html) demo for examples.
*
* @type {Boolean|Array}
* @default undefined
* @since 0.11.4
* @example
* ...
* // as boolean
* groups: true,
* ...
*
* ...
* // as array
* groups: [{cols: [0, 2]}, {cols: [5, 15], rows: [0, 5]}],
* ...
*/
groups: void 0,
/**
* A usually small function or regular expression that validates the input.
* After you determine if the input is valid, execute `callback(true)` or `callback(false)` to proceed with the execution.
* In function, `this` binds to cellProperties.
*
* @type {Function|RegExp}
* @default undefined
* @since 0.9.5
*/
validator: void 0,
manualColumnFreeze: void 0,
trimWhitespace: true,
settings: void 0,
source: void 0,
title: void 0,
checkedTemplate: void 0,
uncheckedTemplate: void 0,
format: void 0 |
<<<<<<<
=======
} else if (getCaretPosition(that.TEXTAREA) !== that.TEXTAREA.value.length) {
event.stopImmediatePropagation();
>>>>>>>
<<<<<<<
=======
} else if (getCaretPosition(that.TEXTAREA) !== 0) {
event.stopImmediatePropagation();
>>>>>>> |
<<<<<<<
/**
* Open editor with initial value.
*
* @function openEditor
* @memberof! Handsontable.EditorManager#
* @param {String} initialValue
*/
this.openEditor = function (initialValue) {
=======
this.openEditor = function (initialValue, event) {
>>>>>>>
/**
* Open editor with initial value.
*
* @function openEditor
* @memberof! Handsontable.EditorManager#
* @param {String} initialValue
*/
this.openEditor = function (initialValue, event) { |
<<<<<<<
settingsConstructor: settingsConstructor, // save settings class for inheritance
columnsConstructor: [],
columnsSettingConflicts: ['data', 'width'],
settings: new settingsConstructor(), // current settings instance
=======
settings: {},
settingsFromDOM: {},
>>>>>>>
settingsConstructor: settingsConstructor, // save settings class for inheritance
columnsConstructor: [],
columnsSettingConflicts: ['data', 'width'],
settings: new settingsConstructor(), // current settings instance
settingsFromDOM: {},
<<<<<<<
this.updateSettings(priv.settings, true);
=======
this.updateSettings(settings);
this.parseSettingsFromDOM();
>>>>>>>
this.updateSettings(priv.settings, true);
this.parseSettingsFromDOM(); |
<<<<<<<
=======
const registeredOverlays = {};
>>>>>>>
const registeredOverlays = {};
<<<<<<<
WalkontableOverlay.CLONE_CORNER,
WalkontableOverlay.CLONE_DEBUG,
=======
WalkontableOverlay.CLONE_TOP_LEFT_CORNER,
WalkontableOverlay.CLONE_BOTTOM_LEFT_CORNER,
WalkontableOverlay.CLONE_DEBUG
>>>>>>>
WalkontableOverlay.CLONE_TOP_LEFT_CORNER,
WalkontableOverlay.CLONE_BOTTOM_LEFT_CORNER,
WalkontableOverlay.CLONE_DEBUG, |
<<<<<<<
function ValidatorsQueue() {
var resolved = false;
return {
validatorsInQueue: 0,
addValidatorToQueue: function () {
this.validatorsInQueue++;
resolved = false;
},
removeValidatorFormQueue: function () {
this.validatorsInQueue = this.validatorsInQueue - 1 < 0 ? 0 : this.validatorsInQueue - 1;
this.checkIfQueueIsEmpty();
},
onQueueEmpty: function () {
},
checkIfQueueIsEmpty: function () {
if (this.validatorsInQueue == 0 && resolved == false) {
resolved = true;
this.onQueueEmpty();
}
}
};
}
=======
>>>>>>>
<<<<<<<
=======
//priv.cellSettings.length = 0; //clear cellSettings cache - [Marcin] I think it's not needed here
>>>>>>> |
<<<<<<<
=======
fixedRowsBottom: 0,
minSpareRows: 0,
>>>>>>>
fixedRowsBottom: 0,
minSpareRows: 0, |
<<<<<<<
$(document).dblclick(function (e) {
if ($(e.target).is('.manualColumnResizer')) {
setManualSize(currentCol, htAutoColumnSize.determineColumnWidth.call(instance, currentCol));
instance.runHooks('afterColumnResize', currentCol, newSize);
}
});
=======
>>>>>>> |
<<<<<<<
self.container.triggerHandler("datachange.handsontable", [changes, source || 'edit']);
self.container.triggerHandler("datachangebycol.handsontable", [changesByCol, source || 'edit']);
=======
self.rootElement.triggerHandler("datachange.handsontable", [changes, source || 'edit']);
>>>>>>>
self.rootElement.triggerHandler("datachange.handsontable", [changes, source || 'edit']);
self.container.triggerHandler("datachangebycol.handsontable", [changesByCol, source || 'edit']); |
<<<<<<<
, _ = require('lodash')
, http = require('http')
, express = require('express')
, seaport = require('seaport')
, web = require('./lib/web')
, port = (process.env.PORT || 8080)
, ports = seaport.connect('localhost', 9090)
, CommandHandler = require('./lib/command-handler').CommandHandler
, TcpToWs = require('./lib/tcp-ws').TcpToWs
, Affinity = require('./lib/affinity').Affinity
, streamers = { }
, config = require('./config')
, softSessionShareMax = (config.softSessionShareMax || 16)
, hardSessionShareMax = (config.hardSessionShareMax || 0)
, sessionTimeoutMinutes = (config.sessionTimeoutMinutes || 60)
, expirePeriodSeconds = (config.expirePeriodSeconds || 10);
;
=======
, _ = require('lodash')
, http = require('http')
, express = require('express')
, web = require('./lib/web')
, port = (process.env.PORT || 8080)
, disco = require('../common').disco
, CommandHandler = require('./lib/command-handler').CommandHandler
, TcpToWs = require('./lib/tcp-ws').TcpToWs
, Affinity = require('./lib/affinity').Affinity
, streamers = { }
// TODO Configuration options.
, softSessionShareMax = 8
, hardSessionShareMax = 0
, sessionTimeoutMinutes = 60
, expirePeriodSec = 10;
;
>>>>>>>
, _ = require('lodash')
, http = require('http')
, express = require('express')
, web = require('./lib/web')
, port = (process.env.PORT || 8080)
, disco = require('../common').disco
, CommandHandler = require('./lib/command-handler').CommandHandler
, TcpToWs = require('./lib/tcp-ws').TcpToWs
, Affinity = require('./lib/affinity').Affinity
, streamers = { }
, config = require('./config')
, softSessionShareMax = (config.softSessionShareMax || 16)
, hardSessionShareMax = (config.hardSessionShareMax || 0)
, sessionTimeoutMinutes = (config.sessionTimeoutMinutes || 60)
, expirePeriodSeconds = (config.expirePeriodSeconds || 10);
; |
<<<<<<<
, before = []
, removed = []
, after = []
, result = []
, data = GridSettings.prototype.data
, diff = elements.length - amount
, split = index + amount
=======
, before = []
, removed = []
, after = []
, result
, data = priv.settings.data
, diff = elements.length - amount
, split = index + amount
>>>>>>>
, before = []
, removed = []
, after = []
, result
, data = GridSettings.prototype.data
, diff = elements.length - amount
, split = index + amount
<<<<<<<
instance.alter('insert_row', null, diff, 'spliceCol', true);
=======
instance.alter('insert_row', null, diff, 'spliceCol');
>>>>>>>
instance.alter('insert_row', null, diff, 'spliceCol', true); |
<<<<<<<
m.page = 0;
m.facetsRefinements = {};
m.facetsExcludes = {};
m.disjunctiveFacetsRefinements = {};
m.numericRefinements = {};
=======
m._clearNumericRefinements( name );
m._clearFacetRefinements( name );
m._clearExcludeRefinements( name );
m._clearDisjunctiveFacetRefinements( name );
>>>>>>>
m.page = 0;
m._clearNumericRefinements( name );
m._clearFacetRefinements( name );
m._clearExcludeRefinements( name );
m._clearDisjunctiveFacetRefinements( name );
<<<<<<<
m.page = 0;
delete m.facetsRefinements[ facet ];
=======
m._clearFacetRefinements( facet );
>>>>>>>
m.page = 0;
m._clearFacetRefinements( facet ); |
<<<<<<<
state: msg.data['onOff'] === 1 ? 'ON' : 'OFF',
cpu_temperature: precisionRound(msg.data['41361'], 2),
external_temperature: precisionRound(msg.data['41362'], 1),
external_humidity: precisionRound(msg.data['41363'], 1),
s0_counts: msg.data['41364'],
adc_volt: precisionRound(msg.data['41365'], 3),
dig_input: msg.data['41366'],
reason: lookup[msg.data['41367']],
=======
state: msg.data.data['onOff'] === 1 ? 'ON' : 'OFF',
cpu_temperature: precisionRound(msg.data.data['41361'], 2),
external_temperature: precisionRound(msg.data.data['41362'], 1),
external_humidity: precisionRound(msg.data.data['41363'], 1),
s0_counts: msg.data.data['41364'],
adc_volt: precisionRound(msg.data.data['41365'], 3),
dig_input: msg.data.data['41366'],
reason: lookup[msg.data.data['41367']],
[`${ds18b20Id}`]: ds18b20Value,
>>>>>>>
state: msg.data['onOff'] === 1 ? 'ON' : 'OFF',
cpu_temperature: precisionRound(msg.data['41361'], 2),
external_temperature: precisionRound(msg.data['41362'], 1),
external_humidity: precisionRound(msg.data['41363'], 1),
s0_counts: msg.data['41364'],
adc_volt: precisionRound(msg.data['41365'], 3),
dig_input: msg.data['41366'],
reason: lookup[msg.data['41367']],
[`${ds18b20Id}`]: ds18b20Value,
<<<<<<<
cluster: 'genPowerCfg',
type: ['attributeReport', 'readResponse'],
=======
cid: 'genPowerCfg',
type: ['attReport', 'readRsp'],
convert: (model, msg, publish, options) => null,
},
ignore_metering_change: {
cid: 'seMetering',
type: ['devChange', 'attReport'],
convert: (model, msg, publish, options) => null,
},
ignore_electrical_change: {
cid: 'haElectricalMeasurement',
type: 'devChange',
>>>>>>>
cluster: 'genPowerCfg',
type: ['attributeReport', 'readResponse'], |
<<<<<<<
this.rebuildCircuits = rebuildCircuits;
=======
// TODO: Defining the rotations as being identical to the subdata is a placeholder until we have circuits.
this.rawRotations = this.rawSubData = subData;
>>>>>>>
this.rebuildCircuits = rebuildCircuits;
// TODO: Defining the rotations as being identical to the subdata is a placeholder until we have circuits.
this.rawRotations = this.rawSubData = subData;
<<<<<<<
world.rebuildCircuits();
=======
var world = new World([json.wx, json.wy, json.wz], BlockSet.unserialize(json.blockSet));
var str = json.blocks;
unrleBytes(json.blocks, world.raw);
unrleBytes(json.subData, world.rawSubData);
>>>>>>>
var world = new World([json.wx, json.wy, json.wz], BlockSet.unserialize(json.blockSet));
var str = json.blocks;
unrleBytes(json.blocks, world.raw);
unrleBytes(json.subData, world.rawSubData);
world.rebuildCircuits(); |
<<<<<<<
var tilings = blockSet.tilings;
=======
var blockSet = world.blockSet;
>>>>>>>
var blockSet = world.blockSet;
<<<<<<<
if (!thiso || !world.opaque(x+rot.nx[0],y+rot.nx[1],z+rot.nx[2])) squares(c1, rot.pz, rot.py, rot.px, tiling.lx, 0, TILE_SIZE_UV);
if (!thiso || !world.opaque(x+rot.ny[0],y+rot.ny[1],z+rot.ny[2])) squares(c1, rot.px, rot.pz, rot.py, tiling.ly, 0, TILE_SIZE_UV);
if (!thiso || !world.opaque(x+rot.nz[0],y+rot.nz[1],z+rot.nz[2])) squares(c1, rot.py, rot.px, rot.pz, tiling.lz, 0, TILE_SIZE_UV);
if (!thiso || !world.opaque(x+rot.px[0],y+rot.px[1],z+rot.px[2])) squares(c2, rot.ny, rot.nz, rot.nx, tiling.hx, TILE_SIZE_UV, 0);
if (!thiso || !world.opaque(x+rot.py[0],y+rot.py[1],z+rot.py[2])) squares(c2, rot.nz, rot.nx, rot.ny, tiling.hy, TILE_SIZE_UV, 0);
if (!thiso || !world.opaque(x+rot.pz[0],y+rot.pz[1],z+rot.pz[2])) squares(c2, rot.nx, rot.ny, rot.nz, tiling.hz, TILE_SIZE_UV, 0);
var circuit = world.getCircuit(c1); // TODO: replace this with some other spatial indexing scheme so we don't have to check per-every-block
if (circuit) {
var o = circuit.getOrigin();
var r = circuitRenderers[o];
if (!r) {
//if (enough++ < 100) console.log("new circuit " + o);
circuitRenderers[o] = makeCircuitRenderer(circuit);
}
}
=======
squares(c1, rot.pz, rot.py, rot.px, rot.nx, tiling.lx, 0, TILE_SIZE_UV);
squares(c1, rot.px, rot.pz, rot.py, rot.ny, tiling.ly, 0, TILE_SIZE_UV);
squares(c1, rot.py, rot.px, rot.pz, rot.nz, tiling.lz, 0, TILE_SIZE_UV);
squares(c2, rot.ny, rot.nz, rot.nx, rot.px, tiling.hx, TILE_SIZE_UV, 0);
squares(c2, rot.nz, rot.nx, rot.ny, rot.py, tiling.hy, TILE_SIZE_UV, 0);
squares(c2, rot.nx, rot.ny, rot.nz, rot.pz, tiling.hz, TILE_SIZE_UV, 0);
>>>>>>>
squares(c1, rot.pz, rot.py, rot.px, rot.nx, tiling.lx, 0, TILE_SIZE_UV);
squares(c1, rot.px, rot.pz, rot.py, rot.ny, tiling.ly, 0, TILE_SIZE_UV);
squares(c1, rot.py, rot.px, rot.pz, rot.nz, tiling.lz, 0, TILE_SIZE_UV);
squares(c2, rot.ny, rot.nz, rot.nx, rot.px, tiling.hx, TILE_SIZE_UV, 0);
squares(c2, rot.nz, rot.nx, rot.ny, rot.py, tiling.hy, TILE_SIZE_UV, 0);
squares(c2, rot.nx, rot.ny, rot.nz, rot.pz, tiling.hz, TILE_SIZE_UV, 0);
var circuit = world.getCircuit(c1); // TODO: replace this with some other spatial indexing scheme so we don't have to check per-every-block
if (circuit) {
var o = circuit.getOrigin();
var r = circuitRenderers[o];
if (!r) {
//if (enough++ < 100) console.log("new circuit " + o);
circuitRenderers[o] = makeCircuitRenderer(circuit);
}
} |
<<<<<<<
}
=======
};
this.layout = LocusZoom.mergeLayouts(layout, this.DefaultLayout);
>>>>>>>
}; |
<<<<<<<
var c1 = [x,y,z];
var c2 = [x+1,y+1,z+1];
if (!thiso || !world.opaque(x-1,y,z)) squares(c1, UNIT_PZ, UNIT_PY, UNIT_PX, tiling.lx, 0, TILE_SIZE_UV);
if (!thiso || !world.opaque(x,y-1,z)) squares(c1, UNIT_PX, UNIT_PZ, UNIT_PY, tiling.ly, 0, TILE_SIZE_UV);
if (!thiso || !world.opaque(x,y,z-1)) squares(c1, UNIT_PY, UNIT_PX, UNIT_PZ, tiling.lz, 0, TILE_SIZE_UV);
if (!thiso || !world.opaque(x+1,y,z)) squares(c2, UNIT_NY, UNIT_NZ, UNIT_NX, tiling.hx, TILE_SIZE_UV, 0);
if (!thiso || !world.opaque(x,y+1,z)) squares(c2, UNIT_NZ, UNIT_NX, UNIT_NY, tiling.hy, TILE_SIZE_UV, 0);
if (!thiso || !world.opaque(x,y,z+1)) squares(c2, UNIT_NX, UNIT_NY, UNIT_NZ, tiling.hz, TILE_SIZE_UV, 0);
var circuit = world.getCircuit(c1); // TODO: replace this with some other spatial indexing scheme so we don't have to check per-every-block
if (circuit) {
var o = circuit.getOrigin();
var r = circuitRenderers[o];
if (!r) {
//if (enough++ < 100) console.log("new circuit " + o);
circuitRenderers[o] = makeCircuitRenderer(circuit);
}
}
=======
var c1 = vec3.add([x,y,z], rot.zero);
var c2 = vec3.add([x,y,z], rot.pos);
if (!thiso || !world.opaque(x+rot.nx[0],y+rot.nx[1],z+rot.nx[2])) squares(c1, rot.pz, rot.py, rot.px, tiling.lx, 0, TILE_SIZE_UV);
if (!thiso || !world.opaque(x+rot.ny[0],y+rot.ny[1],z+rot.ny[2])) squares(c1, rot.px, rot.pz, rot.py, tiling.ly, 0, TILE_SIZE_UV);
if (!thiso || !world.opaque(x+rot.nz[0],y+rot.nz[1],z+rot.nz[2])) squares(c1, rot.py, rot.px, rot.pz, tiling.lz, 0, TILE_SIZE_UV);
if (!thiso || !world.opaque(x+rot.px[0],y+rot.px[1],z+rot.px[2])) squares(c2, rot.ny, rot.nz, rot.nx, tiling.hx, TILE_SIZE_UV, 0);
if (!thiso || !world.opaque(x+rot.py[0],y+rot.py[1],z+rot.py[2])) squares(c2, rot.nz, rot.nx, rot.ny, tiling.hy, TILE_SIZE_UV, 0);
if (!thiso || !world.opaque(x+rot.pz[0],y+rot.pz[1],z+rot.pz[2])) squares(c2, rot.nx, rot.ny, rot.nz, tiling.hz, TILE_SIZE_UV, 0);
>>>>>>>
var c1 = vec3.add([x,y,z], rot.zero);
var c2 = vec3.add([x,y,z], rot.pos);
if (!thiso || !world.opaque(x+rot.nx[0],y+rot.nx[1],z+rot.nx[2])) squares(c1, rot.pz, rot.py, rot.px, tiling.lx, 0, TILE_SIZE_UV);
if (!thiso || !world.opaque(x+rot.ny[0],y+rot.ny[1],z+rot.ny[2])) squares(c1, rot.px, rot.pz, rot.py, tiling.ly, 0, TILE_SIZE_UV);
if (!thiso || !world.opaque(x+rot.nz[0],y+rot.nz[1],z+rot.nz[2])) squares(c1, rot.py, rot.px, rot.pz, tiling.lz, 0, TILE_SIZE_UV);
if (!thiso || !world.opaque(x+rot.px[0],y+rot.px[1],z+rot.px[2])) squares(c2, rot.ny, rot.nz, rot.nx, tiling.hx, TILE_SIZE_UV, 0);
if (!thiso || !world.opaque(x+rot.py[0],y+rot.py[1],z+rot.py[2])) squares(c2, rot.nz, rot.nx, rot.ny, tiling.hy, TILE_SIZE_UV, 0);
if (!thiso || !world.opaque(x+rot.pz[0],y+rot.pz[1],z+rot.pz[2])) squares(c2, rot.nx, rot.ny, rot.nz, tiling.hz, TILE_SIZE_UV, 0);
var circuit = world.getCircuit(c1); // TODO: replace this with some other spatial indexing scheme so we don't have to check per-every-block
if (circuit) {
var o = circuit.getOrigin();
var r = circuitRenderers[o];
if (!r) {
//if (enough++ < 100) console.log("new circuit " + o);
circuitRenderers[o] = makeCircuitRenderer(circuit);
}
} |
<<<<<<<
=======
// Given an object facing the +z direction, these will rotate that face to...
var sixFaceRotations = [0/*+z*/, 2/*-z*/, 4/*+y*/, 4+2/*-y*/, 16+8/*-x*/, 16+11/*+x*/];
>>>>>>>
// Given an object facing the +z direction, these will rotate that face to...
var sixFaceRotations = [0/*+z*/, 2/*-z*/, 4/*+y*/, 4+2/*-y*/, 16+8/*-x*/, 16+11/*+x*/];
<<<<<<<
var TILE_SIZE = World.TILE_SIZE;
var blockWorldSize = [TILE_SIZE,TILE_SIZE,TILE_SIZE];
var blockWorldCount = 16;
var blockWorlds = [];
for (var i = 0; i < blockWorldCount; i++) blockWorlds.push(new World(blockWorldSize, colorSet));
=======
var blockWorldSize = [World.TILE_SIZE,World.TILE_SIZE,World.TILE_SIZE];
var blockWorldCount = 8;
var types = [];
for (var i = 0; i < blockWorldCount; i++) types.push(new BlockType.World(new World(blockWorldSize, colorSet)));
>>>>>>>
var TILE_SIZE = World.TILE_SIZE;
var blockWorldSize = [TILE_SIZE,TILE_SIZE,TILE_SIZE];
var blockWorldCount = 16;
var types = [];
for (var i = 0; i < blockWorldCount; i++) types.push(new BlockType.World(new World(blockWorldSize, colorSet))); |
<<<<<<<
case "1": playerInput.tool = 1; updateMenu(); return false;
case "2": playerInput.tool = 2; updateMenu(); return false;
case "3": playerInput.tool = 3; updateMenu(); return false;
case "4": playerInput.tool = 4; updateMenu(); return false;
case "5": playerInput.tool = 5; updateMenu(); return false;
case "6": playerInput.tool = 6; updateMenu(); return false;
case "7": playerInput.tool = 7; updateMenu(); return false;
case "8": playerInput.tool = 8; updateMenu(); return false;
case "9": playerInput.tool = 9; updateMenu(); return false;
case "0": playerInput.tool = 10;updateMenu(); return false;
case "R": playerInput.changeWorld(1); updateMenu(); return false;
case "F": playerInput.changeWorld(-1); updateMenu(); return false;
=======
case "1": playerInput.tool = 1; return false;
case "2": playerInput.tool = 2; return false;
case "3": playerInput.tool = 3; return false;
case "4": playerInput.tool = 4; return false;
case "5": playerInput.tool = 5; return false;
case "6": playerInput.tool = 6; return false;
case "7": playerInput.tool = 7; return false;
case "8": playerInput.tool = 8; return false;
case "9": playerInput.tool = 9; return false;
case "0": playerInput.tool = 10; return false;
case "Q": if (menuVisible()) hideMenu(); else showMenu(); return false;
case "R": hideMenu(); playerInput.changeWorld(1); return false;
case "F": hideMenu(); playerInput.changeWorld(-1); return false;
>>>>>>>
case "1": playerInput.tool = 1; updateMenu(); return false;
case "2": playerInput.tool = 2; updateMenu(); return false;
case "3": playerInput.tool = 3; updateMenu(); return false;
case "4": playerInput.tool = 4; updateMenu(); return false;
case "5": playerInput.tool = 5; updateMenu(); return false;
case "6": playerInput.tool = 6; updateMenu(); return false;
case "7": playerInput.tool = 7; updateMenu(); return false;
case "8": playerInput.tool = 8; updateMenu(); return false;
case "9": playerInput.tool = 9; updateMenu(); return false;
case "0": playerInput.tool = 10;updateMenu(); return false;
case "R": playerInput.changeWorld(1); updateMenu(); return false;
case "\x1B"/*Esc*/:
case "F": playerInput.changeWorld(-1); updateMenu(); return false;
<<<<<<<
dx = -0.3 * deadzone(swingX, 0.4);
=======
dx = -15.0 * deadzone(swingX, 0.4);
>>>>>>>
dx = -15.0 * deadzone(swingX, 0.4);
<<<<<<<
eventReceiver.focus();
playerInput.click(0);
=======
if (menuVisible()) {
hideMenu();
} else {
eventReceiver.focus();
playerInput.deleteBlock();
}
>>>>>>>
eventReceiver.focus();
playerInput.deleteBlock();
<<<<<<<
playerInput.click(1);
=======
if (menuVisible()) {
hideMenu();
} else {
eventReceiver.focus();
playerInput.useTool();
}
>>>>>>>
eventReceiver.focus();
playerInput.useTool();
<<<<<<<
=======
if (i % sidecount == 0) {
menuElement.appendChild(document.createElement('br'));
}
>>>>>>> |
<<<<<<<
}
function intersectAABB(a1, a2) {
for (var dim = 0; dim < 3; dim++)
if (a1[dim][1] < a2[dim][0] || a2[dim][1] < a1[dim][0])
return false;
return true;
=======
}
// Given an element, replace its contents with a text node and return that, so that the element's text can be updated by setting the .data property of the result.
function dynamicText(elem) {
while (elem.firstChild) elem.removeChild(info.firstChild);
var textNode = document.createTextNode("");
elem.appendChild(textNode);
textNode.data = "";
return textNode;
>>>>>>>
}
function intersectAABB(a1, a2) {
for (var dim = 0; dim < 3; dim++)
if (a1[dim][1] < a2[dim][0] || a2[dim][1] < a1[dim][0])
return false;
return true;
}
// Given an element, replace its contents with a text node and return that, so that the element's text can be updated by setting the .data property of the result.
function dynamicText(elem) {
while (elem.firstChild) elem.removeChild(info.firstChild);
var textNode = document.createTextNode("");
elem.appendChild(textNode);
textNode.data = "";
return textNode; |
<<<<<<<
this.standingOn = [];
=======
this.flying = false;
this.onGround = false;
>>>>>>>
this.standingOn = [];
this.flying = false;
<<<<<<<
currentPlace.standingOn = hit || [];
=======
currentPlace.onGround = true;
currentPlace.flying = false;
>>>>>>>
currentPlace.standingOn = hit || [];
currentPlace.flying = false; |
<<<<<<<
'sudden-drops-last5trend-fiveTo10-328'
=======
'constant-risers-10minute-percUpHighClosePoints-filtered60-140',
'sudden-drops-last5trend-fiveTo10-328',
'sudden-drops-last10trend-388',
'based-on-jump-down3overnight-ltneg50percmax-fiveTo10-16',
'ups-then-downs-prevClose-fiveTo10-300',
// add
// 'based-on-jump-down3overnight-ltneg50percmax-fiveTo10-5'
>>>>>>>
'constant-risers-10minute-percUpHighClosePoints-filtered60-140',
'sudden-drops-last5trend-fiveTo10-328',
'sudden-drops-last10trend-388',
'based-on-jump-down3overnight-ltneg50percmax-fiveTo10-16',
'ups-then-downs-prevClose-fiveTo10-300', |
<<<<<<<
function autoScroll(tree) {
var spOfs, scrollTop, delta,
=======
function autoScroll(tree, event) {
var spOfs, scrollTop,
>>>>>>>
function autoScroll(tree, event) {
var spOfs, scrollTop, delta,
<<<<<<<
autoExpandMS: 1500, // Expand nodes after n milliseconds of hovering
=======
autoExpandMS: 1500, // Expand nodes after n milliseconds of hovering.
setTextTypeJson: false, // Allow dragging of nodes to different IE windows
>>>>>>>
autoExpandMS: 1500, // Expand nodes after n milliseconds of hovering
setTextTypeJson: false, // Allow dragging of nodes to different IE windows |
<<<<<<<
// Support glyph symbols instead of icons
if( glyph ) {
$helper.find(".fancytree-drag-helper-img")
.addClass(glyph.map.dragHelper);
}
// we return an unconnected element, so `draggable` will add this
=======
// Allow to modify the helper, e.g. to add multi-node-drag feedback
if( opts.initHelper ) {
opts.initHelper.call(sourceNode.tree, sourceNode, {
node: sourceNode,
tree: sourceNode.tree,
originalEvent: event,
ui: { helper: $helper }
});
}
// We return an unconnected element, so `draggable` will add this
>>>>>>>
// Support glyph symbols instead of icons
if( glyph ) {
$helper.find(".fancytree-drag-helper-img")
.addClass(glyph.map.dragHelper);
}
// Allow to modify the helper, e.g. to add multi-node-drag feedback
if( opts.initHelper ) {
opts.initHelper.call(sourceNode.tree, sourceNode, {
node: sourceNode,
tree: sourceNode.tree,
originalEvent: event,
ui: { helper: $helper }
});
}
// We return an unconnected element, so `draggable` will add this
<<<<<<<
instData.$dropMarker.removeClass("fancytree-drop-after fancytree-drop-over")
=======
instData .$dropMarker.removeClass("fancytree-drop-after fancytree-drop-over")
>>>>>>>
instData.$dropMarker.removeClass("fancytree-drop-after fancytree-drop-over") |
<<<<<<<
.controller('MainCtrl', ['$scope', '$filter','$window', 'Utils', 'Auth', '$rootScope', 'FirebaseService', 'ModalService', 'VoteService','Upload',
function($scope, $filter, $window, utils, auth, $rootScope, firebaseService, modalService, voteService, Upload) {
=======
.controller('MainCtrl', ['$scope', '$filter', '$window', 'Utils', 'Auth',
'$rootScope', 'FirebaseService', 'ModalService', 'VoteService', 'Upload',
function ($scope, $filter, $window, utils, auth, $rootScope, firebaseService, modalService, voteService, Upload) {
>>>>>>>
.controller('MainCtrl', ['$scope', '$filter', '$window', 'Utils', 'Auth',
'$rootScope', 'FirebaseService', 'ModalService', 'VoteService',
function ($scope, $filter, $window, utils, auth, $rootScope, firebaseService, modalService, voteService) {
<<<<<<<
$scope.import = {
data : [],
mapping : []
}
=======
$scope.importData = [];
$scope.importMapping = [];
>>>>>>>
$scope.import = {
data : [],
mapping : []
}
<<<<<<<
$scope.submitImportFile = function (file) {
$scope.import.mapping = [];
if (file) {
$scope.board.columns.forEach (function (column){
$scope.import.mapping.push({map_from:"", map_to:column.id, name: column.value}); //Form mapping array. Uggly solution
});
Papa.parse(file, {
complete: function(results) {
$scope.import.data = results.data;
}
});
}
};
$scope.importMessages = function (){
var data = $scope.import.data;
var mapping = $scope.import.mapping;
for (var importIndex = 1; importIndex < data.length; importIndex++ )
{
for (var mappingIndex = 0; mappingIndex < mapping.length; mappingIndex++)
{
var map_from = mapping[mappingIndex].map_from;
var map_to = mapping[mappingIndex].map_to;
if (!map_from)
continue;
var cardText = data[importIndex][map_from];
if (cardText)
$scope.messages.$add({
text: cardText,
user_id: $scope.userUid,
type: {
id: map_to
},
date: firebaseService.getServerTimestamp(),
votes: 0
});
}
}
$scope.closeAllModals();
}
=======
$scope.submitImportFile = function (file) {
if (file) {
Upload.upload({
url: './upload',
data: {file: file}}).then(function (resp) {
if(resp.data.error_code === 0){
$scope.importMapping = [];
$scope.board.columns.forEach (function (column){
$scope.importMapping.push({map_from:'', map_to:column.id, name: column.value}); //Form mapping array. Uggly solution
});
$scope.importData = resp.data.parsed_table;
} else {
$window.alert('an error occured');
}
}, function (resp) { //catch error
$window.alert('Error status: ' + resp.status);
});
}
};
$scope.importMessages = function (){
console.log ($scope.importData);
for (var importIndex = 1; importIndex < $scope.importData.length; importIndex++ )
{
for (var mappingIndex = 0; mappingIndex < $scope.importMapping.length; mappingIndex++)
{
var map_from = $scope.importMapping[mappingIndex].map_from;
var map_to = $scope.importMapping[mappingIndex].map_to;
if (!map_from)
continue;
var cardText = $scope.importData[importIndex][map_from];
if (cardText)
$scope.messages.$add({
text: cardText,
user_id: $scope.userUid,
type: {
id: map_to
},
date: firebaseService.getServerTimestamp(),
votes: 0
});
}
}
$scope.closeAllModals();
};
$scope.submitOnEnter = function(event, method, data){
if (event.keyCode === 13) {
switch (method){
case 'createNewBoard':
if (!$scope.isBoardNameInvalid()) {
$scope.createNewBoard();
}
break;
case 'addNewColumn':
if (data) {
$scope.addNewColumn(data);
$scope.newColumn = '';
}
break;
}
}
};
>>>>>>>
$scope.submitImportFile = function (file) {
$scope.import.mapping = [];
if (file) {
$scope.board.columns.forEach (function (column){
$scope.import.mapping.push({map_from:"", map_to:column.id, name: column.value}); //Form mapping array. Uggly solution
});
Papa.parse(file, {
complete: function(results) {
$scope.import.data = results.data;
}
});
}
};
$scope.importMessages = function (){
var data = $scope.import.data;
var mapping = $scope.import.mapping;
for (var importIndex = 1; importIndex < data.length; importIndex++ )
{
for (var mappingIndex = 0; mappingIndex < mapping.length; mappingIndex++)
{
var map_from = mapping[mappingIndex].map_from;
var map_to = mapping[mappingIndex].map_to;
if (!map_from)
continue;
var cardText = data[importIndex][map_from];
if (cardText)
$scope.messages.$add({
text: cardText,
user_id: $scope.userUid,
type: {
id: map_to
},
date: firebaseService.getServerTimestamp(),
votes: 0
});
}
}
$scope.closeAllModals();
};
$scope.submitOnEnter = function(event, method, data){
if (event.keyCode === 13) {
switch (method){
case 'createNewBoard':
if (!$scope.isBoardNameInvalid()) {
$scope.createNewBoard();
}
break;
case 'addNewColumn':
if (data) {
$scope.addNewColumn(data);
$scope.newColumn = '';
}
break;
}
}
}; |
<<<<<<<
describe('Import', function() {
var inputFile = {lastModified: 1491246451076,
lastModifiedDate: Date.parse ('Mon Apr 03 2017 21:07:31 GMT+0200 (W. Europe Daylight Time)'),
name: "import.csv",
size: 515,
type: "application/vnd.ms-excel"};
beforeEach(function() {
$scope.board = {
columns: [
{
value: 'columnName',
id: 1
},
{
value: 'otherColumnName',
id: 2
}
]
}
sinon.stub(firebaseService, 'getBoardColumns', function () {
return boardColumns;
});
});
before (function (){
sinon.spy(Papa, 'parse');
});
after (function () {
Papa.parse.restore();
});
it('should call parse meethod', function() {
$scope.submitImportFile(inputFile);
expect(Papa.parse.called).to.be.true;
expect(Papa.parse.calledWith(inputFile)).to.be.true;
});
it ('should show error for empty file', function(){
var emptyFile = inputFile;
emptyFile.size = 0;
$scope.submitImportFile(inputFile);
expect ($scope.import.error).to.be.equal('The file you are trying to import seems to be empty');
})
it('should initialize clear mapping and data', function() {
var expectedMapping = [];
$scope.submitImportFile(inputFile);
expect ($scope.import.mapping).to.deep.equal(expectedMapping);
});
it('should parse import data', function() {
var expectedData = [
["Column 1","Column 2","Column 3"],
["a","b","c"],
["1","2","3"]];
$scope.submitImportFile('"Column 1","Column 2","Column 3"\n"a","b","c"\n"1","2","3"');
expect ($scope.import.data).to.deep.equal(expectedData);
});
it('should import mapped data', function() {
var messageDate = Date.parse ('Mon Apr 03 2017 21:07:31 GMT+0200 (W. Europe Daylight Time)');
var expectedMessages = [
{text:'C3R1', user_id: 'userId', type: {id: 1}, date: messageDate, votes: 0},
{text:'C3R2', user_id: 'userId', type: {id: 1}, date: messageDate, votes: 0}];
sinon.stub(firebaseService, 'getServerTimestamp', function() { return messageDate });
$scope.userUid = 'userId';
var addStub = sinon.spy();
$scope.messages = {
$add: addStub
}
$scope.submitImportFile('"Column 1","Column 2","Column 3"\n"C1R1","C2R1","C3R1"\n"C1R2","C2R2","C3R2"');
//First init with data, then setup mapping
$scope.import.mapping = [
{mapFrom:2, mapTo: 1, name: 'columnName'},
{mapFrom:'-1', mapTo: 2, name: 'otherColumnName'}];
$scope.importMessages();
expect (addStub.calledWith(expectedMessages[0])).to.be.true;
expect (addStub.calledWith(expectedMessages[1])).to.be.true;
});
});
=======
describe('vote limits', function() {
it(' is able to increment the maximum number of votes allowed per user', function() {
var updateSpy = sinon.spy();
$scope.boardRef = {
update: updateSpy
}
oldMaxVotes = $scope.maxVotes;
$scope.incrementMaxVotes();
expect(updateSpy.calledWith({max_votes: (oldMaxVotes + 1)})).to.be.true;
})
it(' is able to decrement the maximum number of votes allowed per user', function() {
var updateSpy = sinon.spy();
$scope.boardRef = {
update: updateSpy
}
oldMaxVotes = $scope.maxVotes;
$scope.decrementMaxVotes();
expect(updateSpy.calledWith({max_votes: (oldMaxVotes - 1)})).to.be.true;
})
})
>>>>>>>
describe('vote limits', function() {
it(' is able to increment the maximum number of votes allowed per user', function() {
var updateSpy = sinon.spy();
$scope.boardRef = {
update: updateSpy
}
oldMaxVotes = $scope.maxVotes;
$scope.incrementMaxVotes();
expect(updateSpy.calledWith({max_votes: (oldMaxVotes + 1)})).to.be.true;
})
it(' is able to decrement the maximum number of votes allowed per user', function() {
var updateSpy = sinon.spy();
$scope.boardRef = {
update: updateSpy
}
oldMaxVotes = $scope.maxVotes;
$scope.decrementMaxVotes();
expect(updateSpy.calledWith({max_votes: (oldMaxVotes - 1)})).to.be.true;
})
})
});
describe('Import', function() {
var inputFile = {lastModified: 1491246451076,
lastModifiedDate: Date.parse ('Mon Apr 03 2017 21:07:31 GMT+0200 (W. Europe Daylight Time)'),
name: "import.csv",
size: 515,
type: "application/vnd.ms-excel"};
beforeEach(function() {
$scope.board = {
columns: [
{
value: 'columnName',
id: 1
},
{
value: 'otherColumnName',
id: 2
}
]
}
sinon.stub(firebaseService, 'getBoardColumns', function () {
return boardColumns;
});
});
before (function (){
sinon.spy(Papa, 'parse');
});
after (function () {
Papa.parse.restore();
});
it('should call parse meethod', function() {
$scope.submitImportFile(inputFile);
expect(Papa.parse.called).to.be.true;
expect(Papa.parse.calledWith(inputFile)).to.be.true;
});
it ('should show error for empty file', function(){
var emptyFile = inputFile;
emptyFile.size = 0;
$scope.submitImportFile(inputFile);
expect ($scope.import.error).to.be.equal('The file you are trying to import seems to be empty');
})
it('should initialize clear mapping and data', function() {
var expectedMapping = [];
$scope.submitImportFile(inputFile);
expect ($scope.import.mapping).to.deep.equal(expectedMapping);
});
it('should parse import data', function() {
var expectedData = [
["Column 1","Column 2","Column 3"],
["a","b","c"],
["1","2","3"]];
$scope.submitImportFile('"Column 1","Column 2","Column 3"\n"a","b","c"\n"1","2","3"');
expect ($scope.import.data).to.deep.equal(expectedData);
});
it('should import mapped data', function() {
var messageDate = Date.parse ('Mon Apr 03 2017 21:07:31 GMT+0200 (W. Europe Daylight Time)');
var expectedMessages = [
{text:'C3R1', user_id: 'userId', type: {id: 1}, date: messageDate, votes: 0},
{text:'C3R2', user_id: 'userId', type: {id: 1}, date: messageDate, votes: 0}];
sinon.stub(firebaseService, 'getServerTimestamp', function() { return messageDate });
$scope.userUid = 'userId';
var addStub = sinon.spy();
$scope.messages = {
$add: addStub
}
$scope.submitImportFile('"Column 1","Column 2","Column 3"\n"C1R1","C2R1","C3R1"\n"C1R2","C2R2","C3R2"');
//First init with data, then setup mapping
$scope.import.mapping = [
{mapFrom:2, mapTo: 1, name: 'columnName'},
{mapFrom:'-1', mapTo: 2, name: 'otherColumnName'}];
$scope.importMessages();
expect (addStub.calledWith(expectedMessages[0])).to.be.true;
expect (addStub.calledWith(expectedMessages[1])).to.be.true;
}); |
<<<<<<<
var version = exec('git ls-remote --tags git://github.com/WordPress/WordPress.git', function(err, stdout, stderr) {
if (err !== null) {
self.writeln('exec error: ' + err)
}
else {
var pattern = /\d\.\d[\.\d]*/ig
, match = stdout.match(pattern)
, latest = match[match.length-1]
if (latest !== null && typeof latest !== 'undefined') {
if (semver.valid(latest)) {
// update config if needed
if (semver.gt(latest, self.latestVersion)) {
self.log.writeln('Updating config with latest version: '+latest)
config.updateWordpressVersion(latest)
}
}
self.latestVersion = latest
self.log.writeln('Latest version: '+self.latestVersion)
}
}
cb()
})
=======
var version = exec('git ls-remote --tags git://github.com/WordPress/WordPress.git | tail -n 1', function(err, stdout, stderr) {
if (err) {
cb()
}
else {
var pattern = /\d\.\d[\.\d]*/ig
, match = pattern.exec(stdout)
, patternShort = /^\d\.\d$/
, semverLatestString = match[0]
, semverVersionString = self.latestVersion
if (semverLatestString.match(patternShort)) semverLatestString += '.0'
if (semverVersionString.match(patternShort)) semverVersionString += '.0'
if (match !== null && typeof match[0] !== 'undefined' && match[0] !== 'undefined') {
// update config if needed
if (semver.gt(semverLatestString, semverVersionString)) {
self.log.writeln('Updating config with latest version: '+match[0])
config.updateWordpressVersion(match[0])
}
self.latestVersion = match[0]
self.log.writeln('Latest version: '+self.latestVersion)
}
}
cb()
})
>>>>>>>
var version = exec('git ls-remote --tags git://github.com/WordPress/WordPress.git', function(err, stdout, stderr) {
if (err !== null) {
self.writeln('exec error: ' + err)
}
else {
var pattern = /\d\.\d[\.\d]*/ig
, match = stdout.match(pattern)
, patternShort = /^\d\.\d$/
, semverLatestString = match[match.length-1]
, semverVersionString = self.latestVersion
if (semverLatestString.match(patternShort)) semverLatestString += '.0'
if (semverVersionString.match(patternShort)) semverVersionString += '.0'
if (latest !== null && typeof latest !== 'undefined') {
// update config if needed
if (semver.gt(semverLatestString, semverVersionString)) {
self.log.writeln('Updating config with latest version: '+match[0])
config.updateWordpressVersion(match[0])
}
self.latestVersion = latest
self.log.writeln('Latest version: '+self.latestVersion)
}
}
cb()
}) |
<<<<<<<
var extractXAxes = function (getScrollY, srcSvg, axesInfo, animationSpeed) {
=======
var extractXAxesNew = function (scrollableArea, scrollbarHeight, srcSvg, xSel) {
>>>>>>>
var extractXAxes = function (getScrollY, scrollbarHeight, srcSvg, axesInfo, animationSpeed) {
<<<<<<<
var getAxesSelector = function (axis) {
var axisPart = '> .' + axis + '.axis.tau-active';
var rootPart = '.frame-root.tau-active ';
return [
rootPart + axisPart,
rootPart + '.cell.tau-active ' + axisPart
].join(', ');
};
var xSel = srcSvg.selectAll(getAxesSelector('x'));
var ySel = srcSvg.selectAll(getAxesSelector('y'));
var scrollableHeight = root.getBoundingClientRect().height;
var getScrollX = function () {
return root.scrollLeft;
};
var getScrollY = function () {
return (scrollableHeight + root.scrollTop);
};
var xAxesInfo = extractAxesInfo(xSel);
var yAxesInfo = extractAxesInfo(ySel);
var animationSpeed = chart.configGPL.settings.animationSpeed;
=======
var xSel = srcSvg.selectAll('.cell .x.axis');
var ySel = srcSvg.selectAll('.cell .y.axis');
show(xSel);
show(ySel);
var s = tauCharts.api.globalSettings.getScrollbarSize(root);
>>>>>>>
var getAxesSelector = function (axis) {
var axisPart = '> .' + axis + '.axis.tau-active';
var rootPart = '.frame-root.tau-active ';
return [
rootPart + axisPart,
rootPart + '.cell.tau-active ' + axisPart
].join(', ');
};
var xSel = srcSvg.selectAll(getAxesSelector('x'));
var ySel = srcSvg.selectAll(getAxesSelector('y'));
var scrollableHeight = root.getBoundingClientRect().height;
var getScrollX = function () {
return root.scrollLeft;
};
var getScrollY = function () {
return (scrollableHeight + root.scrollTop);
};
var s = tauCharts.api.globalSettings.getScrollbarSize(root);
var xAxesInfo = extractAxesInfo(xSel);
var yAxesInfo = extractAxesInfo(ySel);
var animationSpeed = chart.configGPL.settings.animationSpeed;
<<<<<<<
extractXAxes(getScrollY, srcSvg, xAxesInfo, animationSpeed),
extractYAxes(getScrollX, srcSvg, yAxesInfo, animationSpeed),
extractCorner(getScrollX, getScrollY, srcSvg, xAxesInfo, yAxesInfo)
=======
extractXAxesNew(root, s.height, srcSvg, xSel),
extractYAxesNew(root, srcSvg, ySel),
extractCenter(root, s.height, srcSvg, xSel, ySel)
>>>>>>>
extractXAxes(getScrollY, s.height, srcSvg, xAxesInfo, animationSpeed),
extractYAxes(getScrollX, srcSvg, yAxesInfo, animationSpeed),
extractCorner(getScrollX, getScrollY, s.height, srcSvg, xAxesInfo, yAxesInfo) |
<<<<<<<
if (!bsConfig.tunnelIdentifier) {
bsConfig.tunnelIdentifier = 'karma' + Math.random()
=======
if (!bsConfig.localIdentifier) {
if (bsConfig.tunnelIdentifier) {
// Back compat; the option was renamed.
bsConfig.localIdentifier = bsConfig.tunnelIdentifier;
delete bsConfig.tunnelIdentifier;
}
bsConfig.localIdentifier = 'karma' + Math.random();
>>>>>>>
if (!bsConfig.localIdentifier) {
if (bsConfig.tunnelIdentifier) {
// Back compat; the option was renamed.
bsConfig.localIdentifier = bsConfig.tunnelIdentifier
delete bsConfig.tunnelIdentifier
}
bsConfig.localIdentifier = 'karma' + Math.random() |
<<<<<<<
'@edtr-io/plugin-text-state':
'@edtr-io/plugin-text-state/src',
'@edtr-io/plugin-video': '@edtr-io/plugin-video/src'
=======
'@edtr-io/plugin-video': '@edtr-io/plugin-video/src',
// Private
'@edtr-io/internal__bundle-size':
'@edtr-io/internal__bundle-size/src',
'@edtr-io/internal__demo': '@edtr-io/internal__demo/src',
'@edtr-io/internal__document-editor':
'@edtr-io/internal__document-editor/src',
'@edtr-io/internal__fixtures':
'@edtr-io/internal__fixtures/src',
'@edtr-io/internal__plugin': '@edtr-io/internal__plugin/src',
'@edtr-io/internal__plugin-state':
'@edtr-io/internal__plugin-state/src',
'@edtr-io/internal__plugin-toolbar':
'@edtr-io/internal__plugin-toolbar/src',
// Public
'@edtr-io/core': '@edtr-io/core/src',
'@edtr-io/default-document-editor':
'@edtr-io/default-document-editor/src',
'@edtr-io/default-plugin-toolbar':
'@edtr-io/default-plugin-toolbar/src',
'@edtr-io/document-editor': '@edtr-io/document-editor/src',
'@edtr-io/editor-ui': '@edtr-io/editor-ui/src',
'@edtr-io/plugin': '@edtr-io/plugin/src',
'@edtr-io/plugin-toolbar': '@edtr-io/plugin-toolbar/src',
'@edtr-io/renderer': '@edtr-io/renderer/src',
'@edtr-io/renderer-ssr': '@edtr-io/renderer-ssr/src',
'@edtr-io/renderer-ui': '@edtr-io/renderer-ui/src',
'@edtr-io/store': '@edtr-io/store/src',
'@edtr-io/store-devtools': '@edtr-io/store-devtools/src',
'@edtr-io/ui': '@edtr-io/ui/src'
>>>>>>>
'@edtr-io/plugin-text-state':
'@edtr-io/plugin-text-state/src',
'@edtr-io/plugin-video': '@edtr-io/plugin-video/src',
// Private
'@edtr-io/internal__bundle-size':
'@edtr-io/internal__bundle-size/src',
'@edtr-io/internal__demo': '@edtr-io/internal__demo/src',
'@edtr-io/internal__document-editor':
'@edtr-io/internal__document-editor/src',
'@edtr-io/internal__fixtures':
'@edtr-io/internal__fixtures/src',
'@edtr-io/internal__plugin': '@edtr-io/internal__plugin/src',
'@edtr-io/internal__plugin-state':
'@edtr-io/internal__plugin-state/src',
'@edtr-io/internal__plugin-toolbar':
'@edtr-io/internal__plugin-toolbar/src',
// Public
'@edtr-io/core': '@edtr-io/core/src',
'@edtr-io/default-document-editor':
'@edtr-io/default-document-editor/src',
'@edtr-io/default-plugin-toolbar':
'@edtr-io/default-plugin-toolbar/src',
'@edtr-io/document-editor': '@edtr-io/document-editor/src',
'@edtr-io/editor-ui': '@edtr-io/editor-ui/src',
'@edtr-io/plugin': '@edtr-io/plugin/src',
'@edtr-io/plugin-toolbar': '@edtr-io/plugin-toolbar/src',
'@edtr-io/renderer': '@edtr-io/renderer/src',
'@edtr-io/renderer-ssr': '@edtr-io/renderer-ssr/src',
'@edtr-io/renderer-ui': '@edtr-io/renderer-ui/src',
'@edtr-io/store': '@edtr-io/store/src',
'@edtr-io/store-devtools': '@edtr-io/store-devtools/src',
'@edtr-io/ui': '@edtr-io/ui/src' |
<<<<<<<
label: 'Tutorial',
to: 'tutorials/essentials/part-1-overview-concepts'
},
{
=======
>>>>>>> |
<<<<<<<
var id = params.type === common.PEER_TYPES.websocket ? params.peer_id : params.addr
this.peers[id] = null
=======
delete this.peers[params.addr || params.peer_id]
>>>>>>>
var id = params.type === common.PEER_TYPES.websocket ? params.peer_id : params.addr
delete this.peers[id] |
<<<<<<<
=======
var returned_list = LocusZoom.ScaleFunctions.list();
var expected_list = ['if', 'numerical_bin', 'categorical_bin', 'ordinal_cycle', 'interpolate'];
assert.deepEqual(returned_list, expected_list);
>>>>>>>
<<<<<<<
=======
var returned_list = LocusZoom.ScaleFunctions.list();
var expected_list = ['if', 'numerical_bin', 'categorical_bin', 'ordinal_cycle', 'interpolate', 'foo'];
assert.deepEqual(returned_list, expected_list);
>>>>>>>
<<<<<<<
var items_with_extra = LocusZoom.ScaleFunctions.list();
=======
var returned_list = LocusZoom.ScaleFunctions.list();
var expected_list = ['if', 'numerical_bin', 'categorical_bin', 'ordinal_cycle', 'interpolate', 'foo'];
assert.deepEqual(returned_list, expected_list);
>>>>>>>
var items_with_extra = LocusZoom.ScaleFunctions.list();
<<<<<<<
var items_after_removal = LocusZoom.ScaleFunctions.list();
assert.deepEqual(items_with_extra.length - 1, items_after_removal.length);
=======
returned_list = LocusZoom.ScaleFunctions.list();
expected_list = ['if', 'numerical_bin', 'categorical_bin', 'ordinal_cycle', 'interpolate'];
assert.deepEqual(returned_list, expected_list);
>>>>>>>
var items_after_removal = LocusZoom.ScaleFunctions.list();
assert.deepEqual(items_with_extra.length - 1, items_after_removal.length); |
<<<<<<<
import './extensions/components/guidelines';
import './extensions/components/autosave';
=======
import './extensions/components/guidelines';
// Formats
import './extensions/formats/';
>>>>>>>
import './extensions/components/guidelines';
import './extensions/components/autosave';
// Formats
import './extensions/formats/'; |
<<<<<<<
// import './extensions/components/markdown';
import './extensions/page-template';
=======
import './extensions/components/manager';
>>>>>>>
// import './extensions/components/markdown';
import './extensions/page-template';
import './extensions/components/manager'; |
<<<<<<<
import './block-navigator';
import './cover-vertical-alignment';
=======
import './block-navigator';
import './reusable-convert';
>>>>>>>
import './block-navigator';
import './reusable-convert';
import './cover-vertical-alignment'; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.