conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
var promise = new Promise(function(resolve, reject) {
request(
{
url: url,
method: method,
headers: headers,
formData: {
users: {
value: data.users_json ? Buffer.from(data.users_json) : fs.createReadStream(data.users),
options: {
filename: data.users_json ? 'users.json' : data.users
}
},
connection_id: data.connection_id,
upsert: upsert,
send_completion_email: send_completion_email
=======
var promise = options.tokenProvider.getAccessToken().then(function(access_token) {
return new Promise(function(resolve, reject) {
request(
{
url: url,
method: method,
headers: extend({ Authorization: `Bearer ${access_token}` }, headers),
formData: {
users: {
value: data.users_json
? Buffer.from(data.users_json)
: fs.createReadStream(data.users),
options: {
filename: data.users_json ? 'users.json' : data.users
}
},
connection_id: data.connection_id
}
},
function(err, res) {
if (err) {
reject(err);
return;
}
// `superagent` uses the error parameter in callback on http errors.
// the following code is intended to keep that behaviour (https://github.com/visionmedia/superagent/blob/master/lib/node/response.js#L170)
var type = (res.statusCode / 100) | 0;
var isErrorResponse = 4 === type || 5 === type;
if (isErrorResponse) {
var error = new Error('cannot ' + method + ' ' + url + ' (' + res.statusCode + ')');
error.status = res.statusCode;
error.method = method;
error.text = res.text;
reject(error);
}
resolve(res);
>>>>>>>
var promise = options.tokenProvider.getAccessToken().then(function(access_token) {
return new Promise(function(resolve, reject) {
request(
{
url: url,
method: method,
headers: extend({ Authorization: `Bearer ${access_token}` }, headers),
formData: {
users: {
value: data.users_json
? Buffer.from(data.users_json)
: fs.createReadStream(data.users),
options: {
filename: data.users_json ? 'users.json' : data.users
}
},
connection_id: data.connection_id,
upsert: upsert,
send_completion_email: send_completion_email
}
},
function(err, res) {
if (err) {
reject(err);
return;
}
// `superagent` uses the error parameter in callback on http errors.
// the following code is intended to keep that behaviour (https://github.com/visionmedia/superagent/blob/master/lib/node/response.js#L170)
var type = (res.statusCode / 100) | 0;
var isErrorResponse = 4 === type || 5 === type;
if (isErrorResponse) {
var error = new Error('cannot ' + method + ' ' + url + ' (' + res.statusCode + ')');
error.status = res.statusCode;
error.method = method;
error.text = res.text;
reject(error);
}
resolve(res); |
<<<<<<<
args.priority = args.priority ? args.priority : options.priority;
$http.get(args.template,{cache: $templateCache}).success(function(template) {
=======
var template=$templateCache.get(args.template);
if(template){
processNotificationTemplate(template);
}else{
// load it via $http only if it isn't default template and template isn't exist in template cache
// cache:true means cache it for later access.
$http.get(args.template,{cache: true})
.then(processNotificationTemplate)
.catch(function(data){
throw new Error('Template ('+args.template+') could not be loaded. ' + data);
});
}
function processNotificationTemplate(template) {
>>>>>>>
args.priority = args.priority ? args.priority : options.priority;
var template=$templateCache.get(args.template);
if(template){
processNotificationTemplate(template);
}else{
// load it via $http only if it isn't default template and template isn't exist in template cache
// cache:true means cache it for later access.
$http.get(args.template,{cache: true})
.then(processNotificationTemplate)
.catch(function(data){
throw new Error('Template ('+args.template+') could not be loaded. ' + data);
});
}
function processNotificationTemplate(template) { |
<<<<<<<
// @version 0.3.4
=======
// @version 0.4.0
>>>>>>>
// @version 0.4.0
<<<<<<<
=======
// TRY CKEditorのメニューをカスタマイズ
this.editor.ui.addButton( 'mdn-link-launch', {
label: 'My Bold',
command: 'bold',
toolbar: 'insert,100'
} );
>>>>>>>
<<<<<<<
=======
target: '.guide-links',
prepend: ' • ',
label: '↓',
desc: '翻訳文を下げます',
action: () => {
let margin = sessionStorage.getItem('balance-right');
margin = 60 + parseInt(margin);
var el = document.querySelector(".guide-links");
el.style.paddingTop = '' + margin + 'px';
sessionStorage.setItem('balance-right', margin);
}
}, {
target: '.guide-links',
prepend: ' • ',
label: '↑',
desc: '原文を下げます',
action: () => {
let margin = sessionStorage.getItem('balance-left');
margin = 60 + parseInt(margin);
var el = document.querySelector(".translate-rendered");
el.style.paddingTop = '' + margin + 'px';
sessionStorage.setItem('balance-left', margin);
}
}, {
>>>>>>>
target: '.guide-links',
prepend: ' • ',
label: '↓',
desc: '翻訳文を下げます',
action: () => {
let margin = sessionStorage.getItem('balance-right');
margin = 60 + parseInt(margin);
var el = document.querySelector(".guide-links");
el.style.paddingTop = '' + margin + 'px';
sessionStorage.setItem('balance-right', margin);
}
}, {
target: '.guide-links',
prepend: ' • ',
label: '↑',
desc: '原文を下げます',
action: () => {
let margin = sessionStorage.getItem('balance-left');
margin = 60 + parseInt(margin);
var el = document.querySelector(".translate-rendered");
el.style.paddingTop = '' + margin + 'px';
sessionStorage.setItem('balance-left', margin);
}
}, { |
<<<<<<<
this.work_str = this.work_str.replace(/for example,/, '例えば、');
this.work_str = this.work_str.replace(/programming language/, 'プログラミング言語');
this.work_str = this.work_str.replace(/by default/, '既定では');
this.work_str = this.work_str.replace(/This is a localizable property./, 'これはローカライズ可能なプロパティです。');
// 英語と日本語の境界を修正
this.work_str = this.work_str.replace(/([あ-んア-ン])([a-zA-Z]+)/g, '$1 $2')
.replace(/([a-zA-Z]+)([あ-んア-ン])/g, '$1 $2');
=======
var note = this.editor.showNotification('定型文の自動翻訳を行いました。');
>>>>>>>
this.work_str = this.work_str.replace(/for example,/, '例えば、');
this.work_str = this.work_str.replace(/programming language/, 'プログラミング言語');
this.work_str = this.work_str.replace(/by default/, '既定では');
this.work_str = this.work_str.replace(/This is a localizable property./, 'これはローカライズ可能なプロパティです。');
// 英語と日本語の境界を修正
this.work_str = this.work_str.replace(/([あ-んア-ン])([a-zA-Z]+)/g, '$1 $2')
.replace(/([a-zA-Z]+)([あ-んア-ン])/g, '$1 $2');
var note = this.editor.showNotification('定型文の自動翻訳を行いました。'); |
<<<<<<<
it('#select one', () => {
baseQuery.select('-amount')
expect(baseQuery._keys).to.equal('-amount')
})
it('#select more', () => {
baseQuery.select(['amount', '-price'])
expect(baseQuery._keys).to.equal('amount,-price')
})
=======
it('#expand', () => {
baseQuery.expand('created_by')
expect(baseQuery._expand).to.equal('created_by')
})
it('#expand array args', () => {
baseQuery.expand(['created_by', 'test'])
expect(baseQuery._expand).to.equal('created_by,test')
})
>>>>>>>
it('#select one', () => {
baseQuery.select('-amount')
expect(baseQuery._keys).to.equal('-amount')
})
it('#select more', () => {
baseQuery.select(['amount', '-price'])
expect(baseQuery._keys).to.equal('amount,-price')
})
it('#expand', () => {
baseQuery.expand('created_by')
expect(baseQuery._expand).to.equal('created_by')
})
it('#expand array args', () => {
baseQuery.expand(['created_by', 'test'])
expect(baseQuery._expand).to.equal('created_by,test')
}) |
<<<<<<<
const WebSocket = require('./websocket')
=======
const utils = require('core-module/utils')
>>>>>>>
const WebSocket = require('./websocket')
const utils = require('core-module/utils') |
<<<<<<<
( metaRequired == metaPressed ) &&
( altRequired == altPressed ) &&
( ctrlRequired == ctrlPressed ) &&
( shiftRequired == shiftPressed )
=======
( altRequired === altPressed ) &&
( ctrlRequired === ctrlPressed ) &&
( shiftRequired === shiftPressed )
>>>>>>>
( metaRequired === metaPressed ) &&
( altRequired === altPressed ) &&
( ctrlRequired === ctrlPressed ) &&
( shiftRequired === shiftPressed ) |
<<<<<<<
// Sample Testacular configuration file, that contain pretty much all the available options
// It's used for running client tests on Travis (http://travis-ci.org/#!/vojtajina/testacular)
// Most of the options can be overriden by cli arguments (see testacular --help)
// base path, that will be used to resolve files and exclude
basePath = '..';
// list of files / patterns to load in the browser
files = [
JASMINE,
JASMINE_ADAPTER,
'test/lib/jquery/jquery-1.7.2.js',
'test/lib/jquery/jquery-ui-1.8.18.js',
'test/lib/angular-1.0.1/angular.js',
'test/lib/angular-1.0.1/angular-mocks.js',
'test/lib/codemirror/codemirror.js',
'test/lib/tinymce/tiny_mce.js',
'test/lib/tinymce/jquery.tinymce.js',
'test/lib/googlemaps/googlemaps.js',
'test/lib/bootstrap/bootstrap-modal.js',
'test/lib/select2/select2.js',
'test/lib/maskedinput/jquery.maskedinput-1.3.js',
'common/module.js',
'modules/*/*/*.js',
'modules/*/*/test/*.js',
'templates/*.js',
'templates/test/*.js'
];
// list of files to exclude
exclude = [];
// use dots reporter, as travis terminal does not support escaping sequences
// possible values: 'dots' || 'progress'
reporter = 'dots';
// these are default values, just to show available options
// web server port
port = 8080;
// cli runner port
runnerPort = 9100;
// enable / disable colors in the output (reporters and logs)
colors = true;
// level of logging
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
logLevel = LOG_DEBUG;
// enable / disable watching file and executing tests whenever any file changes
autoWatch = false;
// polling interval in ms (ignored on OS that support inotify)
autoWatchInterval = 0;
// Start these browsers, currently available:
// - Chrome
// - ChromeCanary
// - Firefox
// - Opera
// - Safari
// - PhantomJS
=======
// Sample Testacular configuration file, that contain pretty much all the available options
// It's used for running client tests on Travis (http://travis-ci.org/#!/vojtajina/testacular)
// Most of the options can be overriden by cli arguments (see testacular --help)
// base path, that will be used to resolve files and exclude
basePath = '..';
// list of files / patterns to load in the browser
files = [
JASMINE,
JASMINE_ADAPTER,
'test/lib/jquery/jquery-1.7.2.js',
'test/lib/jquery/jquery-ui-1.8.18.js',
'test/lib/angular-1.0.1/angular.js',
'test/lib/angular-1.0.1/angular-mocks.js',
'test/lib/codemirror/codemirror.js',
'test/lib/tinymce/jquery.tinymce.js',
'test/lib/googlemaps/googlemaps.js',
'test/lib/bootstrap/bootstrap-modal.js',
'test/lib/calendar/calendar.js.min',
'common/module.js',
'modules/*/*/*.js',
'modules/*/*/test/*.js',
'templates/*.js',
'templates/test/*.js'
];
// list of files to exclude
exclude = [];
// use dots reporter, as travis terminal does not support escaping sequences
// possible values: 'dots' || 'progress'
reporter = 'dots';
// these are default values, just to show available options
// web server port
port = 8080;
// cli runner port
runnerPort = 9100;
// enable / disable colors in the output (reporters and logs)
colors = true;
// level of logging
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
logLevel = LOG_DEBUG;
// enable / disable watching file and executing tests whenever any file changes
autoWatch = false;
// polling interval in ms (ignored on OS that support inotify)
autoWatchInterval = 0;
// Start these browsers, currently available:
// - Chrome
// - ChromeCanary
// - Firefox
// - Opera
// - Safari
// - PhantomJS
>>>>>>>
// Sample Testacular configuration file, that contain pretty much all the available options
// It's used for running client tests on Travis (http://travis-ci.org/#!/vojtajina/testacular)
// Most of the options can be overriden by cli arguments (see testacular --help)
// base path, that will be used to resolve files and exclude
basePath = '..';
// list of files / patterns to load in the browser
files = [
JASMINE,
JASMINE_ADAPTER,
'test/lib/jquery/jquery-1.7.2.js',
'test/lib/jquery/jquery-ui-1.8.18.js',
'test/lib/angular-1.0.1/angular.js',
'test/lib/angular-1.0.1/angular-mocks.js',
'test/lib/codemirror/codemirror.js',
'test/lib/tinymce/tiny_mce.js',
'test/lib/tinymce/jquery.tinymce.js',
'test/lib/googlemaps/googlemaps.js',
'test/lib/bootstrap/bootstrap-modal.js',
'test/lib/select2/select2.js',
'test/lib/maskedinput/jquery.maskedinput-1.3.js',
'test/lib/calendar/calendar.js.min',
'common/module.js',
'modules/*/*/*.js',
'modules/*/*/test/*.js',
'templates/*.js',
'templates/test/*.js'
];
// list of files to exclude
exclude = [];
// use dots reporter, as travis terminal does not support escaping sequences
// possible values: 'dots' || 'progress'
reporter = 'dots';
// these are default values, just to show available options
// web server port
port = 8080;
// cli runner port
runnerPort = 9100;
// enable / disable colors in the output (reporters and logs)
colors = true;
// level of logging
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
logLevel = LOG_DEBUG;
// enable / disable watching file and executing tests whenever any file changes
autoWatch = false;
// polling interval in ms (ignored on OS that support inotify)
autoWatchInterval = 0;
// Start these browsers, currently available:
// - Chrome
// - ChromeCanary
// - Firefox
// - Opera
// - Safari
// - PhantomJS |
<<<<<<<
this.element = jQuery(this.template({
tools : _this.availableAnnotationTools,
=======
this.element = jQuery(this.annotationTemplate({
tools : _this.availableAnnotationTools,
>>>>>>>
this.element = jQuery(this.annotationTemplate({
tools : _this.availableAnnotationTools,
<<<<<<<
})).appendTo(this.container);
this.setBorderFillColorPickers();
this.hide();
this.bindEvents();
},
show: function() {
this.element.fadeIn("200");
},
hide: function(complete) {
this.element.fadeOut("200", complete);
},
setBorderFillColorPickers: function() {
var _this = this;
=======
})).appendTo(this.container.find('.mirador-osd-annotation-controls'));
this.setBorderFillColorPickers();
this.hide();
this.bindEvents();
},
setBorderFillColorPickers: function() {
var _this = this;
>>>>>>>
})).appendTo(this.container.find('.mirador-osd-annotation-controls'));
this.setBorderFillColorPickers();
this.hide();
this.bindEvents();
},
setBorderFillColorPickers: function() {
var _this = this;
<<<<<<<
=======
},
show: function() {
this.element.fadeIn("150");
},
hide: function() {
this.element.fadeOut("150");
>>>>>>>
},
show: function() {
this.element.fadeIn("150");
},
hide: function() {
this.element.fadeOut("150");
<<<<<<<
template: Handlebars.compile([
'<div class="mirador-osd-context-controls hud-container">',
'<div class="mirador-annotation-controls">',
'<a class="mirador-osd-close hud-control" role="button" aria-label="Turn off annotations">',
'<i class="fa fa-lg fa-times"></i>',
'</a>',
=======
annotationTemplate: Handlebars.compile([
>>>>>>>
annotationTemplate: Handlebars.compile([ |
<<<<<<<
import { compose } from 'redux';
=======
import classNames from 'classnames';
>>>>>>>
import classNames from 'classnames';
<<<<<<<
=======
import List from '@material-ui/core/List';
import Fab from '@material-ui/core/Fab';
import AddIcon from '@material-ui/icons/Add';
import Menu from '@material-ui/core/Menu';
import { withStyles } from '@material-ui/core/styles';
import Drawer from '@material-ui/core/Drawer';
>>>>>>>
import List from '@material-ui/core/List';
import Fab from '@material-ui/core/Fab';
import AddIcon from '@material-ui/icons/Add';
import Menu from '@material-ui/core/Menu';
import { withStyles } from '@material-ui/core/styles';
import Drawer from '@material-ui/core/Drawer';
<<<<<<<
import Display from './Display';
import CSvgDots from './SvgDots';
import CSvgPlus from './SvgPlus';
import CSvgFrame from './SvgFrame';
=======
import ConnectedWorkspaceControlPanelButtons from './WorkspaceControlPanelButtons';
>>>>>>>
import ConnectedWorkspaceControlPanelButtons from './WorkspaceControlPanelButtons';
import CSvgDots from './SvgDots';
import CSvgPlus from './SvgPlus';
import CSvgFrame from './SvgFrame';
<<<<<<<
<div className={ns('workspace-control-panel')}>
<span className={ns('svg-plus')}>
<CSvgPlus clickHandler={(e) => { console.log('TODO: a manifest selection possibility should appear'); }} />
</span>
<br />
<br />
<span className={ns('svg-dots')}>
<CSvgDots clickHandler={(e) => { console.log('TODO: a menu should appear'); }} />
</span>
<br />
<span>
<CSvgFrame />
</span>
<ConnectedManifestForm setLastRequested={this.setLastRequested} />
<ul>{manifestList}</ul>
=======
<Drawer
className={classNames(classes.drawer, ns('workspace-control-panel'))}
variant="permanent"
classes={{ paper: classNames(classes.drawer) }}
open
>
<Menu id="add-form" anchorEl={anchorEl} open={Boolean(anchorEl)} onClose={this.handleClose}>
<ConnectedManifestForm id="add-form" setLastRequested={this.setLastRequested} />
<ul>{manifestList}</ul>
{lastRequested}
</Menu>
>>>>>>>
<Drawer
className={classNames(classes.drawer, ns('workspace-control-panel'))}
variant="permanent"
classes={{ paper: classNames(classes.drawer) }}
open
>
<Menu id="add-form" anchorEl={anchorEl} open={Boolean(anchorEl)} onClose={this.handleClose}>
<div className={ns('svg-plus')}>
<CSvgPlus clickHandler={(e) => { console.log('TODO: a manifest selection possibility should appear'); }} />
</div>
<div className={ns('svg-dots')}>
<CSvgDots clickHandler={(e) => { console.log('TODO: a menu should appear'); }} />
</div>
<div>
<CSvgFrame />
</div>
<ConnectedManifestForm id="add-form" setLastRequested={this.setLastRequested} />
<ul>{manifestList}</ul>
{lastRequested}
</Menu> |
<<<<<<<
describe('# loginWithWechat', () => {
it('should set storage', () => {
return BaaS.auth.loginWithWechat().then((res) => {
expect(BaaS.storage.get(constants.STORAGE_KEY.UID)).to.be.equal(userId)
expect(BaaS.storage.get(constants.STORAGE_KEY.AUTH_TOKEN)).to.be.equal(token)
expect(BaaS.storage.get(constants.STORAGE_KEY.IS_ANONYMOUS_USER)).to.be.equal('0')
expect(BaaS.storage.get(constants.STORAGE_KEY.OPENID)).to.be.equal(openId)
expect(parseInt(BaaS.storage.get(constants.STORAGE_KEY.EXPIRES_AT))).to.be.equal(Math.floor(Date.now() / 1000) + expiresIn - 30)
})
})
describe('# update_userprofile', () => {
[[null, 'setnx'], ['bar', 'setnx'], ['setnx', 'setnx'], ['false', 'false'], ['overwrite', 'overwrite']].map(item => {
it(`should be "${item[1]}"`, () => {
return BaaS.auth.loginWithWechat({detail: {userInfo: {}}}, {
syncUserProfile: item[1],
})
.then(() => {
expect(requestStub.getCall(1).args[0].data.update_userprofile).to.be.equal(item[1])
})
})
})
it('should not be included', () => {
return BaaS.auth.loginWithWechat(null, {
syncUserProfile: 'overwrite',
}).then(() => {
expect(requestStub.getCall(0).args[0]).to.be.deep.equal({
url: config.API.WECHAT.SILENT_LOGIN,
method: 'POST',
data: {
code: wechatMock.__get__('code'),
create_user: true,
}
})
})
})
})
})
describe('# linkWechat', () => {
describe('# update_userprofile', () => {
[[null, 'setnx'], ['bar', 'setnx'], ['setnx', 'setnx'], ['false', 'false'], ['overwrite', 'overwrite']].map(item => {
it(`should be "${item[1]}"`, () => {
return BaaS.auth.login({username: 'foo', password: 'bar'}).then(user => {
return user.linkWechat({userInfo: {}}, {
syncUserProfile: item[1],
})
}).then(res => {
expect(requestStub.getCall(2).args[0]).to.be.deep.equal({
url: config.API.WECHAT.USER_ASSOCIATE,
method: 'POST',
data: {
encryptedData: '',
iv: '',
rawData: '',
signature: '',
code: wechatMock.__get__('code'),
update_userprofile: item[1],
}
})
})
})
})
it('should not be included', () => {
return BaaS.auth.login({username: 'foo', password: 'bar'}).then(user => {
return user.linkWechat(null, {
syncUserProfile: 'overwrite',
})
}).then(res => {
expect(requestStub.getCall(2).args[0]).to.be.deep.equal({
url: config.API.WECHAT.USER_ASSOCIATE,
method: 'POST',
data: {
code: wechatMock.__get__('code'),
}
})
})
})
})
})
=======
it('should call silent-login before force-login call', () => {
return BaaS.auth.loginWithWechat({detail: {userInfo: {}}})
.then(() => {
expect(requestStub.getCall(0).args[0].url).to.equal(config.API.WECHAT.SILENT_LOGIN)
})
})
>>>>>>>
describe('# loginWithWechat', () => {
it('should set storage', () => {
return BaaS.auth.loginWithWechat().then((res) => {
expect(BaaS.storage.get(constants.STORAGE_KEY.UID)).to.be.equal(userId)
expect(BaaS.storage.get(constants.STORAGE_KEY.AUTH_TOKEN)).to.be.equal(token)
expect(BaaS.storage.get(constants.STORAGE_KEY.IS_ANONYMOUS_USER)).to.be.equal('0')
expect(BaaS.storage.get(constants.STORAGE_KEY.OPENID)).to.be.equal(openId)
expect(parseInt(BaaS.storage.get(constants.STORAGE_KEY.EXPIRES_AT))).to.be.equal(Math.floor(Date.now() / 1000) + expiresIn - 30)
})
})
describe('# update_userprofile', () => {
[[null, 'setnx'], ['bar', 'setnx'], ['setnx', 'setnx'], ['false', 'false'], ['overwrite', 'overwrite']].map(item => {
it(`should be "${item[1]}"`, () => {
return BaaS.auth.loginWithWechat({detail: {userInfo: {}}}, {
syncUserProfile: item[1],
})
.then(() => {
expect(requestStub.getCall(1).args[0].data.update_userprofile).to.be.equal(item[1])
})
})
})
it('should not be included', () => {
return BaaS.auth.loginWithWechat(null, {
syncUserProfile: 'overwrite',
}).then(() => {
expect(requestStub.getCall(0).args[0]).to.be.deep.equal({
url: config.API.WECHAT.SILENT_LOGIN,
method: 'POST',
data: {
code: wechatMock.__get__('code'),
create_user: true,
}
})
})
})
})
})
describe('# linkWechat', () => {
describe('# update_userprofile', () => {
[[null, 'setnx'], ['bar', 'setnx'], ['setnx', 'setnx'], ['false', 'false'], ['overwrite', 'overwrite']].map(item => {
it(`should be "${item[1]}"`, () => {
return BaaS.auth.login({username: 'foo', password: 'bar'}).then(user => {
return user.linkWechat({userInfo: {}}, {
syncUserProfile: item[1],
})
}).then(res => {
expect(requestStub.getCall(2).args[0]).to.be.deep.equal({
url: config.API.WECHAT.USER_ASSOCIATE,
method: 'POST',
data: {
encryptedData: '',
iv: '',
rawData: '',
signature: '',
code: wechatMock.__get__('code'),
update_userprofile: item[1],
}
})
})
})
})
it('should not be included', () => {
return BaaS.auth.login({username: 'foo', password: 'bar'}).then(user => {
return user.linkWechat(null, {
syncUserProfile: 'overwrite',
})
}).then(res => {
expect(requestStub.getCall(2).args[0]).to.be.deep.equal({
url: config.API.WECHAT.USER_ASSOCIATE,
method: 'POST',
data: {
code: wechatMock.__get__('code'),
}
})
})
})
})
})
it('should call silent-login before force-login call', () => {
return BaaS.auth.loginWithWechat({detail: {userInfo: {}}})
.then(() => {
expect(requestStub.getCall(0).args[0].url).to.equal(config.API.WECHAT.SILENT_LOGIN)
})
}) |
<<<<<<<
'availableWorkspaces': ['singleObject', 'compare', 'bookReading'],
'saveSession' : true,
=======
>>>>>>>
'saveSession' : true, |
<<<<<<<
<Provider store={this.store}>
<App config={config} />
=======
<Provider store={store}>
<I18nextProvider i18n={i18n}>
<App config={config} />
</I18nextProvider>
>>>>>>>
<Provider store={this.store}>
<I18nextProvider i18n={i18n}>
<App config={config} />
</I18nextProvider> |
<<<<<<<
expect(true).toBe(true); //Force beforeEach() setup to run
=======
expect(this.sidePanel instanceof Mirador.SidePanel).toBeTruthy();
expect(this.sidePanel.appendTo).toBeTruthy();
>>>>>>>
expect(true).toBe(true); //Force beforeEach() setup to run
expect(this.sidePanel instanceof Mirador.SidePanel).toBeTruthy();
expect(this.sidePanel.appendTo).toBeTruthy();
<<<<<<<
describe('render', function() {
it('should minimize and unminimize', function() {
subject.render({ open: false });
expect(subject.appendTo).toHaveClass('minimized');
subject.render({ open: true });
expect(subject.appendTo).not.toHaveClass('minimized');
});
=======
describe('render', function() {
it('should render on initialization', function() {
expect(this.sidePanel.appendTo.html()).toBeTruthy();
});
>>>>>>>
describe('render', function() {
it('should render on initialization', function() {
expect(this.sidePanel.appendTo.html()).toBeTruthy();
}); |
<<<<<<<
var showStrokeStyle = false;
this.availableAnnotationStylePickers.forEach(function(picker){
if(picker == 'StrokeType'){
showStrokeStyle = true;
}
});
this.element = jQuery(this.annotationTemplate({
tools : _this.availableAnnotationTools,
showEdit : this.annotationCreationAvailable,
showStrokeStyle: showStrokeStyle,
showRefresh : this.annotationRefresh
})).appendTo(this.container.find('.mirador-osd-annotation-controls'));
this.setBorderFillColorPickers();
if(showStrokeStyle){
this.addStrokeStylePicker();
}
this.hide();
=======
var annotationProperties = this.canvasControls.annotations;
if (annotationProperties.annotationLayer && this.annoEndpointAvailable) {
this.annotationElement = jQuery(this.annotationTemplate({
tools : _this.availableAnnotationTools,
showEdit : annotationProperties.annotationCreation,
showRefresh : annotationProperties.annotationRefresh
})).appendTo(this.container.find('.mirador-osd-annotation-controls'));
this.annotationElement.hide();
this.setQtips(this.annotationElement);
this.setBorderFillColorPickers();
}
if (this.canvasControls.imageManipulation.manipulationLayer) {
this.manipulationElement = jQuery(this.manipulationTemplate({
})).appendTo(this.container.find('.mirador-manipulation-controls'));
this.setQtips(this.manipulationElement);
this.manipulationElement.hide();
}
>>>>>>>
var showStrokeStyle = false;
this.availableAnnotationStylePickers.forEach(function(picker){
if(picker == 'StrokeType'){
showStrokeStyle = true;
}
});
var annotationProperties = this.canvasControls.annotations;
if (annotationProperties.annotationLayer && this.annoEndpointAvailable) {
this.annotationElement = jQuery(this.annotationTemplate({
tools : _this.availableAnnotationTools,
showEdit : annotationProperties.annotationCreation,
showStrokeStyle: showStrokeStyle,
showRefresh : annotationProperties.annotationRefresh
})).appendTo(this.container.find('.mirador-osd-annotation-controls'));
this.annotationElement.hide();
this.setQtips(this.annotationElement);
this.setBorderFillColorPickers();
}
if(showStrokeStyle){
this.addStrokeStylePicker();
}
if (this.canvasControls.imageManipulation.manipulationLayer) {
this.manipulationElement = jQuery(this.manipulationTemplate({
})).appendTo(this.container.find('.mirador-manipulation-controls'));
this.setQtips(this.manipulationElement);
this.manipulationElement.hide();
}
<<<<<<<
addColorPicker:function(selector,options){
this.container.find(selector).spectrum(options);
},
getImagePath:function(imageName){
return this.state.getStateProperty('buildPath') + this.state.getStateProperty('imagesPath') + imageName;
},
setBackgroundImage:function(el,imageName){
el.css('background-image','url('+this.getImagePath(imageName)+')');
},
removeBackgroundImage:function(el){
el.css('background-image','');
},
addStrokeStylePicker:function(){
var _this = this;
var setBackground = {
'solid':function(el){
_this.setBackgroundImage(el,'border_type_1.png');
},
'dashed':function(el){
_this.setBackgroundImage(el, 'border_type_2.png');
},
'dotdashed':function(el){
_this.setBackgroundImage(el, 'border_type_3.png');
}
};
setBackground.solid(this.container.find('.mirador-line-type .solid'));
setBackground.dashed(this.container.find('.mirador-line-type .dashed'));
setBackground.dotdashed(this.container.find('.mirador-line-type .dotdashed'));
this.container.find('.mirador-line-type').on('mouseenter', function() {
_this.container.find('.type-list').stop().slideFadeToggle(300);
});
this.container.find('.mirador-line-type').on('mouseleave', function() {
_this.container.find('.type-list').stop().slideFadeToggle(300);
});
this.container.find('.mirador-line-type').find('ul li').on('click', function() {
var className = jQuery(this).find('i').attr('class').replace(/fa/, '').replace(/ /, '');
_this.removeBackgroundImage(_this.container.find('.mirador-line-type>i'));
setBackground[className](_this.container.find('.mirador-line-type>i'));
_this.eventEmitter.publish('toggleBorderType.' + _this.windowId, className);
});
},
=======
setQtips: function(element) {
element.each(function() {
jQuery(this).qtip({
content: {
text: jQuery(this).attr('title'),
},
position: {
my: 'bottom center',
at: 'top center',
viewport: true
},
style: {
classes: 'qtip-dark qtip-shadow qtip-rounded'
}
});
});
},
>>>>>>>
setQtips: function(element) {
element.each(function() {
jQuery(this).qtip({
content: {
text: jQuery(this).attr('title'),
},
position: {
my: 'bottom center',
at: 'top center',
viewport: true
},
style: {
classes: 'qtip-dark qtip-shadow qtip-rounded'
}
});
});
},
addColorPicker:function(selector,options){
this.container.find(selector).spectrum(options);
},
getImagePath:function(imageName){
return this.state.getStateProperty('buildPath') + this.state.getStateProperty('imagesPath') + imageName;
},
setBackgroundImage:function(el,imageName){
el.css('background-image','url('+this.getImagePath(imageName)+')');
},
removeBackgroundImage:function(el){
el.css('background-image','');
},
addStrokeStylePicker:function(){
var _this = this;
var setBackground = {
'solid':function(el){
_this.setBackgroundImage(el,'border_type_1.png');
},
'dashed':function(el){
_this.setBackgroundImage(el, 'border_type_2.png');
},
'dotdashed':function(el){
_this.setBackgroundImage(el, 'border_type_3.png');
}
};
setBackground.solid(this.container.find('.mirador-line-type .solid'));
setBackground.dashed(this.container.find('.mirador-line-type .dashed'));
setBackground.dotdashed(this.container.find('.mirador-line-type .dotdashed'));
this.container.find('.mirador-line-type').on('mouseenter', function() {
_this.container.find('.type-list').stop().slideFadeToggle(300);
});
this.container.find('.mirador-line-type').on('mouseleave', function() {
_this.container.find('.type-list').stop().slideFadeToggle(300);
});
this.container.find('.mirador-line-type').find('ul li').on('click', function() {
var className = jQuery(this).find('i').attr('class').replace(/fa/, '').replace(/ /, '');
_this.removeBackgroundImage(_this.container.find('.mirador-line-type>i'));
setBackground[className](_this.container.find('.mirador-line-type>i'));
_this.eventEmitter.publish('toggleBorderType.' + _this.windowId, className);
});
},
<<<<<<<
borderPicker.find(".sp-cancel").html('<i class="fa fa-times-circle-o fa-fw"></i>'+i18n.t('cancel'));
borderPicker.find(".sp-cancel").parent().append('<a class="sp-choose" href="#"><i class="fa fa-thumbs-o-up fa-fw"></i>'+ i18n.t('colorPickerChoose') +'</a>');
=======
borderPicker.find(".sp-cancel").html('<i class="fa fa-times-circle-o fa-fw"></i>Cancel');
borderPicker.find(".sp-cancel").parent().append('<a class="sp-choose" href="#"><i class="fa fa-thumbs-o-up fa-fw"></i>Choose</a>');
>>>>>>>
borderPicker.find(".sp-cancel").html('<i class="fa fa-times-circle-o fa-fw"></i>'+i18n.t('cancel'));
borderPicker.find(".sp-cancel").parent().append('<a class="sp-choose" href="#"><i class="fa fa-thumbs-o-up fa-fw"></i>'+ i18n.t('colorPickerChoose') +'</a>');
<<<<<<<
jQuery('.draw-tool:has(input.borderColorPicker)').mouseover(function() {
if(borderPicker.hasClass("sp-hidden")) {
jQuery(this).find(".sp-preview").click();
}
});
jQuery('.draw-tool:has(input.borderColorPicker)').mouseleave(function() {
if(!borderPicker.hasClass("sp-hidden")) {
jQuery(this).find(".sp-preview").click();
}
});
_this.addColorPicker('.fillColorPicker',{
=======
_this.container.find(".fillColorPicker").spectrum({
>>>>>>>
jQuery('.draw-tool:has(input.borderColorPicker)').mouseover(function() {
if(borderPicker.hasClass("sp-hidden")) {
jQuery(this).find(".sp-preview").click();
}
});
jQuery('.draw-tool:has(input.borderColorPicker)').mouseleave(function() {
if(!borderPicker.hasClass("sp-hidden")) {
jQuery(this).find(".sp-preview").click();
}
});
_this.addColorPicker('.fillColorPicker',{
<<<<<<<
fillPicker.find(".sp-cancel").html('<i class="fa fa-times-circle-o fa-fw"></i>'+i18n.t('cancel'));
fillPicker.find(".sp-cancel").parent().append('<a class="sp-choose" href="#"><i class="fa fa-thumbs-o-up fa-fw"></i>'+i18n.t('colorPickerChoose')+'</a>');
=======
fillPicker.find(".sp-cancel").html('<i class="fa fa-times-circle-o fa-fw"></i>Cancel');
fillPicker.find(".sp-cancel").parent().append('<a class="sp-choose" href="#"><i class="fa fa-thumbs-o-up fa-fw"></i>Choose</a>');
>>>>>>>
fillPicker.find(".sp-cancel").html('<i class="fa fa-times-circle-o fa-fw"></i>'+i18n.t('cancel'));
fillPicker.find(".sp-cancel").parent().append('<a class="sp-choose" href="#"><i class="fa fa-thumbs-o-up fa-fw"></i>'+i18n.t('colorPickerChoose')+'</a>'); |
<<<<<<<
=======
var showAnno = typeof this.showAnno !== 'undefined' ? this.showAnno : this.canvasControls.annotations.annotationLayer,
showImageControls = typeof this.showImageControls !== 'undefined' ? this.showImageControls : this.canvasControls.imageManipulation.manipulationLayer;
>>>>>>>
var showAnno = typeof this.showAnno !== 'undefined' ? this.showAnno : this.canvasControls.annotations.annotationLayer,
showImageControls = typeof this.showImageControls !== 'undefined' ? this.showImageControls : this.canvasControls.imageManipulation.manipulationLayer;
<<<<<<<
this.contextControls = new $.ContextControls({
element: null,
container: this.element.find('.mirador-osd-context-controls'),
mode: 'displayAnnotations',
windowId: this.windowId,
canvasControls: this.canvasControls,
annoEndpointAvailable: this.annoEndpointAvailable,
availableAnnotationTools: this.availableAnnotationTools,
availableAnnotationStylePickers: this.availableAnnotationStylePickers,
state: this.state,
eventEmitter: this.eventEmitter
});
=======
if (showAnno || showImageControls) {
this.contextControls = new $.ContextControls({
element: null,
container: this.element.find('.mirador-osd-context-controls'),
mode: 'displayAnnotations',
windowId: this.windowId,
canvasControls: this.canvasControls,
annoEndpointAvailable: this.annoEndpointAvailable,
availableAnnotationTools: this.availableAnnotationTools,
eventEmitter: this.eventEmitter
});
}
>>>>>>>
if (showAnno || showImageControls) {
this.contextControls = new $.ContextControls({
element: null,
container: this.element.find('.mirador-osd-context-controls'),
mode: 'displayAnnotations',
windowId: this.windowId,
canvasControls: this.canvasControls,
annoEndpointAvailable: this.annoEndpointAvailable,
availableAnnotationTools: this.availableAnnotationTools,
eventEmitter: this.eventEmitter
});
}
<<<<<<<
{ name: 'startup', from: 'none', to: 'off' },
{ name: 'displayOn', from: 'off', to: 'pointer'},
{ name: 'displayOff', from: ['pointer', 'shape'], to: 'off'},
{ name: 'choosePointer', from: ['pointer', 'shape'], to: 'pointer'},
{ name: 'chooseShape', from: 'pointer', to: 'shape'},
{ name: 'changeShape', from: 'shape', to: 'shape'},
{ name: 'refresh', from: 'pointer', to: 'pointer'},
{ name: 'refresh', from: 'shape', to: 'shape'}
=======
{ name: 'startup', from: 'none', to: 'annoOff' },
{ name: 'displayOn', from: 'annoOff', to: 'annoOnCreateOff' },
{ name: 'refreshCreateOff', from: 'annoOnCreateOff', to: 'annoOnCreateOff' },
{ name: 'createOn', from: ['annoOff','annoOnCreateOff'], to: 'annoOnCreateOn' },
{ name: 'refreshCreateOn', from: 'annoOnCreateOn', to: 'annoOnCreateOn' },
{ name: 'createOff', from: 'annoOnCreateOn', to: 'annoOnCreateOff' },
{ name: 'displayOff', from: ['annoOnCreateOn','annoOnCreateOff'], to: 'annoOff' }
>>>>>>>
{ name: 'startup', from: 'none', to: 'off' },
{ name: 'displayOn', from: 'off', to: 'pointer'},
{ name: 'displayOff', from: ['pointer', 'shape'], to: 'off'},
{ name: 'choosePointer', from: ['pointer', 'shape'], to: 'pointer'},
{ name: 'chooseShape', from: 'pointer', to: 'shape'},
{ name: 'changeShape', from: 'shape', to: 'shape'},
{ name: 'refresh', from: 'pointer', to: 'pointer'},
{ name: 'refresh', from: 'shape', to: 'shape'}
<<<<<<<
}
=======
}
_this.eventEmitter.publish('modeChange.' + _this.windowId, 'displayAnnotations');
_this.eventEmitter.publish(('windowUpdated'), {
id: _this.windowId,
annotationState: to
});
},
onrefreshCreateOff: function(event, from, to) {
>>>>>>>
}
<<<<<<<
onchooseShape: function(event, from, to, shape) {
_this.eventEmitter.publish('HUD_REMOVE_CLASS.'+_this.windowId, ['.mirador-osd-pointer-mode', 'selected']);
=======
oncreateOff: function(event, from, to) {
>>>>>>>
onchooseShape: function(event, from, to, shape) {
_this.eventEmitter.publish('HUD_REMOVE_CLASS.'+_this.windowId, ['.mirador-osd-pointer-mode', 'selected']);
<<<<<<<
onchangeShape: function(event, from, to, shape) {
_this.eventEmitter.publish('HUD_REMOVE_CLASS.'+_this.windowId, ['.mirador-osd-pointer-mode', 'selected']);
_this.eventEmitter.publish('HUD_REMOVE_CLASS.'+_this.windowId, ['.mirador-osd-edit-mode', 'selected']);
_this.eventEmitter.publish('HUD_ADD_CLASS.'+_this.windowId, ['.mirador-osd-'+shape+'-mode', 'selected']);
//don't need to trigger a mode change, just change tool
_this.eventEmitter.publish('toggleDrawingTool.'+_this.windowId, shape);
=======
ondisplayOff: function(event, from, to) {
if (_this.annoEndpointAvailable) {
_this.eventEmitter.publish('HUD_REMOVE_CLASS.'+_this.windowId, ['.mirador-osd-edit-mode', 'selected']);
_this.contextControls.annotationHide();
}
_this.eventEmitter.publish('HUD_REMOVE_CLASS.'+_this.windowId, ['.mirador-osd-annotations-layer', 'selected']);
_this.eventEmitter.publish('modeChange.' + _this.windowId, 'default');
>>>>>>>
onchangeShape: function(event, from, to, shape) {
_this.eventEmitter.publish('HUD_REMOVE_CLASS.'+_this.windowId, ['.mirador-osd-pointer-mode', 'selected']);
_this.eventEmitter.publish('HUD_REMOVE_CLASS.'+_this.windowId, ['.mirador-osd-edit-mode', 'selected']);
_this.eventEmitter.publish('HUD_ADD_CLASS.'+_this.windowId, ['.mirador-osd-'+shape+'-mode', 'selected']);
//don't need to trigger a mode change, just change tool
_this.eventEmitter.publish('toggleDrawingTool.'+_this.windowId, shape); |
<<<<<<<
},
get: function(prop) {
return this[prop];
},
set: function(prop, value, options) {
_this = this;
this[prop] = value;
console.log(value);
jQuery.publish(prop + '.set');
},
=======
//add workspaces select
this.workspacesSelect = new $.WorkspacesSelect({appendTo: this.element, parent: this});
},
>>>>>>>
//add workspaces select
this.workspacesSelect = new $.WorkspacesSelect({appendTo: this.element, parent: this});
},
get: function(prop) {
return this[prop];
},
set: function(prop, value, options) {
_this = this;
this[prop] = value;
console.log(value);
jQuery.publish(prop + '.set');
}, |
<<<<<<<
// Generated by CoffeeScript 1.12.3
var Connection, clone, http, is_object, krb5, url;
=======
// Generated by CoffeeScript 1.12.6
var Connection, clone, http, krb5, url;
>>>>>>>
// Generated by CoffeeScript 1.12.6
var Connection, clone, http, krb5, url;
// Generated by CoffeeScript 1.12.3
var Connection, clone, http, is_object, krb5, url; |
<<<<<<<
nl: 'Nederlands',
=======
'pt-BR': 'Português do Brasil',
>>>>>>>
nl: 'Nederlands',
'pt-BR': 'Português do Brasil', |
<<<<<<<
var windowConfig = {
state: new Mirador.SaveController(jQuery.extend(true, {}, Mirador.DEFAULT_SETTINGS, {eventEmitter:this.eventEmitter}))
};
jasmine.getJSONFixtures().fixturesPath = 'spec/fixtures';
=======
>>>>>>>
var windowConfig = {
state: new Mirador.SaveController(jQuery.extend(true, {}, Mirador.DEFAULT_SETTINGS, {eventEmitter:this.eventEmitter}))
};
jasmine.getJSONFixtures().fixturesPath = 'spec/fixtures';
<<<<<<<
describe('bindEvents', function () {
it('should add item when Add Item is clicked', function() {
spyOn(subject, 'addItem').and.callThrough();
subject.element.find('.addItemLink').click();
expect(subject.addItem).toHaveBeenCalled();
});
it('should remove itself when Remove Slot is clicked', function() {
spyOn(subject.eventEmitter, 'publish').and.callThrough();
subject.element.find('.remove-slot-option').click();
expect(subject.eventEmitter.publish).toHaveBeenCalledWith('REMOVE_NODE', subject);
});
it('should receive a drop', function() {
spyOn(subject, 'dropItem');
subject.element.trigger('drop');
expect(subject.dropItem).toHaveBeenCalled();
});
it('should prevent defaults on drops', function() {
var spyDragOver = spyOnEvent(subject.element, 'dragover'),
spyDragEnter = spyOnEvent(subject.element.find('.dropMask'), 'dragenter'),
spyDragLeave = spyOnEvent(subject.element.find('.dropMask'), 'dragleave');
subject.element.trigger('dragover');
expect(spyDragOver).toHaveBeenPrevented();
expect(subject.element.find('.dropMask')).toExist();
subject.element.find('.dropMask').trigger('dragenter');
expect(spyDragEnter).toHaveBeenPrevented();
expect(subject.element).toHaveClass('draggedOver');
subject.element.find('.dropMask').trigger('dragleave');
expect(spyDragLeave).toHaveBeenPrevented();
expect(subject.element).not.toHaveClass('draggedOver');
});
=======
xit('bindEvents', function () {
>>>>>>>
describe('bindEvents', function () {
it('should add item when Add Item is clicked', function() {
spyOn(subject, 'addItem').and.callThrough();
subject.element.find('.addItemLink').click();
expect(subject.addItem).toHaveBeenCalled();
});
it('should remove itself when Remove Slot is clicked', function() {
spyOn(subject.eventEmitter, 'publish').and.callThrough();
subject.element.find('.remove-slot-option').click();
expect(subject.eventEmitter.publish).toHaveBeenCalledWith('REMOVE_NODE', subject);
});
it('should receive a drop', function() {
spyOn(subject, 'dropItem');
subject.element.trigger('drop');
expect(subject.dropItem).toHaveBeenCalled();
});
it('should prevent defaults on drops', function() {
var spyDragOver = spyOnEvent(subject.element, 'dragover'),
spyDragEnter = spyOnEvent(subject.element.find('.dropMask'), 'dragenter'),
spyDragLeave = spyOnEvent(subject.element.find('.dropMask'), 'dragleave');
subject.element.trigger('dragover');
expect(spyDragOver).toHaveBeenPrevented();
expect(subject.element.find('.dropMask')).toExist();
subject.element.find('.dropMask').trigger('dragenter');
expect(spyDragEnter).toHaveBeenPrevented();
expect(subject.element).toHaveClass('draggedOver');
subject.element.find('.dropMask').trigger('dragleave');
expect(spyDragLeave).toHaveBeenPrevented();
expect(subject.element).not.toHaveClass('draggedOver');
}); |
<<<<<<<
handleClick: this.onInputClick,
=======
includeDates: this.props.includeDates,
>>>>>>>
handleClick: this.onInputClick,
includeDates: this.props.includeDates, |
<<<<<<<
constructor($element, aircraftController, navigationLibrary) {
=======
constructor($element, navigationLibrary, scopeModel) {
>>>>>>>
constructor($element, aircraftController, navigationLibrary, scopeModel) {
<<<<<<<
this._aircraftController = aircraftController;
=======
this._scopeModel = scopeModel;
>>>>>>>
this._aircraftController = aircraftController;
<<<<<<<
this.canvas.last = TimeKeeper.gameTime;
/**
* Flag used to determine if the Aircraft canvas should be updated
*
* @property _shouldShallowRender
* @type {boolean}
* @default true
*/
this._shouldShallowRender = true;
/**
* Flag used to determine if _all_ canvases should be updated
*
* When this is true, the non-updating canvases like terrain, fix labels,
* video map, etc will be recalculated and re-drawn.
*
* This should only be true when the view changes via zoom/pan or airport change
*
* @property _shouldDeepRender
* @type {boolean}
* @default true
*/
this._shouldDeepRender = true;
/**
* Flag used to determine if fix labels should be displayed
*
* @property _shouldDrawLabels
* @type {boolean}
* @default false
*/
this._shouldDrawLabels = false;
/**
* Flag used to determine if restricted areas should be displayed
*
* @property _shouldDrawRestrictedAreas
* @type {boolean}
* @default false
*/
this._shouldDrawRestrictedAreas = false;
/**
* Flag used to determine if the sid map should be displayed
*
* @property _shouldDrawSidMap
* @type {boolean}
* @default false
*/
this._shouldDrawSidMap = false;
/**
* Flag used to determine if terrain should be displayed
*
* @property _shouldDrawTerrain
* @type {boolean}
* @default true
*/
this._shouldDrawTerrain = true;
/**
* has a console.warn been output for terrain?
*
* This is meant for airport contributors designing new airports
*
* @property _hasSeenTerrainWarning
* @type {boolean}
* @default false
*/
this._hasSeenTerrainWarning = false;
=======
this.canvas.last = TimeKeeper.gameTime;
this.canvas.dirty = true;
this.canvas.draw_labels = false;
this.canvas.draw_restricted = false;
this.canvas.draw_sids = false;
this.canvas.draw_terrain = true;
// has a console.warn been output for terrain?
this.has_terrain_warning = false;
>>>>>>>
this.canvas.last = TimeKeeper.gameTime;
/**
* Flag used to determine if the Aircraft canvas should be updated
*
* @property _shouldShallowRender
* @type {boolean}
* @default true
*/
this._shouldShallowRender = true;
/**
* Flag used to determine if _all_ canvases should be updated
*
* When this is true, the non-updating canvases like terrain, fix labels,
* video map, etc will be recalculated and re-drawn.
*
* This should only be true when the view changes via zoom/pan or airport change
*
* @property _shouldDeepRender
* @type {boolean}
* @default true
*/
this._shouldDeepRender = true;
/**
* Flag used to determine if fix labels should be displayed
*
* @property _shouldDrawLabels
* @type {boolean}
* @default false
*/
this._shouldDrawLabels = false;
/**
* Flag used to determine if restricted areas should be displayed
*
* @property _shouldDrawRestrictedAreas
* @type {boolean}
* @default false
*/
this._shouldDrawRestrictedAreas = false;
/**
* Flag used to determine if the sid map should be displayed
*
* @property _shouldDrawSidMap
* @type {boolean}
* @default false
*/
this._shouldDrawSidMap = false;
/**
* Flag used to determine if terrain should be displayed
*
* @property _shouldDrawTerrain
* @type {boolean}
* @default true
*/
this._shouldDrawTerrain = true;
/**
* has a console.warn been output for terrain?
*
* This is meant for airport contributors designing new airports
*
* @property _hasSeenTerrainWarning
* @type {boolean}
* @default false
*/
this._hasSeenTerrainWarning = false;
<<<<<<<
this.canvas.last = -1;
this._shouldShallowRender = true;
this._shouldDeepRender = true;
this._shouldDrawLabels = false;
this._shouldDrawRestrictedAreas = false;
this._shouldDrawSidMap = false;
this._shouldDrawTerrain = true;
=======
this.canvas.last = TimeKeeper.gameTime;
this.canvas.dirty = true;
this.canvas.draw_labels = false;
this.canvas.draw_restricted = false;
this.canvas.draw_sids = false;
this.canvas.draw_terrain = true;
>>>>>>>
this.canvas.last = TimeKeeper.gameTime;
this._shouldShallowRender = true;
this._shouldDeepRender = true;
this._shouldDrawLabels = false;
this._shouldDrawRestrictedAreas = false;
this._shouldDrawSidMap = false;
this._shouldDrawTerrain = true;
<<<<<<<
this.canvas_clear(cc);
this.canvas_fill_background(cc);
=======
this.canvas_clear(cc);
this.canvas_fill_background(cc);
cc.translate(middleWidth, middleHeight);
cc.save();
>>>>>>>
this.canvas_clear(cc);
this.canvas_fill_background(cc);
<<<<<<<
cc.translate(middleWidth, middleHeight);
this.canvas_draw_all_aircraft(cc);
=======
cc.translate(middleWidth, middleHeight);
this.canvas_draw_radar_targets(cc);
>>>>>>>
cc.translate(middleWidth, middleHeight);
this.canvas_draw_radar_targets(cc);
<<<<<<<
cc.translate(middleWidth, middleHeight);
this.canvas_draw_all_info(cc);
=======
cc.translate(middleWidth, middleHeight);
this.canvas_draw_data_blocks(cc);
>>>>>>>
cc.translate(middleWidth, middleHeight);
this.canvas_draw_data_blocks(cc);
<<<<<<<
this.canvas.last = currentTime;
=======
this.canvas.last = currentTime;
>>>>>>>
this.canvas.last = currentTime; |
<<<<<<<
=======
import { GAME_EVENTS } from '../game/GameController';
import { REGEX } from '../constants/globalConstants';
>>>>>>>
import { REGEX } from '../constants/globalConstants'; |
<<<<<<<
canvas_add("info");
canvas_add("aircraft");
=======
>>>>>>> |
<<<<<<<
=======
* @property DEFAULT_AIRPORT_ICAO
* @type {string}
* @final
*/
const DEFAULT_AIRPORT_ICAO = 'ksfo';
/**
* Responsible for maintaining references to all the available airports
*
>>>>>>>
* Responsible for maintaining references to all the available airports
* |
<<<<<<<
=======
import EventBus from './lib/EventBus';
import GameController from './game/GameController';
import { clamp } from './math/core';
>>>>>>>
import { clamp } from './math/core';
<<<<<<<
if (match === INVALID_NUMBER) {
this._uiController.ui_log('no such aircraft, say again');
=======
if (match === -1) {
UiController.ui_log('no such aircraft, say again');
>>>>>>>
if (match === INVALID_NUMBER) {
UiController.ui_log('no such aircraft, say again'); |
<<<<<<<
import { airportPositionFixture } from '../../fixtures/airportFixtures';
import { FIX_LIST_MOCK } from '../fix/_mocks/fixMocks';
=======
import { airportPositionFixtureKSFO } from '../../fixtures/airportFixtures';
import { FIX_LIST_MOCK } from '../Fix/_mocks/fixMocks';
>>>>>>>
import { airportPositionFixtureKSFO } from '../../fixtures/airportFixtures';
import { FIX_LIST_MOCK } from '../fix/_mocks/fixMocks'; |
<<<<<<<
if (!aircraft.isInsideAirspace) {
cc.fillStyle = COLORS.LIGHT_SILVER;
=======
if (!aircraft.inside_ctr) {
cc.fillStyle = this.theme.RADAR_TARGET_OUTSIDE_RANGE;
>>>>>>>
if (!aircraft.isInsideAirspace) {
cc.fillStyle = this.theme.RADAR_TARGET_OUTSIDE_RANGE;
<<<<<<<
if (!aircraft.isInsideAirspace) {
cc.fillStyle = COLORS.LIGHT_SILVER_03;
} else if (almost_match) {
cc.fillStyle = COLORS.GRAIN_BROWN;
} else if (match) {
cc.fillStyle = COLORS.WHITE;
} else if (aircraft.warning || alerts[1]) {
cc.fillStyle = COLORS.RED;
} else if (aircraft.hit) {
cc.fillStyle = COLORS.CORAL_RED;
} else {
cc.fillStyle = COLORS.WHITE;
}
=======
>>>>>>>
<<<<<<<
if (!aircraft.isInsideAirspace) {
cc.fillStyle = COLORS.WHITE_03;
=======
if (!aircraft.inside_ctr) {
cc.fillStyle = this.theme.RADAR_TARGET_OUTSIDE_RANGE;
>>>>>>>
if (!aircraft.isInsideAirspace) {
cc.fillStyle = this.theme.RADAR_TARGET_OUTSIDE_RANGE;
<<<<<<<
alpha = 0.9;
} else if (aircraft.isInsideAirspace) {
// else if (almost_match) var alpha = 0.75;
alpha = 0.5;
=======
red = this.theme.DATA_BLOCK.SELECTED.ARRIVAL_BAR;
green = this.theme.DATA_BLOCK.SELECTED.BACKGROUND;
blue = this.theme.DATA_BLOCK.SELECTED.DEPARTURE_BAR;
white = this.theme.DATA_BLOCK.SELECTED.TEXT;
} else if (aircraft.inside_ctr) {
red = this.theme.DATA_BLOCK.IN_RANGE.ARRIVAL_BAR;
green = this.theme.DATA_BLOCK.IN_RANGE.BACKGROUND;
blue = this.theme.DATA_BLOCK.IN_RANGE.DEPARTURE_BAR;
white = this.theme.DATA_BLOCK.IN_RANGE.TEXT;
>>>>>>>
alpha = 0.9;
} else if (aircraft.isInsideAirspace) {
// else if (almost_match) var alpha = 0.75;
alpha = 0.5;
red = this.theme.DATA_BLOCK.SELECTED.ARRIVAL_BAR;
green = this.theme.DATA_BLOCK.SELECTED.BACKGROUND;
blue = this.theme.DATA_BLOCK.SELECTED.DEPARTURE_BAR;
white = this.theme.DATA_BLOCK.SELECTED.TEXT;
<<<<<<<
if (aircraft.isInsideAirspace) {
cc.fillStyle = COLORS.WHITE_08;
=======
if (aircraft.inside_ctr) {
cc.fillStyle = this.theme.DATA_BLOCK.IN_RANGE.TEXT;
>>>>>>>
if (aircraft.isInsideAirspace) {
cc.fillStyle = this.theme.DATA_BLOCK.IN_RANGE.TEXT; |
<<<<<<<
=======
import {
airportControllerFixture,
resetAirportControllerFixture
} from '../fixtures/airportFixtures';
import { navigationLibraryFixture } from '../fixtures/navigationLibraryFixtures';
>>>>>>>
import {
airportControllerFixture,
resetAirportControllerFixture
} from '../fixtures/airportFixtures';
import { navigationLibraryFixture } from '../fixtures/navigationLibraryFixtures'; |
<<<<<<<
if (aircraft.datablockDir === INVALID_NUMBER) {
if (-window.uiController.km_to_px(aircraft.relativePosition[1]) + this.canvas.size.height / 2 < height * 1.5) {
=======
if (aircraft.datablockDir === -1) {
if (-UiController.km_to_px(aircraft.relativePosition[1]) + this.canvas.size.height / 2 < height * 1.5) {
>>>>>>>
if (aircraft.datablockDir === INVALID_NUMBER) {
if (-UiController.km_to_px(aircraft.relativePosition[1]) + this.canvas.size.height / 2 < height * 1.5) { |
<<<<<<<
date: new Date('2018-10-31'),
changes: <>Added <SpellLink id={SPELLS.TRADEWINDS.id} /> module.</>,
contributors: [Fyruna],
},
{
=======
date: new Date('2018-11-02'),
changes: <>Added <SpellLink id={SPELLS.UNSTABLE_CATALYST.id} /> module.</>,
contributors: [niseko],
},
{
date: new Date('2018-11-01'),
changes: <>Added <SpellLink id={SPELLS.SWIRLING_SANDS.id} /> module.</>,
contributors: [niseko],
},
{
>>>>>>>
date: new Date('2018-11-02'),
changes: <>Added <SpellLink id={SPELLS.TRADEWINDS.id} /> module.</>,
contributors: [Fyruna],
},
{
date: new Date('2018-11-02'),
changes: <>Added <SpellLink id={SPELLS.UNSTABLE_CATALYST.id} /> module.</>,
contributors: [niseko],
},
{
date: new Date('2018-11-01'),
changes: <>Added <SpellLink id={SPELLS.SWIRLING_SANDS.id} /> module.</>,
contributors: [niseko],
},
{ |
<<<<<<<
if (regex.color.test(text)) {
var match, bg;
while (match = regex.color.exec(text)) {
var color = "color-" + match[1];
if (match[2]) {
bg = match[2];
}
if (bg) {
color += " bg-" + bg;
}
var text = text.replace(
match[0],
"<span class='" + color + "'>" + match[3] + "</span>"
);
}
}
for (var i in regex.styles) {
var pattern = regex.styles[i][0];
var style = regex.styles[i][1];
if (pattern.test(text)) {
var match;
while (match = pattern.exec(text)) {
text = text.replace(match[0], style[0] + match[1] + style[1]);
}
}
}
return text;
=======
if (regex.terminator.test(text)) {
return $.map(text.split(regex.terminator), colors);
}
if (regex.color.test(text)) {
var match;
while (match = regex.color.exec(text)) {
var color = "color-" + match[1];
var bg = match[2];
if (bg) {
color += " bg-" + bg;
}
var text = text.replace(
match[0],
"<span class='" + color + "'>" + match[3] + "</span>"
);
}
}
for (var i in regex.styles) {
var pattern = regex.styles[i][0];
var style = regex.styles[i][1];
if (pattern.test(text)) {
var match;
while (match = pattern.exec(text)) {
text = text.replace(match[0], style[0] + match[1] + style[1]);
}
}
}
return text;
>>>>>>>
if (regex.terminator.test(text)) {
return $.map(text.split(regex.terminator), colors);
}
if (regex.color.test(text)) {
var match, bg;
while (match = regex.color.exec(text)) {
var color = "color-" + match[1];
if (match[2]) {
bg = match[2];
}
if (bg) {
color += " bg-" + bg;
}
var text = text.replace(
match[0],
"<span class='" + color + "'>" + match[3] + "</span>"
);
}
}
for (var i in regex.styles) {
var pattern = regex.styles[i][0];
var style = regex.styles[i][1];
if (pattern.test(text)) {
var match;
while (match = pattern.exec(text)) {
text = text.replace(match[0], style[0] + match[1] + style[1]);
}
}
}
return text; |
<<<<<<<
Gates.InputGates = InputGates;
Gates.InterleaveBitsGates = InterleaveBitsGates;
=======
Gates.ModularArithmeticGates = ModularArithmeticGates;
>>>>>>>
Gates.InputGates = InputGates;
Gates.InterleaveBitsGates = InterleaveBitsGates;
Gates.ModularArithmeticGates = ModularArithmeticGates;
<<<<<<<
...InterleaveBitsGates.all,
=======
...ModularArithmeticGates.all,
>>>>>>>
...InterleaveBitsGates.all,
...ModularArithmeticGates.all, |
<<<<<<<
lastVec: new Vector(),
=======
maxVec: new Vector(1, 1),
minVec: new Vector(-1, -1),
>>>>>>>
lastVec: new Vector(),
maxVec: new Vector(1, 1),
minVec: new Vector(-1, -1), |
<<<<<<<
var buttoncss = fs.readFileSync(path.join(__dirname, 'components', 'styles', 'button.css'))
var intervalcss = fs.readFileSync(path.join(__dirname, 'components', 'styles', 'interval.css'))
=======
var selectcss = fs.readFileSync(path.join(__dirname, 'components', 'styles', 'select.css'))
>>>>>>>
var buttoncss = fs.readFileSync(path.join(__dirname, 'components', 'styles', 'button.css'))
var intervalcss = fs.readFileSync(path.join(__dirname, 'components', 'styles', 'interval.css'))
var selectcss = fs.readFileSync(path.join(__dirname, 'components', 'styles', 'select.css'))
<<<<<<<
buttoncss = String(buttoncss)
.replace(new RegExp('{{ BUTTON_COLOR }}', 'g'), opts.theme.text2)
.replace(new RegExp('{{ BUTTON_BG }}', 'g'), opts.theme.background2)
.replace(new RegExp('{{ BUTTON_COLOR_HOVER }}', 'g'), opts.theme.text2)
.replace(new RegExp('{{ BUTTON_BG_HOVER }}', 'g'), opts.theme.background2hover)
.replace(new RegExp('{{ BUTTON_COLOR_ACTIVE }}', 'g'), opts.theme.background2)
.replace(new RegExp('{{ BUTTON_BG_ACTIVE }}', 'g'), opts.theme.text2)
intervalcss = String(intervalcss)
.replace(new RegExp('{{ INTERVAL_COLOR }}', 'g'), opts.theme.foreground1)
.replace(new RegExp('{{ TRACK_COLOR }}', 'g'), opts.theme.background2)
.replace(new RegExp('{{ UUID }}', 'g'), id)
=======
selectcss = String(selectcss)
.replace(new RegExp('{{ TEXT_COLOR }}', 'g'), opts.theme.foreground1)
.replace(new RegExp('{{ BG_COLOR }}', 'g'), opts.theme.background2)
.replace(new RegExp('{{ BG_COLOR_HOVER }}', 'g'), opts.theme.background2hover)
.replace(new RegExp('{{ UUID }}', 'g'), id)
insertcss(selectcss)
>>>>>>>
buttoncss = String(buttoncss)
.replace(new RegExp('{{ BUTTON_COLOR }}', 'g'), opts.theme.text2)
.replace(new RegExp('{{ BUTTON_BG }}', 'g'), opts.theme.background2)
.replace(new RegExp('{{ BUTTON_COLOR_HOVER }}', 'g'), opts.theme.text2)
.replace(new RegExp('{{ BUTTON_BG_HOVER }}', 'g'), opts.theme.background2hover)
.replace(new RegExp('{{ BUTTON_COLOR_ACTIVE }}', 'g'), opts.theme.background2)
.replace(new RegExp('{{ BUTTON_BG_ACTIVE }}', 'g'), opts.theme.text2)
intervalcss = String(intervalcss)
.replace(new RegExp('{{ INTERVAL_COLOR }}', 'g'), opts.theme.foreground1)
.replace(new RegExp('{{ TRACK_COLOR }}', 'g'), opts.theme.background2)
.replace(new RegExp('{{ UUID }}', 'g'), id)
selectcss = String(selectcss)
.replace(new RegExp('{{ TEXT_COLOR }}', 'g'), opts.theme.foreground1)
.replace(new RegExp('{{ BG_COLOR }}', 'g'), opts.theme.background2)
.replace(new RegExp('{{ BG_COLOR_HOVER }}', 'g'), opts.theme.background2hover)
.replace(new RegExp('{{ UUID }}', 'g'), id)
insertcss(selectcss)
<<<<<<<
if (opts.position === 'top-right' ||
opts.position === 'top-left' ||
opts.position === 'bottom-right' ||
opts.position === 'bottom-left') css(box, {position: 'absolute'})
=======
if (opts.position === 'top-right'
|| opts.position === 'top-left'
|| opts.position === 'bottom-right'
|| opts.position === 'bottom-left') css(box, {position: 'absolute'})
>>>>>>>
if (opts.position === 'top-right' ||
opts.position === 'top-left' ||
opts.position === 'bottom-right' ||
opts.position === 'bottom-left') css(box, {position: 'absolute'})
<<<<<<<
color: require('./components/color'),
interval: require('./components/interval')
=======
color: require('./components/color'),
select: require('./components/select')
>>>>>>>
color: require('./components/color'),
interval: require('./components/interval'),
select: require('./components/select') |
<<<<<<<
var buttoncss = fs.readFileSync(path.join(__dirname, 'components', 'styles', 'button.css'))
=======
var intervalcss = fs.readFileSync(path.join(__dirname, 'components', 'styles', 'interval.css'))
>>>>>>>
var buttoncss = fs.readFileSync(path.join(__dirname, 'components', 'styles', 'button.css'))
var intervalcss = fs.readFileSync(path.join(__dirname, 'components', 'styles', 'interval.css'))
<<<<<<<
buttoncss = String(buttoncss)
.replace(new RegExp('{{ BUTTON_COLOR }}', 'g'), opts.theme.text2)
.replace(new RegExp('{{ BUTTON_BG }}', 'g'), opts.theme.background2)
.replace(new RegExp('{{ BUTTON_COLOR_HOVER }}', 'g'), opts.theme.text2)
.replace(new RegExp('{{ BUTTON_BG_HOVER }}', 'g'), opts.theme.background2hover)
.replace(new RegExp('{{ BUTTON_COLOR_ACTIVE }}', 'g'), opts.theme.background2)
.replace(new RegExp('{{ BUTTON_BG_ACTIVE }}', 'g'), opts.theme.text2)
=======
intervalcss = String(intervalcss)
.replace(new RegExp('{{ INTERVAL_COLOR }}', 'g'), opts.theme.foreground1)
.replace(new RegExp('{{ TRACK_COLOR }}', 'g'), opts.theme.background2)
.replace(new RegExp('{{ UUID }}', 'g'), id)
>>>>>>>
buttoncss = String(buttoncss)
.replace(new RegExp('{{ BUTTON_COLOR }}', 'g'), opts.theme.text2)
.replace(new RegExp('{{ BUTTON_BG }}', 'g'), opts.theme.background2)
.replace(new RegExp('{{ BUTTON_COLOR_HOVER }}', 'g'), opts.theme.text2)
.replace(new RegExp('{{ BUTTON_BG_HOVER }}', 'g'), opts.theme.background2hover)
.replace(new RegExp('{{ BUTTON_COLOR_ACTIVE }}', 'g'), opts.theme.background2)
.replace(new RegExp('{{ BUTTON_BG_ACTIVE }}', 'g'), opts.theme.text2)
intervalcss = String(intervalcss)
.replace(new RegExp('{{ INTERVAL_COLOR }}', 'g'), opts.theme.foreground1)
.replace(new RegExp('{{ TRACK_COLOR }}', 'g'), opts.theme.background2)
.replace(new RegExp('{{ UUID }}', 'g'), id)
<<<<<<<
insertcss(buttoncss)
=======
insertcss(checkboxcss)
insertcss(intervalcss)
>>>>>>>
insertcss(checkboxcss)
insertcss(intervalcss)
insertcss(buttoncss) |
<<<<<<<
isInitialized[reducerName] = true;
log('initialize');
=======
isInitialized = true;
>>>>>>>
isInitialized[reducerName] = true;
<<<<<<<
log('change');
log(change);
log('!equal will SET_REDUCER', change.doc.state, store.getState());
=======
>>>>>>>
<<<<<<<
log('setReducert');
=======
>>>>>>>
<<<<<<<
log('saveReducer');
saveReducer(store.getState());
=======
saveReducer(change.doc._id, store.getState());
>>>>>>>
saveReducer(store.getState());
<<<<<<<
}).catch(console.error.bind(console));
=======
}).catch(console.error.bind(console));
return store;
};
export const persistentReducer = reducer => {
let lastState;
>>>>>>>
}).catch(console.error.bind(console));
<<<<<<<
log('reduce this', state, action);
=======
>>>>>>>
<<<<<<<
log('reducedState', reducedState);
=======
>>>>>>> |
<<<<<<<
firebaseRef = HNService.storiesRef(this.type)
firebaseRef.on('value', this.onStoriesUpdated)
if (typeof window === 'undefined') return
=======
if (SettingsStore.offlineMode) {
HNServiceRest.storiesRef(this.type).then(function(res) {
return res.json()
}).then(function(snapshot) {
this.onStoriesUpdated(snapshot)
}.bind(this))
}
else {
firebaseRef = HNService.storiesRef(this.type)
firebaseRef.on('value', this.onStoriesUpdated)
}
>>>>>>>
if (typeof window === 'undefined') return
if (SettingsStore.offlineMode) {
HNServiceRest.storiesRef(this.type).then(function(res) {
return res.json()
}).then(function(snapshot) {
this.onStoriesUpdated(snapshot)
}.bind(this))
}
else {
firebaseRef = HNService.storiesRef(this.type)
firebaseRef.on('value', this.onStoriesUpdated)
}
<<<<<<<
if (typeof window === 'undefined') return
idCache = parseJSON(window.sessionStorage.idCache, {})
itemCache = parseJSON(window.sessionStorage.itemCache, {})
=======
if (SettingsStore.offlineMode) {
idCache = parseJSON(window.localStorage.idCache, {})
itemCache = parseJSON(window.localStorage.itemCache, {})
}
else {
idCache = parseJSON(window.sessionStorage.idCache, {})
itemCache = parseJSON(window.sessionStorage.itemCache, {})
}
>>>>>>>
if (typeof window === 'undefined') return
if (SettingsStore.offlineMode) {
idCache = parseJSON(window.localStorage.idCache, {})
itemCache = parseJSON(window.localStorage.itemCache, {})
}
else {
idCache = parseJSON(window.sessionStorage.idCache, {})
itemCache = parseJSON(window.sessionStorage.itemCache, {})
}
<<<<<<<
if (typeof window === 'undefined') return
window.sessionStorage.idCache = JSON.stringify(idCache)
window.sessionStorage.itemCache = JSON.stringify(itemCache)
=======
if (SettingsStore.offlineMode) {
window.localStorage.setItem('idCache', JSON.stringify(idCache))
window.localStorage.setItem('itemCache', JSON.stringify(itemCache))
}
else {
window.sessionStorage.idCache = JSON.stringify(idCache)
window.sessionStorage.itemCache = JSON.stringify(itemCache)
}
>>>>>>>
if (typeof window === 'undefined') return
if (SettingsStore.offlineMode) {
window.localStorage.setItem('idCache', JSON.stringify(idCache))
window.localStorage.setItem('itemCache', JSON.stringify(itemCache))
}
else {
window.sessionStorage.idCache = JSON.stringify(idCache)
window.sessionStorage.itemCache = JSON.stringify(itemCache)
} |
<<<<<<<
if (typeof at_2x_path !== "undefined" && at_2x_path !== null) {
this.at_2x_path = at_2x_path;
this.perform_check = false;
} else {
this.at_2x_path = path.replace(/\.\w+$/, function(match) { return "@2x" + match; });
this.perform_check = true;
}
=======
this.at_2x_path = path.replace(/\.\w+$/, function(match) { return config.retinaImageSuffix + match; });
>>>>>>>
if (typeof at_2x_path !== "undefined" && at_2x_path !== null) {
this.at_2x_path = at_2x_path;
this.perform_check = false;
} else {
this.at_2x_path = path.replace(/\.\w+$/, function(match) { return config.retinaImageSuffix + match; });
this.perform_check = true;
} |
<<<<<<<
it('SliceTiming should be the same length as the k dimension of the corresponding nifti header', function(){
var jsonContents = {
'/sub-15/func/sub-15_task-mixedeventrelatedprobe_run-01_bold.json': {
"RepetitionTime": 16.5,
"TaskName": "AntiSaccade (AS) Rewarded & Neutral with varying dot position",
"EchoTime": 0.025,
"EffectiveEchoSpacing": .05,
"NumberofPhaseEncodingSteps": 64,
"FlipAngle": 70,
"PhaseEncodingDirection": "j",
"SliceTiming": [
0.0,
1.3448,
1.6207,
1.3966,
0.6724,
1.4483,
1.7241
]
}
};
var testFile = {
name: 'sub-15_task-mixedeventrelatedprobe_run-01_bold.nii.gz',
relativePath: '/sub-15/func/sub-15_task-mixedeventrelatedprobe_run-01_bold.nii.gz'
};
var header = {
dim: [ 4, 128, 128, 7, 71 ],
pixdim: [ -1, 2, 2, 2, 16.5 ],
xyzt_units: [ 'mm', 'mm', 'mm', 's' ]
};
var events = [
'/sub-15/func/sub-15_task-mixedeventrelatedprobe_run-01_events.tsv',
'/sub-15/run-01_events.tsv'
];
validate.NIFTI(header, testFile, jsonContents, {}, [], events, function (issues) {
assert.deepEqual(issues, []);
});
});
it('SliceTiming should not have a length different than the k dimension of the corresponding nifti header', function(){
var jsonContents = {
'/sub-15/func/sub-15_task-mixedeventrelatedprobe_run-01_bold.json': {
"RepetitionTime": 16.5,
"TaskName": "AntiSaccade (AS) Rewarded & Neutral with varying dot position",
"EchoTime": 0.025,
"EffectiveEchoSpacing": .05,
"NumberofPhaseEncodingSteps": 64,
"FlipAngle": 70,
"PhaseEncodingDirection": "j",
"SliceTiming": [
0.0,
1.3448,
1.6207,
1.3966,
0.6724,
1.4483,
1.7241
]
}
};
var testFile = {
name: 'sub-15_task-mixedeventrelatedprobe_run-01_bold.nii.gz',
relativePath: '/sub-15/func/sub-15_task-mixedeventrelatedprobe_run-01_bold.nii.gz'
};
var header = {
dim: [ 4, 128, 128, 5, 71 ],
pixdim: [ -1, 2, 2, 2, 16.5 ],
xyzt_units: [ 'mm', 'mm', 'mm', 's' ]
};
var events = [
'/sub-15/func/sub-15_task-mixedeventrelatedprobe_run-01_events.tsv',
'/sub-15/run-01_events.tsv'
];
validate.NIFTI(header, testFile, jsonContents, {}, [], events, function (issues) {
assert(issues.length === 1 && issues[0].code === 87);
});
});
=======
it('should throw an error for _phasediff.nii files with associated (EchoTime2 - EchoTime1) less than 0.0001', function(){
var phaseDiffJson = {
'/sub-01/func/sub-01_ses-mri_phasediff.json': {
"RepetitionTime": 0.4,
"EchoTime1": 0.00515,
"EchoTime2": 0.00519,
"FlipAngle": 60,
}
};
var phaseDiffFile = {
name: 'sub-01_ses-mri_phasediff.nii',
relativePath: '/sub-01/func/sub-01_ses-mri_phasediff.nii'
};
validate.NIFTI(null, phaseDiffFile, phaseDiffJson, {}, [], events, function (issues) {
assert(issues[0].code === 83 && issues.length === 1);
});
});
it('should throw an error for _phasediff.nii files with associated (EchoTime2 - EchoTime1) greater than 0.01', function(){
var phaseDiffJson = {
'/sub-01/func/sub-01_ses-mri_phasediff.json': {
"RepetitionTime": 0.4,
"EchoTime1": 0.00515,
"EchoTime2": 0.1019,
"FlipAngle": 60,
}
};
var phaseDiffFile = {
name: 'sub-01_ses-mri_phasediff.nii',
relativePath: '/sub-01/func/sub-01_ses-mri_phasediff.nii'
};
validate.NIFTI(null, phaseDiffFile, phaseDiffJson, {}, [], events, function (issues) {
assert(issues[0].code === 83 && issues.length === 1);
});
});
it('should give not error for _phasediff.nii files with reasonable values of associated (EchoTime2 - EchoTime1)', function(){
var phaseDiffJson = {
'/sub-01/func/sub-01_ses-mri_phasediff.json': {
"RepetitionTime": 0.4,
"EchoTime1": 0.00515,
"EchoTime2": 0.00819,
"FlipAngle": 60,
}
};
var phaseDiffFile = {
name: 'sub-01_ses-mri_phasediff.nii',
relativePath: '/sub-01/func/sub-01_ses-mri_phasediff.nii'
};
validate.NIFTI(null, phaseDiffFile, phaseDiffJson, {}, [], events, function (issues) {
assert(issues.length === 0);
});
});
>>>>>>>
it('SliceTiming should be the same length as the k dimension of the corresponding nifti header', function(){
var jsonContents = {
'/sub-15/func/sub-15_task-mixedeventrelatedprobe_run-01_bold.json': {
"RepetitionTime": 16.5,
"TaskName": "AntiSaccade (AS) Rewarded & Neutral with varying dot position",
"EchoTime": 0.025,
"EffectiveEchoSpacing": .05,
"NumberofPhaseEncodingSteps": 64,
"FlipAngle": 70,
"PhaseEncodingDirection": "j",
"SliceTiming": [
0.0,
1.3448,
1.6207,
1.3966,
0.6724,
1.4483,
1.7241
]
}
};
var testFile = {
name: 'sub-15_task-mixedeventrelatedprobe_run-01_bold.nii.gz',
relativePath: '/sub-15/func/sub-15_task-mixedeventrelatedprobe_run-01_bold.nii.gz'
};
var header = {
dim: [ 4, 128, 128, 7, 71 ],
pixdim: [ -1, 2, 2, 2, 16.5 ],
xyzt_units: [ 'mm', 'mm', 'mm', 's' ]
};
var events = [
'/sub-15/func/sub-15_task-mixedeventrelatedprobe_run-01_events.tsv',
'/sub-15/run-01_events.tsv'
];
validate.NIFTI(header, testFile, jsonContents, {}, [], events, function (issues) {
assert.deepEqual(issues, []);
});
});
it('SliceTiming should not have a length different than the k dimension of the corresponding nifti header', function(){
var jsonContents = {
'/sub-15/func/sub-15_task-mixedeventrelatedprobe_run-01_bold.json': {
"RepetitionTime": 16.5,
"TaskName": "AntiSaccade (AS) Rewarded & Neutral with varying dot position",
"EchoTime": 0.025,
"EffectiveEchoSpacing": .05,
"NumberofPhaseEncodingSteps": 64,
"FlipAngle": 70,
"PhaseEncodingDirection": "j",
"SliceTiming": [
0.0,
1.3448,
1.6207,
1.3966,
0.6724,
1.4483,
1.7241
]
}
};
var testFile = {
name: 'sub-15_task-mixedeventrelatedprobe_run-01_bold.nii.gz',
relativePath: '/sub-15/func/sub-15_task-mixedeventrelatedprobe_run-01_bold.nii.gz'
};
var header = {
dim: [ 4, 128, 128, 5, 71 ],
pixdim: [ -1, 2, 2, 2, 16.5 ],
xyzt_units: [ 'mm', 'mm', 'mm', 's' ]
};
var events = [
'/sub-15/func/sub-15_task-mixedeventrelatedprobe_run-01_events.tsv',
'/sub-15/run-01_events.tsv'
];
validate.NIFTI(header, testFile, jsonContents, {}, [], events, function (issues) {
assert(issues.length === 1 && issues[0].code === 87);
});
});
it('should throw an error for _phasediff.nii files with associated (EchoTime2 - EchoTime1) less than 0.0001', function(){
var phaseDiffJson = {
'/sub-01/func/sub-01_ses-mri_phasediff.json': {
"RepetitionTime": 0.4,
"EchoTime1": 0.00515,
"EchoTime2": 0.00519,
"FlipAngle": 60,
}
};
var phaseDiffFile = {
name: 'sub-01_ses-mri_phasediff.nii',
relativePath: '/sub-01/func/sub-01_ses-mri_phasediff.nii'
};
validate.NIFTI(null, phaseDiffFile, phaseDiffJson, {}, [], events, function (issues) {
assert(issues[0].code === 83 && issues.length === 1);
});
});
it('should throw an error for _phasediff.nii files with associated (EchoTime2 - EchoTime1) greater than 0.01', function(){
var phaseDiffJson = {
'/sub-01/func/sub-01_ses-mri_phasediff.json': {
"RepetitionTime": 0.4,
"EchoTime1": 0.00515,
"EchoTime2": 0.1019,
"FlipAngle": 60,
}
};
var phaseDiffFile = {
name: 'sub-01_ses-mri_phasediff.nii',
relativePath: '/sub-01/func/sub-01_ses-mri_phasediff.nii'
};
validate.NIFTI(null, phaseDiffFile, phaseDiffJson, {}, [], events, function (issues) {
assert(issues[0].code === 83 && issues.length === 1);
});
});
it('should give not error for _phasediff.nii files with reasonable values of associated (EchoTime2 - EchoTime1)', function(){
var phaseDiffJson = {
'/sub-01/func/sub-01_ses-mri_phasediff.json': {
"RepetitionTime": 0.4,
"EchoTime1": 0.00515,
"EchoTime2": 0.00819,
"FlipAngle": 60,
}
};
var phaseDiffFile = {
name: 'sub-01_ses-mri_phasediff.nii',
relativePath: '/sub-01/func/sub-01_ses-mri_phasediff.nii'
};
validate.NIFTI(null, phaseDiffFile, phaseDiffJson, {}, [], events, function (issues) {
assert(issues.length === 0);
});
}); |
<<<<<<<
// Verify that the json file has an accompanying data file
// Need to limit checks to files in sub-*/**/ - Not all data dictionaries are sidecars
const pathArgs = file.relativePath.split('/')
const isSidecar =
pathArgs[1].includes('sub-') && pathArgs.length > 3 ? true : false
if (isSidecar) {
// Check for suitable datafile accompanying this sidecar
const dataFile = utils.bids_files.checkSidecarForDatafiles(
file,
fileList,
)
if (!dataFile) {
self.issues.push(
new Issue({
code: 90,
file: file,
}),
)
}
}
utils.files.readFile(file, function(issue, contents) {
if (issue) {
self.issues.push(issue)
process.nextTick(cb)
return
}
json(file, contents, function(issues, jsObj) {
self.issues = self.issues.concat(issues)
// abort further tests if schema test does not pass
for (var i = 0; i < issues.length; i++) {
if (issues[i].severity === 'error') {
=======
utils.files
.readFile(file)
.then(contents => {
utils.json.parse(file, contents, function(issues, jsObj) {
self.issues = self.issues.concat(issues)
// abort further tests if schema test does not pass
if (issues.some(issue => issue.severity === 'error')) {
>>>>>>>
// Verify that the json file has an accompanying data file
// Need to limit checks to files in sub-*/**/ - Not all data dictionaries are sidecars
const pathArgs = file.relativePath.split('/')
const isSidecar =
pathArgs[1].includes('sub-') && pathArgs.length > 3 ? true : false
if (isSidecar) {
// Check for suitable datafile accompanying this sidecar
const dataFile = utils.bids_files.checkSidecarForDatafiles(
file,
fileList,
)
if (!dataFile) {
self.issues.push(
new Issue({
code: 90,
file: file,
}),
)
}
}
utils.files
.readFile(file)
.then(contents => {
utils.json.parse(file, contents, function(issues, jsObj) {
self.issues = self.issues.concat(issues)
// abort further tests if schema test does not pass
if (issues.some(issue => issue.severity === 'error')) { |
<<<<<<<
87: {
key: 'SLICETIMING_ELEMENTS',
severity: 'warning',
reason: 'The number of elements in the SliceTiming array should match the \'k\' dimension of the corresponding nifti volume.'
}
=======
78: {
key: 'CHANNELS_COLUMN_SFREQ',
severity: 'error',
reason: "Fourth column of the channels file must be named 'sampling_frequency'"
},
79: {
key: 'CHANNELS_COLUMN_LOWCUT',
severity: 'error',
reason: "Third column of the channels file must be named 'low_cutoff'"
},
80: {
key: 'CHANNELS_COLUMN_HIGHCUT',
severity: 'error',
reason: "Third column of the channels file must be named 'high_cutoff'"
},
81: {
key: 'CHANNELS_COLUMN_NOTCH',
severity: 'error',
reason: "Third column of the channels file must be named 'notch'"
},
83: {
key: 'ECHOTIME1_2_DIFFERENCE_UNREASONABLE',
severity: 'error',
reason: 'The value of (EchoTime2 - EchoTime1) should be within the range of 0.0001 - 0.01.'
},
85: {
key: 'SUSPICIOUSLY_LONG_EVENT_DESIGN',
severity: 'warning',
reason: 'The onset of the last event is after the total duration of the corresponding scan. This design is suspiciously long. '
},
86: {
key: 'SUSPICIOUSLY_SHORT_EVENT_DESIGN',
severity: 'warning',
reason: 'The onset of the last event is less than half the total duration of the corresponding scan. This design is suspiciously short. '
}
>>>>>>>
78: {
key: 'CHANNELS_COLUMN_SFREQ',
severity: 'error',
reason: "Fourth column of the channels file must be named 'sampling_frequency'"
},
79: {
key: 'CHANNELS_COLUMN_LOWCUT',
severity: 'error',
reason: "Third column of the channels file must be named 'low_cutoff'"
},
80: {
key: 'CHANNELS_COLUMN_HIGHCUT',
severity: 'error',
reason: "Third column of the channels file must be named 'high_cutoff'"
},
81: {
key: 'CHANNELS_COLUMN_NOTCH',
severity: 'error',
reason: "Third column of the channels file must be named 'notch'"
},
83: {
key: 'ECHOTIME1_2_DIFFERENCE_UNREASONABLE',
severity: 'error',
reason: 'The value of (EchoTime2 - EchoTime1) should be within the range of 0.0001 - 0.01.'
},
85: {
key: 'SUSPICIOUSLY_LONG_EVENT_DESIGN',
severity: 'warning',
reason: 'The onset of the last event is after the total duration of the corresponding scan. This design is suspiciously long. '
},
86: {
key: 'SUSPICIOUSLY_SHORT_EVENT_DESIGN',
severity: 'warning',
reason: 'The onset of the last event is less than half the total duration of the corresponding scan. This design is suspiciously short. '
},
87: {
key: 'SLICETIMING_ELEMENTS',
severity: 'warning',
reason: 'The number of elements in the SliceTiming array should match the \'k\' dimension of the corresponding nifti volume.'
}, |
<<<<<<<
201: {
key: 'REPETITIONTIME_PREPARATION_NOT_CONSISTENT',
severity: 'warning',
reason: "",
},
202: {
key: 'M0Type_SET_INCORRECTLY',
severity: 'warning',
reason: "M0Type was not defined correctly. If 'M0Type' is equal to separate, the dataset should include a *_m0scan.nii[.gz] and *_m0scan.json file.",
},
=======
201: {
key: 'REPETITIONTIMEPREPARATION_NOT_CONSISTENT',
severity: 'warning',
reason: "The number of values for 'RepetitionTimePreparation' for this file does not match the 4th dimension of the NIfTI header. 'RepetitionTimePreparation' is the interval, in seconds, that it takes a preparation pulse block to re-appear at the beginning of the succeeding (essentially identical) pulse sequence block. The data type number may apply to files from any MRI modality concerned with a single value for this field. The data type array provides a value for each volume in a 4D dataset and should only be used when the volume timing is critical for interpretation of the data, such as in ASL.",
},
>>>>>>>
201: {
key: 'REPETITIONTIME_PREPARATION_NOT_CONSISTENT',
severity: 'warning',
reason: "The number of values for 'RepetitionTimePreparation' for this file does not match the 4th dimension of the NIfTI header. 'RepetitionTimePreparation' is the interval, in seconds, that it takes a preparation pulse block to re-appear at the beginning of the succeeding (essentially identical) pulse sequence block. The data type number may apply to files from any MRI modality concerned with a single value for this field. The data type array provides a value for each volume in a 4D dataset and should only be used when the volume timing is critical for interpretation of the data, such as in ASL.",
},
202: {
key: 'M0Type_SET_INCORRECTLY',
severity: 'warning',
reason: "M0Type was not defined correctly. If 'M0Type' is equal to separate, the dataset should include a *_m0scan.nii[.gz] and *_m0scan.json file.",
}, |
<<<<<<<
reason:
'The contents of this .bval file are undefined or severely malformed. ',
},
91: {
key: '_FIELDMAP_WITHOUT_MAGNITUDE_FILE',
severity: 'error',
reason:
'_fieldmap.nii[.gz] file does not have accompanying _magnitude.nii[.gz] file. ',
},
=======
reason:
'The contents of this .bval file are undefined or severely malformed. ',
},
90: {
key: 'SIDECAR_WITHOUT_DATAFILE',
severity: 'error',
reason: 'A json sidecar file was found without a corresponding data file',
},
>>>>>>>
reason:
'The contents of this .bval file are undefined or severely malformed. ',
},
90: {
key: 'SIDECAR_WITHOUT_DATAFILE',
severity: 'error',
reason: 'A json sidecar file was found without a corresponding data file',
},
91: {
key: '_FIELDMAP_WITHOUT_MAGNITUDE_FILE',
severity: 'error',
reason:
'_fieldmap.nii[.gz] file does not have accompanying _magnitude.nii[.gz] file. ',
}, |
<<<<<<<
it("should emit 'refused' when receiving 4001-4099 close code", function() {
var onConnected = jasmine.createSpy("onConnected");
var onRefused = jasmine.createSpy("onRefused");
wrapper.bind("refused", onRefused);
wrapper.bind("connected", onConnected);
transport.emit("message", {
data: JSON.stringify({
event: "pusher:error",
data: {
code: 4069,
message: "refused"
}
})
});
expect(onConnected).not.toHaveBeenCalled();
expect(onRefused).toHaveBeenCalled();
expect(transport.close).toHaveBeenCalled();
});
it("should emit 'backoff' when receiving 4100-4199 close code", function() {
var onConnected = jasmine.createSpy("onConnected");
var onBackoff = jasmine.createSpy("onBackoff");
wrapper.bind("backoff", onBackoff);
wrapper.bind("connected", onConnected);
transport.emit("message", {
data: JSON.stringify({
event: "pusher:error",
data: {
code: 4100,
message: "backoff"
}
})
});
expect(onConnected).not.toHaveBeenCalled();
expect(onBackoff).toHaveBeenCalled();
expect(transport.close).toHaveBeenCalled();
});
it("should emit 'retry' when receiving 4200-4299 close code", function() {
var onConnected = jasmine.createSpy("onConnected");
var onRetry = jasmine.createSpy("onRetry");
wrapper.bind("retry", onRetry);
wrapper.bind("connected", onConnected);
transport.emit("message", {
data: JSON.stringify({
event: "pusher:error",
data: {
code: 4299,
message: "retry"
}
})
});
expect(onConnected).not.toHaveBeenCalled();
expect(onRetry).toHaveBeenCalled();
expect(transport.close).toHaveBeenCalled();
});
it("should emit 'refused' when receiving unknown close code", function() {
var onConnected = jasmine.createSpy("onConnected");
var onRefused = jasmine.createSpy("onRefused");
wrapper.bind("refused", onRefused);
wrapper.bind("connected", onConnected);
transport.emit("message", {
data: JSON.stringify({
event: "pusher:error",
data: {
code: 4301,
message: "unknown error"
}
})
});
expect(onConnected).not.toHaveBeenCalled();
expect(onRefused).toHaveBeenCalled();
expect(transport.close).toHaveBeenCalled();
});
=======
>>>>>>> |
<<<<<<<
change(date(2019, 10, 31), <>Add a suggestion for Lightning Shield uptime</>, [HawkCorrigan]),
=======
change(date(2019, 11, 28), <>Added a statistic for <SpellLink id={SPELLS.NATURAL_HARMONY_TRAIT.id} /> to track avg crit, haste, mastery and uptime for each</>, [Draenal]),
change(date(2019, 10, 31), <>Add a suggestion for Totem Mastery</>, [HawkCorrigan]),
>>>>>>>
change(date(2019, 11, 28), <>Added a statistic for <SpellLink id={SPELLS.NATURAL_HARMONY_TRAIT.id} /> to track avg crit, haste, mastery and uptime for each</>, [Draenal]),
change(date(2019, 10, 31), <>Add a suggestion for Lightning Shield uptime</>, [HawkCorrigan]),
change(date(2019, 10, 31), <>Add a suggestion for Totem Mastery</>, [HawkCorrigan]), |
<<<<<<<
if (!e.luaStack) e.luaStack = [];
e.luaStack.push ('at ' + (this._data.sourceName || 'function') + (this._data.linePositions? ' on line ' + this._data.linePositions[this._pc - 1] : ''));
=======
if (!e.luaStack) e.luaStack = luajs.gc.createArray();
e.luaStack.push ('at ' + (this._data.sourceName || 'function') + ' on line ' + this._data.linePositions[this._pc - 1])
>>>>>>>
if (!e.luaStack) e.luaStack = luajs.gc.createArray();
e.luaStack.push ('at ' + (this._data.sourceName || 'function') + (this._data.linePositions? ' on line ' + this._data.linePositions[this._pc - 1] : ''));
<<<<<<<
// if (this._data.linePositions) line = this._data.linePositions[this._pc];
=======
line = this._data.linePositions && this._data.linePositions[this._pc];
>>>>>>>
line = this._data.linePositions && this._data.linePositions[this._pc];
<<<<<<<
b = coerce(b, 'number', 'attempt to perform arithmetic on a non-numeric value');
c = coerce(c, 'number', 'attempt to perform arithmetic on a non-numeric value');
this._register[a] = b + c;
=======
if (toFloat (b) === undefined || toFloat (c) === undefined) throw new luajs.Error ('attempt to perform arithmetic on a non-numeric value');
this._register.setItem(a, parseFloat (b) + parseFloat (c));
>>>>>>>
b = coerce(b, 'number', 'attempt to perform arithmetic on a non-numeric value');
c = coerce(c, 'number', 'attempt to perform arithmetic on a non-numeric value');
this._register.setItem(a, b + c);
<<<<<<<
b = coerce(b, 'number', 'attempt to perform arithmetic on a non-numeric value');
c = coerce(c, 'number', 'attempt to perform arithmetic on a non-numeric value');
this._register[a] = b - c;
=======
if (toFloat (b) === undefined || toFloat (c) === undefined) throw new luajs.Error ('attempt to perform arithmetic on a non-numeric value');
this._register.setItem(a, parseFloat (b) - parseFloat (c));
>>>>>>>
b = coerce(b, 'number', 'attempt to perform arithmetic on a non-numeric value');
c = coerce(c, 'number', 'attempt to perform arithmetic on a non-numeric value');
this._register.setItem(a, b - c);
<<<<<<<
b = coerce(b, 'number', 'attempt to perform arithmetic on a non-numeric value');
c = coerce(c, 'number', 'attempt to perform arithmetic on a non-numeric value');
this._register[a] = b * c;
=======
if (toFloat (b) === undefined || toFloat (c) === undefined) throw new luajs.Error ('attempt to perform arithmetic on a non-numeric value');
this._register.setItem(a, parseFloat (b) * parseFloat (c));
>>>>>>>
b = coerce(b, 'number', 'attempt to perform arithmetic on a non-numeric value');
c = coerce(c, 'number', 'attempt to perform arithmetic on a non-numeric value');
this._register.setItem(a, b * c);
<<<<<<<
b = coerce(b, 'number', 'attempt to perform arithmetic on a non-numeric value');
c = coerce(c, 'number', 'attempt to perform arithmetic on a non-numeric value');
this._register[a] = b / c;
=======
if (toFloat (b) === undefined || toFloat (c) === undefined) throw new luajs.Error ('attempt to perform arithmetic on a non-numeric value');
this._register.setItem(a, parseFloat (b) / parseFloat (c));
>>>>>>>
b = coerce(b, 'number', 'attempt to perform arithmetic on a non-numeric value');
c = coerce(c, 'number', 'attempt to perform arithmetic on a non-numeric value');
this._register.setItem(a, b / c);
<<<<<<<
b = coerce(b, 'number', 'attempt to perform arithmetic on a non-numeric value');
c = coerce(c, 'number', 'attempt to perform arithmetic on a non-numeric value');
if (c === 0 || c === -Infinity || c === Infinity || window.isNaN(b) || window.isNaN(c)) {
result = NaN;
} else {
result = Math.abs(b) % (absC = Math.abs(c));
if (!(b < 0) ^ !(c < 0)) result = absC - result;
if (c < 0) result *= -1;
}
this._register[a] = result;
=======
if (toFloat (b) === undefined || toFloat (c) === undefined) throw new luajs.Error ('attempt to perform arithmetic on a non-numeric value');
this._register.setItem(a, parseFloat (b) % parseFloat (c));
>>>>>>>
b = coerce(b, 'number', 'attempt to perform arithmetic on a non-numeric value');
c = coerce(c, 'number', 'attempt to perform arithmetic on a non-numeric value');
if (c === 0 || c === -Infinity || c === Infinity || window.isNaN(b) || window.isNaN(c)) {
result = NaN;
} else {
result = Math.abs(b) % (absC = Math.abs(c));
if (!(b < 0) ^ !(c < 0)) result = absC - result;
if (c < 0) result *= -1;
}
this._register.setItem(a, result);
<<<<<<<
b = coerce(b, 'number', 'attempt to perform arithmetic on a non-numeric value');
c = coerce(c, 'number', 'attempt to perform arithmetic on a non-numeric value');
this._register[a] = Math.pow (b, c);
=======
if (toFloat (b) === undefined || toFloat (c) === undefined) throw new luajs.Error ('attempt to perform arithmetic on a non-numeric value');
this._register.setItem(a, Math.pow (parseFloat (b), parseFloat (c)));
>>>>>>>
b = coerce(b, 'number', 'attempt to perform arithmetic on a non-numeric value');
c = coerce(c, 'number', 'attempt to perform arithmetic on a non-numeric value');
this._register.setItem(a, Math.pow (b, c));
<<<<<<<
b = luajs.utils.coerce(this._register[b], 'number', 'attempt to perform arithmetic on a non-numeric value');
this._register[a] = -b;
=======
b = this._register.getItem(b);
if (luajs.utils.toFloat (b) === undefined) throw new luajs.Error ('attempt to perform arithmetic on a non-numeric value');
this._register.setItem(a, -parseFloat (b));
>>>>>>>
b = luajs.utils.coerce(this._register.getItem(b), 'number', 'attempt to perform arithmetic on a non-numeric value');
this._register.setItem(a, -b);
<<<<<<<
if (!this._register[b] !== !c) {
this._register[a] = this._register[b];
=======
if (!this._register.getItem(b) === !c) {
this._register.setItem(a, this._register.getItem(b));
>>>>>>>
if (!this._register.getItem(b) !== !c) {
this._register.setItem(a, this._register.getItem(b)); |
<<<<<<<
var a = this._instructions.get(this._pc - 1, 'A'),
b = this._instructions.get(this._pc - 1, 'B'),
c = this._instructions.get(this._pc - 1, 'C'),
retvals = luajs.gc.createArray();
=======
var offset = (this._pc - 1) * 4,
a = this._instructions[offset + 1],
b = this._instructions[offset + 2],
c = this._instructions[offset + 3],
retvals = [];
>>>>>>>
var offset = (this._pc - 1) * 4,
a = this._instructions[offset + 1],
b = this._instructions[offset + 2],
c = this._instructions[offset + 3],
retvals = luajs.gc.createArray();
<<<<<<<
while (this._instructions.get(this._pc, 'op') !== undefined) {
line = this._data.linePositions && this._data.linePositions[this._pc];
=======
while (this._instructions[this._pc * 4] !== undefined) {
line = this._data.linePositions[this._pc];
>>>>>>>
while (this._instructions[this._pc * 4] !== undefined) {
line = this._data.linePositions && this._data.linePositions[this._pc]; |
<<<<<<<
model.setValue(value, 0, { fromTarget: 1, ...opts });
=======
>>>>>>> |
<<<<<<<
<span className="header-action-drawer__separator" />
{this.iconWithFFClickCatcher('fas fa-list fa-lg', onPropertiesClick)}
<span className="header-action-drawer__separator" />
=======
>>>>>>>
{this.iconWithFFClickCatcher('fas fa-list fa-lg', onPropertiesClick)} |
<<<<<<<
{
category: 'org',
name: 'fileSettings',
type: 'json',
shouldStoreInConfig: true,
default: List(),
},
=======
{
category: 'base',
name: 'agendaTimeframe',
type: 'string',
default: 'Week',
shouldStoreInConfig: false,
},
>>>>>>>
{
category: 'org',
name: 'fileSettings',
type: 'json',
shouldStoreInConfig: true,
default: List(),
},
{
category: 'base',
name: 'agendaTimeframe',
type: 'string',
default: 'Week',
shouldStoreInConfig: false,
}, |
<<<<<<<
const {
onClose,
files,
todoKeywordSets,
agendaDefaultDeadlineDelayValue,
agendaDefaultDeadlineDelayUnit,
} = props;
=======
>>>>>>>
const {
onClose,
files,
todoKeywordSets,
agendaDefaultDeadlineDelayValue,
agendaDefaultDeadlineDelayUnit,
} = props;
<<<<<<<
const mapStateToProps = (state) => {
const path = state.org.present.get('path');
const file = state.org.present.getIn(['files',path]);
return {
files: state.org.present.get('files'),
todoKeywordSets: file.get('todoKeywordSets'),
agendaDefaultDeadlineDelayValue: state.base.get('agendaDefaultDeadlineDelayValue') || 5,
agendaDefaultDeadlineDelayUnit: state.base.get('agendaDefaultDeadlineDelayUnit') || 'd',
};
};
=======
const mapStateToProps = (state) => ({
todoKeywordSets: state.org.present.get('todoKeywordSets'),
agendaTimeframe: state.base.get('agendaTimeframe'),
agendaDefaultDeadlineDelayValue: state.base.get('agendaDefaultDeadlineDelayValue') || 5,
agendaDefaultDeadlineDelayUnit: state.base.get('agendaDefaultDeadlineDelayUnit') || 'd',
});
>>>>>>>
const mapStateToProps = (state) => {
const path = state.org.present.get('path');
const file = state.org.present.getIn(['files',path]);
return {
files: state.org.present.get('files'),
todoKeywordSets: file.get('todoKeywordSets'),
agendaTimeframe: state.base.get('agendaTimeframe'),
agendaDefaultDeadlineDelayValue: state.base.get('agendaDefaultDeadlineDelayValue') || 5,
agendaDefaultDeadlineDelayUnit: state.base.get('agendaDefaultDeadlineDelayUnit') || 'd',
};
}; |
<<<<<<<
<span className={lineContainerClass}
onClick={item.get('isCheckbox') ? this.handleCheckboxClick(item.get('id')) : null}>
{item.get('isCheckbox') && (
<Checkbox state={item.get('checkboxState')} />
)}
<AttributedString parts={item.get('titleLine')} subPartDataAndHandlers={subPartDataAndHandlers} />
=======
<span
className={lineContainerClass}
onClick={item.get('isCheckbox') ? this.handleCheckboxClick(item.get('id')) : null}
>
{item.get('isCheckbox') && <Checkbox state={item.get('checkboxState')} />}
<AttributedString parts={item.get('titleLine')} />
>>>>>>>
<span
className={lineContainerClass}
onClick={item.get('isCheckbox') ? this.handleCheckboxClick(item.get('id')) : null}
>
{item.get('isCheckbox') && <Checkbox state={item.get('checkboxState')} />}
<AttributedString
parts={item.get('titleLine')}
subPartDataAndHandlers={subPartDataAndHandlers}
/> |
<<<<<<<
import * as baseActions from '../../../../actions/base';
=======
import { isMobileBrowser } from '../../../../lib/browser_utils';
>>>>>>>
import { isMobileBrowser } from '../../../../lib/browser_utils';
import * as baseActions from '../../../../actions/base'; |
<<<<<<<
change(date(2019, 9, 5), 'Added a cast time column to the mana efficiency module.', niseko),
=======
change(date(2019, 9, 8), <>Fixed issue with <ItemLink id={ITEMS.ENCHANT_WEAPON_FORCE_MULTIPLIER.id} /> and Critical Strike.</>, emallson),
change(date(2019, 9, 7), <>Added <ItemLink id={ITEMS.ENCHANT_WEAPON_FORCE_MULTIPLIER.id} /></>, emallson),
>>>>>>>
change(date(2019, 9, 8), 'Added a cast time column to the mana efficiency module.', niseko),
change(date(2019, 9, 8), <>Fixed issue with <ItemLink id={ITEMS.ENCHANT_WEAPON_FORCE_MULTIPLIER.id} /> and Critical Strike.</>, emallson),
change(date(2019, 9, 7), <>Added <ItemLink id={ITEMS.ENCHANT_WEAPON_FORCE_MULTIPLIER.id} /></>, emallson), |
<<<<<<<
//ensure the padname is valid and the url doesn't end with a /
if(!padManager.isValidPadId(req.params.pad) || /\/$/.test(req.url))
{
next();
return;
}
=======
//ensure the padname is valid and the url doesn't end with a /
if(!isValidPadname(req.params.pad) || /\/$/.test(req.url))
{
res.send('Such a padname is forbidden', 404);
return;
}
>>>>>>>
//ensure the padname is valid and the url doesn't end with a /
if(!padManager.isValidPadId(req.params.pad) || /\/$/.test(req.url))
{
res.send('Such a padname is forbidden', 404);
return;
}
<<<<<<<
//ensure the padname is valid and the url doesn't end with a /
if(!padManager.isValidPadId(req.params.pad) || /\/$/.test(req.url))
{
next();
return;
}
=======
//ensure the padname is valid and the url doesn't end with a /
if(!isValidPadname(req.params.pad) || /\/$/.test(req.url))
{
res.send('Such a padname is forbidden', 404);
return;
}
>>>>>>>
//ensure the padname is valid and the url doesn't end with a /
if(!padManager.isValidPadId(req.params.pad) || /\/$/.test(req.url))
{
res.send('Such a padname is forbidden', 404);
return;
} |
<<<<<<<
export { Alert, Badge, Button, Dropdown, Icon, Input, Logo, Pane, DatePicker, Value, Widget, variables, SparkGraph };
=======
export { Alert, Badge, Button, Dropdown, Icon, Input, Logo, Pane, Select, DatePicker, Value, Widget, variables };
>>>>>>>
export { Alert, Badge, Button, Dropdown, Icon, Input, Logo, Pane, DatePicker, Value, Widget, variables, Select, SparkGraph }; |
<<<<<<<
ipc.on('trayabout', event => {
if (event) {
about();
}
});
ipc.on('traychangeserver', event => {
if (event) {
addDomain();
}
});
module.exports = {addDomain, about};
=======
module.exports = {
addDomain,
about
};
>>>>>>>
ipc.on('trayabout', event => {
if (event) {
about();
}
});
ipc.on('traychangeserver', event => {
if (event) {
addDomain();
}
});
module.exports = {
addDomain,
about
}; |
<<<<<<<
change(date(2019, 10, 16), <>Count precast <SpellLink id={SPELLS.STORMKEEPER_TALENT.id} /> in total number of <SpellLink id={SPELLS.STORMKEEPER_TALENT.id} /> casts.</>, [TheJigglr]),
=======
change(date(2019, 10, 12), <>Add suggestion and checklist for Icefury efficiency.</>, [Draenal]),
>>>>>>>
change(date(2019, 10, 16), <>Count precast <SpellLink id={SPELLS.STORMKEEPER_TALENT.id} /> in total number of <SpellLink id={SPELLS.STORMKEEPER_TALENT.id} /> casts.</>, [TheJigglr]),
change(date(2019, 10, 12), <>Add suggestion and checklist for Icefury efficiency.</>, [Draenal]), |
<<<<<<<
gameSprite.ball = ball;
app.view.addEventListener("click", gameStart, { once: true });
}
function gameStart() {
=======
gameSprite.ball = ballAnimatedSprite;
gameSprite.hyper = ballHyperSprite;
gameSprite.trail = ballTrailSprite;
gameSprite.punch = ballPunchSprite;
>>>>>>>
gameSprite.ball = ballAnimatedSprite;
gameSprite.hyper = ballHyperSprite;
gameSprite.trail = ballTrailSprite;
gameSprite.punch = ballPunchSprite;
app.view.addEventListener("click", gameStart, { once: true });
}
function gameStart() { |
<<<<<<<
import * as Zanimo from 'zanimo';
=======
import Zanimo from 'zanimo';
import redraw from '../../utils/redraw';
import router from '../../router';
>>>>>>>
import * as Zanimo from 'zanimo';
import redraw from '../../utils/redraw';
import router from '../../router';
<<<<<<<
import animator from './animator';
import * as m from 'mithril';
=======
import m from 'mithril';
>>>>>>>
import * as m from 'mithril'; |
<<<<<<<
import { last } from 'lodash/array';
import * as chessground from 'chessground-mobile';
=======
import last from 'lodash/last';
import redraw from '../../utils/redraw';
import chessground from 'chessground-mobile';
>>>>>>>
import { last } from 'lodash/array';
import * as chessground from 'chessground-mobile';
import redraw from '../../utils/redraw'; |
<<<<<<<
=======
import chessground from 'chessground-mobile';
import redraw from '../../utils/redraw';
>>>>>>>
import redraw from '../../utils/redraw';
<<<<<<<
config: helper.ontouch(cancel.bind(undefined, ctrl))
=======
oncreate: helper.ontouch(partial(cancel, ctrl))
>>>>>>>
oncreate: helper.ontouch(cancel.bind(undefined, ctrl)) |
<<<<<<<
import LaserMatrix from './Modules/Spells/BFA/AzeriteTraits/LaserMatrix';
=======
import MeticulousScheming from './Modules/Spells/BFA/AzeriteTraits/MeticulousScheming';
>>>>>>>
import LaserMatrix from './Modules/Spells/BFA/AzeriteTraits/LaserMatrix';
import MeticulousScheming from './Modules/Spells/BFA/AzeriteTraits/MeticulousScheming';
<<<<<<<
laserMatrix: LaserMatrix,
=======
meticulousScheming: MeticulousScheming,
>>>>>>>
laserMatrix: LaserMatrix,
meticulousScheming: MeticulousScheming, |
<<<<<<<
=======
import m from 'mithril';
import socket from '../../socket';
>>>>>>>
import socket from '../../socket';
<<<<<<<
=======
m.redraw.strategy('none');
clearInterval(menu.sendPingsInterval);
>>>>>>>
m.redraw.strategy('none');
clearInterval(menu.sendPingsInterval); |
<<<<<<<
utils.tupleOf = function(x) {
return [x.toString(), x.toString()];
};
=======
utils.oppositeColor = function(color) {
return color === 'white' ? 'black' : 'white';
};
>>>>>>>
utils.tupleOf = function(x) {
return [x.toString(), x.toString()];
};
utils.oppositeColor = function(color) {
return color === 'white' ? 'black' : 'white';
}; |
<<<<<<<
import * as chessground from 'chessground-mobile';
=======
import chessground from 'chessground-mobile';
import redraw from '../../utils/redraw';
>>>>>>>
import * as chessground from 'chessground-mobile';
import redraw from '../../utils/redraw'; |
<<<<<<<
import * as utils from '../../../utils';
import * as m from 'mithril';
=======
import { handleXhrError } from '../../../utils';
import m from 'mithril';
>>>>>>>
import * as m from 'mithril';
import { handleXhrError } from '../../../utils'; |
<<<<<<<
=======
function createSocket(onOpen, handlers) {
socketInstance = new StrongSocket(
'/socket',
0, {
options: {
name: 'socket',
debug: window.lichess.mode !== 'prod',
pingDelay: 2000,
onOpen: onOpen
},
events: handlers
}
);
return socketInstance;
}
>>>>>>>
function createSocket(onOpen, handlers) {
socketInstance = new StrongSocket(
'/socket',
0, {
options: {
name: 'socket',
debug: window.lichess.mode !== 'prod',
pingDelay: 2000,
onOpen: onOpen
},
events: handlers
}
);
return socketInstance;
}
<<<<<<<
connectLobby: createLobbySocket,
await: createAwaitSocket
=======
connectLobby: createLobbySocket,
connectSocket: createSocket
>>>>>>>
connectLobby: createLobbySocket,
await: createAwaitSocket,
connectSocket: createSocket |
<<<<<<<
import timelineModal from '../timelineModal';
import * as m from 'mithril';
=======
import m from 'mithril';
>>>>>>>
import * as m from 'mithril'; |
<<<<<<<
import analyse from './ui/analyse';
=======
import challenge from './ui/challenge';
>>>>>>>
import analyse from './ui/analyse';
import challenge from './ui/challenge';
<<<<<<<
'/game/:id/user/:userId': game,
'/analyse': analyse,
'/analyse/:id': analyse,
'/analyse/:id/user/:userId': analyse,
=======
'/challenge/:id': challenge,
>>>>>>>
'/game/:id/user/:userId': game,
'/analyse': analyse,
'/analyse/:id': analyse,
'/analyse/:id/user/:userId': analyse,
'/challenge/:id': challenge, |
<<<<<<<
describe("addToken()", () => {
it("Owner can add tokens", async () => {
const instance = await BatchAuction.new()
const token_1 = await ERC20.new()
await instance.addToken(token_1.address)
assert.equal((await instance.tokenAddresToIdMap.call(token_1.address)).toNumber(), 1)
assert.equal(await instance.tokenIdToAddressMap.call(1), token_1.address)
const token_2 = await ERC20.new()
await instance.addToken(token_2.address)
assert.equal((await instance.tokenAddresToIdMap.call(token_2.address)).toNumber(), 2)
assert.equal(await instance.tokenIdToAddressMap.call(2), token_2.address)
})
it("Nobody Else can add tokens", async () => {
const instance = await BatchAuction.new()
const token = await ERC20.new()
await assertRejects(instance.addToken(token.address, {from: user_1}))
await assertRejects(instance.addToken(token.address, {from: user_2}))
})
it("Can't add same token twice", async () => {
const instance = await BatchAuction.new()
const token = await ERC20.new()
await instance.addToken(token.address)
await assertRejects(instance.addToken(token.address))
})
it("Can't exceed max tokens", async () => {
const instance = await BatchAuction.new()
const max_tokens = (await instance.MAX_TOKENS.call()).toNumber()
for (let i = 1; i < max_tokens + 1; i++) {
await instance.addToken((await ERC20.new()).address)
}
// Last token can't be added (exceeds limit)
await assertRejects(instance.addToken((await ERC20.new()).address))
})
})
=======
describe("addToken()", () => {
it("Owner can add tokens", async () => {
const instance = await BatchAuction.new()
const token_1 = await ERC20.new()
instance.addToken(token_1.address)
assert.equal((await instance.tokenAddresToIdMap.call(token_1.address)).toNumber(), 1)
assert.equal(await instance.tokenIdToAddressMap.call(1), token_1.address)
const token_2 = await ERC20.new()
instance.addToken(token_2.address)
assert.equal((await instance.tokenAddresToIdMap.call(token_2.address)).toNumber(), 2)
assert.equal(await instance.tokenIdToAddressMap.call(2), token_2.address)
})
it("Nobody Else can add tokens", async () => {
const instance = await BatchAuction.new()
const token = await ERC20.new()
await assertRejects(instance.addToken(token.address, {from: user_1}))
await assertRejects(instance.addToken(token.address, {from: user_2}))
})
it("Can't add same token twice", async () => {
const instance = await BatchAuction.new()
const token = await ERC20.new()
instance.addToken(token.address)
await assertRejects(instance.addToken(token.address))
})
it("Can't exceed max tokens", async () => {
const instance = await BatchAuction.new()
const max_tokens = (await instance.MAX_TOKENS.call()).toNumber()
for (let i = 1; i < max_tokens + 1; i++) {
instance.addToken((await ERC20.new()).address)
}
// Last token can't be added (exceeds limit)
await assertRejects(instance.addToken((await ERC20.new()).address))
})
})
>>>>>>>
describe("addToken()", () => {
it("Owner can add tokens", async () => {
const instance = await BatchAuction.new()
const token_1 = await ERC20.new()
await instance.addToken(token_1.address)
instance.addToken(token_1.address)
assert.equal((await instance.tokenAddresToIdMap.call(token_1.address)).toNumber(), 1)
assert.equal(await instance.tokenIdToAddressMap.call(1), token_1.address)
const token_2 = await ERC20.new()
await instance.addToken(token_2.address)
assert.equal((await instance.tokenAddresToIdMap.call(token_2.address)).toNumber(), 2)
assert.equal(await instance.tokenIdToAddressMap.call(2), token_2.address)
})
it("Nobody Else can add tokens", async () => {
const instance = await BatchAuction.new()
const token = await ERC20.new()
await assertRejects(instance.addToken(token.address, {from: user_1}))
await assertRejects(instance.addToken(token.address, {from: user_2}))
})
it("Can't add same token twice", async () => {
const instance = await BatchAuction.new()
const token = await ERC20.new()
await instance.addToken(token.address)
await assertRejects(instance.addToken(token.address))
})
it("Can't exceed max tokens", async () => {
const instance = await BatchAuction.new()
const max_tokens = (await instance.MAX_TOKENS.call()).toNumber()
for (let i = 1; i < max_tokens + 1; i++) {
await instance.addToken((await ERC20.new()).address)
}
// Last token can't be added (exceeds limit)
await assertRejects(instance.addToken((await ERC20.new()).address))
})
}) |
<<<<<<<
change(date(2019, 11, 9), <>Added upwelling statistic. </>,Abelito75),
=======
change(date(2019, 11, 9), <>Fixed Tier45 comparison if you didn't play in a way where mana would be returned/saved. </>,Abelito75),
>>>>>>>
change(date(2019, 11, 9), <>Added upwelling statistic. </>,Abelito75),
change(date(2019, 11, 9), <>Fixed Tier45 comparison if you didn't play in a way where mana would be returned/saved. </>,Abelito75), |
<<<<<<<
const adminApi = {};
=======
/**
*
* @param {String} topic
* @param {Number} partition
* @param {Number} messages
*
* Will receive from get topic data the parameters and will return an obj with topic, partition, and messages
*/
>>>>>>>
const adminApi = {};
/**
*
* @param {String} topic
* @param {Number} partition
* @param {Number} messages
*
* Will receive from get topic data the parameters and will return an obj with topic, partition, and messages
*/
<<<<<<<
};
adminApi.getLatestOffset = (kafkaHost, topic, partition) => {
const client = new kafka.KafkaClient({ kafkaHost });
const offset = new kafka.Offset(client);
return new Promise((resolve, reject) => {
offset.fetchLatestOffsets(topic, (err, data) => {
if (err) reject(err);
else resolve(data[topic][partition]);
});
});
};
adminApi.getTopicData = (kafkaHost, mainWindow) => {
const client = new kafka.KafkaClient({ kafkaHost });
=======
}
/**
*
* @param {String} uri the connection uri that the user types into connection input
* @param {Electron Window} mainWindow Main window that gets data
*
* Makes a connection to Kafka server to fetch a list of topics
* Transforms the data coming back from the Kafka broker into pertinent data to send back to client
*
*
*/
const getTopicData = (uri, mainWindow) => {
// Declares a new instance of client that will be used to make a connection
const client = new kafka.KafkaClient({ kafkaHost: uri });
// Declaring a new kafka.Admin instance creates a connection to the Kafka admin API
>>>>>>>
};
adminApi.getLatestOffset = (kafkaHost, topic, partition) => {
const client = new kafka.KafkaClient({ kafkaHost });
const offset = new kafka.Offset(client);
return new Promise((resolve, reject) => {
offset.fetchLatestOffsets(topic, (err, data) => {
if (err) reject(err);
else resolve(data[topic][partition]);
});
});
};
adminApi.getTopicData = (kafkaHost, mainWindow) => {
const client = new kafka.KafkaClient({ kafkaHost });
}
/**
*
* @param {String} uri the connection uri that the user types into connection input
* @param {Electron Window} mainWindow Main window that gets data
*
* Makes a connection to Kafka server to fetch a list of topics
* Transforms the data coming back from the Kafka broker into pertinent data to send back to client
*
*
*/
const getTopicData = (uri, mainWindow) => {
// Declares a new instance of client that will be used to make a connection
const client = new kafka.KafkaClient({ kafkaHost: uri });
// Declaring a new kafka.Admin instance creates a connection to the Kafka admin API
<<<<<<<
Promise.all(resultTopic.map(x => x.messages)).then(() => {
=======
// gets number of messages and waits for promise to resolve before sending the topics to client
Promise.all(resultTopic.map(x => x.messages)).then(result => {
>>>>>>>
Promise.all(resultTopic.map(x => x.messages)).then(() => {
<<<<<<<
module.exports = adminApi;
=======
module.exports = { getTopicData, getPartitionData, buildTopicObj };
>>>>>>>
module.exports = adminApi; |
<<<<<<<
core(pageTpl, true, extractor, injector, '.tpl',
=======
core(pageTpl, extractor, '.tpl',
>>>>>>>
core(pageTpl, true, extractor, '.tpl',
<<<<<<<
core(pageTpl, true, extractor, injector, '.tpl',
=======
core(pageTpl, extractor, '.tpl',
>>>>>>>
core(pageTpl, true, extractor, '.tpl',
<<<<<<<
core('', true, extractor, injector, '.tpl',
=======
core('', extractor, '.tpl',
>>>>>>>
core('', true, extractor, '.tpl',
<<<<<<<
core(pageTpl, true, {}, injector, '.tpl',
=======
core(pageTpl, {}, '.tpl',
>>>>>>>
core(pageTpl, true, {}, '.tpl',
<<<<<<<
'[webpack-component-loader]: something wrong with the extractor or injector'
);
});
it('unvalidate injector should not be passed', function(){
clearBuild();
const pageTpl = fs.readFileSync(path.join(__dirname, './fixture/pageC/pageC.tpl'), 'utf8');
expect(()=>{
core(pageTpl, true, extractor, {}, '.tpl',
path.join(__dirname, './fixture'),
path.join(__dirname, './assetsCoreTest/js'),
path.join(__dirname, './assetsCoreTest/css'),
path.join(__dirname, './assetsCoreTest/templates'),
path.join(__dirname, './fixture/pageC/pageC.tpl')
)
}).toThrowError(
'[webpack-component-loader]: something wrong with the extractor or injector'
=======
'[webpack-component-loader]: something wrong with the extractor'
>>>>>>>
'[webpack-component-loader]: something wrong with the extractor' |
<<<<<<<
=======
thermalVoid: ThermalVoid,
glacialSpike: GlacialSpike,
>>>>>>>
<<<<<<<
// Cooldowns
=======
//Cooldowns
>>>>>>>
// Cooldowns |
<<<<<<<
change(date(2019, 10, 25), <>Added missing spell information for resource refunds and gains from <SpellLink id={SPELLS.LUCID_DREAMS_MINOR.id} /> and <SpellLink id={SPELLS.VISION_OF_PERFECTION.id} />.</>, Juko8),
change(date(2019, 10, 13), <>Added extra information and cleaned up Vantus Rune infographic. />.</>, Abelito75),
=======
change(date(2019, 10, 24), <>Replaced the activity time statistic icons that had outgrown their space with smaller ones. <small>I only fixed it for <a href="https://hacktoberfest.digitalocean.com/">the shirt</a>.</small></>, Zerotorescue),
change(date(2019, 10, 24), 'Updated nodejs for docker.', JeremyDwayne),
change(date(2019, 10, 19), <>Fixed an issue in the character tab caused it to break for logs without essences.</>, Draenal),
change(date(2019, 10, 13), <>Added extra information and cleaned up Vantus Rune infographic.</>, Abelito75),
>>>>>>>
change(date(2019, 10, 25), <>Added missing spell information for resource refunds and gains from <SpellLink id={SPELLS.LUCID_DREAMS_MINOR.id} /> and <SpellLink id={SPELLS.VISION_OF_PERFECTION.id} />.</>, Juko8),
change(date(2019, 10, 13), <>Added extra information and cleaned up Vantus Rune infographic. />.</>, Abelito75),
change(date(2019, 10, 24), <>Replaced the activity time statistic icons that had outgrown their space with smaller ones. <small>I only fixed it for <a href="https://hacktoberfest.digitalocean.com/">the shirt</a>.</small></>, Zerotorescue),
change(date(2019, 10, 24), 'Updated nodejs for docker.', JeremyDwayne),
change(date(2019, 10, 19), <>Fixed an issue in the character tab caused it to break for logs without essences.</>, Draenal),
change(date(2019, 10, 13), <>Added extra information and cleaned up Vantus Rune infographic.</>, Abelito75), |
<<<<<<<
.pipe(gulp.dest('./ext/content'));
gulp.src('./src/*.html')
.pipe(gulp.dest('./ext/content'));
=======
.pipe(gulp.dest('./ext/content'));
});
gulp.task('images', function() {
gulp.src('./src/icons/*.png')
.pipe(imageminOptipng({optimizationLevel: 3})())
.pipe(gulp.dest('./ext/icons'));
});
gulp.task('manifest', function() {
var options = {
'name': packageJson.name,
'version': packageJson.version,
'description': packageJson.description,
'homepage_url': packageJson.repository.url
};
>>>>>>>
.pipe(gulp.dest('./ext/content'));
gulp.src('./src/*.html')
.pipe(gulp.dest('./ext/content'));
});
gulp.task('images', function() {
gulp.src('./src/icons/*.png')
.pipe(imageminOptipng({optimizationLevel: 3})())
.pipe(gulp.dest('./ext/icons'));
});
gulp.task('manifest', function() {
var options = {
'name': packageJson.name,
'version': packageJson.version,
'description': packageJson.description,
'homepage_url': packageJson.repository.url
}; |
<<<<<<<
/** @return {{source: string, lineCount: number}} */
=======
/**
* Looks for all `<dom-module>` elements, removing any `<script>`'s without a
* `src` and any `<link>` tags, as these are processed in separate steps.
*/
>>>>>>>
/**
* Looks for all `<dom-module>` elements, removing any `<script>`'s without a
* `src` and any `<link>` tags, as these are processed in separate steps.
* @return {{source: string, lineCount: number}}
*/
<<<<<<<
/** @return {{source: string, lineCount: number}} */
=======
/**
* Look for all `<link>` elements and turn them into `import` statements.
* e.g.
* ```
* <link rel="import" href="paper-input/paper-input.html">
* becomes:
* import 'paper-input/paper-input.html';
* ```
*/
>>>>>>>
/**
* Look for all `<link>` elements and turn them into `import` statements.
* e.g.
* ```
* <link rel="import" href="paper-input/paper-input.html">
* becomes:
* import 'paper-input/paper-input.html';
* ```
* @return {{source: string, lineCount: number}}
*/
<<<<<<<
/**
* @param {string} initialSource previously generated JS
* @param {number} lineOffset number of lines already in initialSource
* @return {{source: string, sourceMap: Object=}}
*/
scripts(initialSource, lineOffset) {
=======
/**
* Look for all `<script>` elements. If the script has a valid `src` attribute
* it will be converted to an `import` statement.
* e.g.
* ```
* <script src="foo.js">
* becomes:
* import 'foo';
* ```
* Otherwise if it's an inline script block, the content will be serialized
* and returned as part of the bundle.
*/
scripts() {
>>>>>>>
/**
* Look for all `<script>` elements. If the script has a valid `src` attribute
* it will be converted to an `import` statement.
* e.g.
* ```
* <script src="foo.js">
* becomes:
* import 'foo';
* ```
* Otherwise if it's an inline script block, the content will be serialized
* and returned as part of the bundle.
* @param {string} initialSource previously generated JS
* @param {number} lineOffset number of lines already in initialSource
* @return {{source: string, sourceMap: Object=}}
*/
scripts(initialSource, lineOffset) { |
<<<<<<<
import { Sharrq } from 'CONTRIBUTORS';
=======
import React from 'react';
import { Chizu, Dambroda, Putro, Sharrq } from 'CONTRIBUTORS';
import SpellLink from 'common/SpellLink';
import SPELLS from 'common/SPELLS';
>>>>>>>
import { Dambroda, Sharrq } from 'CONTRIBUTORS';
<<<<<<<
change(date(2020, 10, 15), 'Updated Spellbook and added Conduit, Legendary, and Covenant Spell IDs', Sharrq),
=======
change(date(2020, 10, 15), 'Fixed a crash in prepatch related to Unstable Affliction changes.', Dambroda),
>>>>>>>
change(date(2020, 10, 15), 'Updated Spellbook and added Conduit, Legendary, and Covenant Spell IDs', Sharrq),
change(date(2020, 10, 15), 'Fixed a crash in prepatch related to Unstable Affliction changes.', Dambroda),
<<<<<<<
=======
change(date(2020, 6, 12), 'Moved probability helpers to a shared folder.', Putro),
change(date(2019, 3, 18), 'Updated the visuals to match new WoWAnalyzer look!', [Chizu]),
change(date(2018, 12, 24), <>Now showing average remaining dot length on <SpellLink id={SPELLS.DEATHBOLT_TALENT.id} /> casts.</>, [Chizu]),
change(date(2018, 12, 21), <>Added <SpellLink id={SPELLS.PANDEMIC_INVOCATION.id} /> trait and updated <SpellLink id={SPELLS.INEVITABLE_DEMISE.id} /> icon.</>, [Chizu]),
change(date(2018, 12, 23), 'Changed display of damage in various places. Now shows % of total damage done and DPS with raw values in tooltip.', [Chizu]),
change(date(2018, 12, 10), <>Updated for patch 8.1 - <SpellLink id={SPELLS.UNSTABLE_AFFLICTION.id} /> nerf.</>, [Chizu]),
change(date(2018, 11, 15), <>Added <SpellLink id={SPELLS.UNSTABLE_AFFLICTION.id} /> to timeline as well</>, [Chizu]),
change(date(2018, 11, 12), 'Certain buffs or debuffs now show in timeline.', [Chizu]),
change(date(2018, 10, 15), <>Added <SpellLink id={SPELLS.VILE_TAINT_TALENT.id} />, <SpellLink id={SPELLS.GRIMOIRE_OF_SACRIFICE_TALENT.id} /> and <SpellLink id={SPELLS.SHADOW_EMBRACE_TALENT.id} /> modules.</>, [Chizu]),
change(date(2018, 10, 8), <>Added simple <SpellLink id={SPELLS.NIGHTFALL_TALENT.id} />, <SpellLink id={SPELLS.DRAIN_SOUL_TALENT.id} /> and <SpellLink id={SPELLS.PHANTOM_SINGULARITY_TALENT.id} /> modules.</>, [Chizu]),
change(date(2018, 9, 30), <>Added <SpellLink id={SPELLS.SUMMON_DARKGLARE.id} /> module.</>, [Chizu]),
change(date(2018, 9, 21), 'Grouped dot uptimes and talents into their respective statistic boxes.', [Chizu]),
change(date(2018, 9, 21), 'Removed all legendaries and tier set modules.', [Chizu]),
change(date(2018, 9, 20), <>Added <SpellLink id={SPELLS.UNSTABLE_AFFLICTION.id} icon /> uptime module and added it into Checklist.</>, [Chizu]),
change(date(2018, 9, 20), <>Added <SpellLink id={SPELLS.DEATHBOLT_TALENT.id} icon /> module and made updates to <SpellLink id={SPELLS.HAUNT_TALENT.id} icon /> module.</>, [Chizu]),
change(date(2018, 6, 22), 'Updated the basics of the spec for BFA.', [Chizu]),
>>>>>>> |
<<<<<<<
12-11-2017 - Upgraded spec completeness to good (by Putro)
08-11-2017 - Fixed large FocusChart performance bugs
25-10-2017 - Added 5 new talent modules, fixed trueshot CD, added Focus Dump Checker
25-10-2017 - Updated True Aim to include damage contributed information
25-10-2017 - Adjust t202p to account for nerfs
=======
12-11-2017 - Updated config information (by Putro)
12-11-2017 - Added a suggestion for execute trueshots and a A Murder of Crows suggestion when boss has between 25 and 20% hp (by Putro)
08-11-2017 - Added cancelled cast module (by Putro)
08-11-2017 - Fixed large FocusChart performance bugs (by Leapis)
03-11-2017 - Minor update to the LnL modules calculation of expected procs (by Putro)
25-10-2017 - Added 5 new talent modules, fixed trueshot CD, added Focus Dump Checker (by Putro)
25-10-2017 - Updated True Aim to include damage contributed information (by Putro)
25-10-2017 - Adjust t202p to account for nerfs (by Putro)
>>>>>>>
12-11-2017 - Upgraded spec completeness to good (by Putro)
12-11-2017 - Updated config information (by Putro)
12-11-2017 - Added a suggestion for execute trueshots and a A Murder of Crows suggestion when boss has between 25 and 20% hp (by Putro)
08-11-2017 - Added cancelled cast module (by Putro)
08-11-2017 - Fixed large FocusChart performance bugs (by Leapis)
03-11-2017 - Minor update to the LnL modules calculation of expected procs (by Putro)
25-10-2017 - Added 5 new talent modules, fixed trueshot CD, added Focus Dump Checker (by Putro)
25-10-2017 - Updated True Aim to include damage contributed information (by Putro)
25-10-2017 - Adjust t202p to account for nerfs (by Putro) |
<<<<<<<
expect(myApp.getBootstrapProps().name).toEqual('lifecycle-props');
expect(myApp.getMountProps().name).toEqual('lifecycle-props');
expect(myApp.getUnmountProps().name).toEqual('lifecycle-props');
expect(myApp.getUnloadProps().name).toEqual('lifecycle-props');
done();
=======
expect(myApp.getBootstrapProps()).toEqual({appName: 'lifecycle-props', customProps: {}});
expect(myApp.getMountProps()).toEqual({appName: 'lifecycle-props', customProps: {}});
expect(myApp.getUnmountProps()).toEqual({appName: 'lifecycle-props', customProps: {}});
expect(myApp.getUnloadProps()).toEqual({appName: 'lifecycle-props', customProps: {}});
>>>>>>>
expect(myApp.getBootstrapProps().name).toEqual('lifecycle-props');
expect(myApp.getMountProps().name).toEqual('lifecycle-props');
expect(myApp.getUnmountProps().name).toEqual('lifecycle-props');
expect(myApp.getUnloadProps().name).toEqual('lifecycle-props');
<<<<<<<
singleSpa
.triggerAppChange()
.then(() => {
// This unmounts the app
window.location.hash = `#/no-app`;
return singleSpa.triggerAppChange();
})
.then(() => {
return singleSpa.unloadApplication('lifecycle-props-customProps');
})
.then(() => {
expect(myApp.getBootstrapProps().customProps).toEqual({test: 'test'});
expect(myApp.getMountProps().customProps).toEqual({test: 'test'});
expect(myApp.getUnmountProps().customProps).toEqual({test: 'test'});
expect(myApp.getUnloadProps().customProps).toEqual({test: 'test'});
=======
// This mounts the app
window.location.hash = activeHash;
>>>>>>>
// This mounts the app
window.location.hash = activeHash; |
<<<<<<<
this.state = {base: window.location.origin + "/api/devices", bridgelocation: window.location.origin, systemsbase: window.location.origin + "/system", huebase: window.location.origin + "/api", configs: [], backups: [], devices: [], device: {}, mapandid: [], type: "", settings: [], myToastMsg: [], logMsgs: [], loggerInfo: [], mapTypes: [], olddevicename: "", logShowAll: false, isInControl: false, showVera: false, showHarmony: false, showNest: false, showHue: false, showHal: false, showMqtt: false, showHass: false, showDomoticz: false, showLifx: false, habridgeversion: ""};
=======
this.state = {base: "./api/devices", bridgelocation: ".", systemsbase: "./system", huebase: "./api", configs: [], backups: [], devices: [], device: {}, mapandid: [], type: "", settings: [], myToastMsg: [], logMsgs: [], loggerInfo: [], mapTypes: [], olddevicename: "", logShowAll: false, isInControl: false, showVera: false, showHarmony: false, showNest: false, showHue: false, showHal: false, showMqtt: false, showHass: false, showDomoticz: false, habridgeversion: ""};
>>>>>>>
this.state = {base: "./api/devices", bridgelocation: ".", systemsbase: "./system", huebase: "./api", configs: [], backups: [], devices: [], device: {}, mapandid: [], type: "", settings: [], myToastMsg: [], logMsgs: [], loggerInfo: [], mapTypes: [], olddevicename: "", logShowAll: false, isInControl: false, showVera: false, showHarmony: false, showNest: false, showHue: false, showHal: false, showMqtt: false, showHass: false, showDomoticz: false, showLifx: false, habridgeversion: ""}; |
<<<<<<<
$scope.addFibarotoSettings = function (newfibaroname, newfibaroip, newfibarousername, newfibaropassword) {
if($scope.bridge.settings.fibaroaddress === undefined || $scope.bridge.settings.fibaroaddress === null) {
$scope.bridge.settings.fibaroaddress = { devices: [] };
}
var newFibaro = {name: newfibaroname, ip: newfibaroip, username: newfibarousername, password: newfibaropassword }
$scope.bridge.settings.fibaroaddress.devices.push(newFibaro);
$scope.newfibaroname = null;
$scope.newfibaroip = null;
$scope.newfibarousername = null;
$scope.newfibaropassword = null;
};
$scope.removeFibarotoSettings = function (fibaroname, fibaroip) {
for(var i = $scope.bridge.settings.fibaroaddress.devices.length - 1; i >= 0; i--) {
if($scope.bridge.settings.fibaroaddress.devices[i].name === fibaroname && $scope.bridge.settings.fibaroaddress.devices[i].ip === fibaroip) {
$scope.bridge.settings.fibaroaddress.devices.splice(i, 1);
}
}
};
$scope.addHarmonytoSettings = function (newharmonyname, newharmonyip) {
=======
$scope.addHarmonytoSettings = function (newharmonyname, newharmonyip, newharmonywebhook) {
>>>>>>>
$scope.addFibarotoSettings = function (newfibaroname, newfibaroip, newfibarousername, newfibaropassword) {
if($scope.bridge.settings.fibaroaddress === undefined || $scope.bridge.settings.fibaroaddress === null) {
$scope.bridge.settings.fibaroaddress = { devices: [] };
}
var newFibaro = {name: newfibaroname, ip: newfibaroip, username: newfibarousername, password: newfibaropassword }
$scope.bridge.settings.fibaroaddress.devices.push(newFibaro);
$scope.newfibaroname = null;
$scope.newfibaroip = null;
$scope.newfibarousername = null;
$scope.newfibaropassword = null;
};
$scope.removeFibarotoSettings = function (fibaroname, fibaroip) {
for(var i = $scope.bridge.settings.fibaroaddress.devices.length - 1; i >= 0; i--) {
if($scope.bridge.settings.fibaroaddress.devices[i].name === fibaroname && $scope.bridge.settings.fibaroaddress.devices[i].ip === fibaroip) {
$scope.bridge.settings.fibaroaddress.devices.splice(i, 1);
}
}
};
$scope.addHarmonytoSettings = function (newharmonyname, newharmonyip, newharmonywebhook) { |
<<<<<<<
<span className='info'>via {t.type}</span>
=======
<span className='info'>{i18n('sync-wifi-info')}</span>
>>>>>>>
<span className='info'>via {i18n(`sync-${t.type}-info`)}</span>
<<<<<<<
=======
{Object.keys(files).map(function (k) {
var t = files[k]
return (
<Target key={t.target.filename}>
<div className='target'>
<span className='name'>{path.basename(t.target.filename)}</span>
<span className='info'>{i18n('sync-file-info')}</span>
</div>
<h3>{t.message}</h3>
</Target>
)
})}
>>>>>>>
<<<<<<<
<button className='big' onClick={onClose}>
Done
=======
<button
className='big' onClick={this.onClose.bind(this)}
disabled={disabled}>
{disabled ? `${i18n('wait')}…` : i18n('done')}
>>>>>>>
<button className='big' onClick={onClose}>
('done') |
<<<<<<<
'<thead class="fc-head">' +
'<tr>' +
'<td class="fc-head-container ' + theme.getClass('widgetHeader') + '"> </td>' +
'</tr>' +
'</thead>' +
=======
(this.opt('columnHead') ?
'<thead class="fc-head">' +
'<tr>' +
'<td class="fc-head-container ' + theme.getClass('widgetHeader') + '"></td>' +
'</tr>' +
'</thead>' :
''
) +
>>>>>>>
(this.opt('columnHead') ?
'<thead class="fc-head">' +
'<tr>' +
'<td class="fc-head-container ' + theme.getClass('widgetHeader') + '"> </td>' +
'</tr>' +
'</thead>' :
''
) + |
<<<<<<<
var dropDateMeta
var dropDateHasTime
if (typeof dropDate === 'string') {
dropDateMeta = FullCalendar.parseMarker(dropDate)
dropDateHasTime = !dropDateMeta.isTimeUnspecified
dropDate = dropDateMeta.marker
} else {
dropDateHasTime = true
}
eventEl = $('.' + (eventClassName || 'fc-event') + ':first')
=======
dropDate = calendar.moment(dropDate)
eventEl = eventClassName ? $(`.${eventClassName}:first`) : getFirstEventEl()
>>>>>>>
var dropDateMeta
var dropDateHasTime
if (typeof dropDate === 'string') {
dropDateMeta = FullCalendar.parseMarker(dropDate)
dropDateHasTime = !dropDateMeta.isTimeUnspecified
dropDate = dropDateMeta.marker
} else {
dropDateHasTime = true
}
eventEl = eventClassName ? $(`.${eventClassName}:first`) : getFirstEventEl()
<<<<<<<
if (dropDateHasTime) {
dragEl = eventEl.find('.fc-time')
dayEl = $('.fc-time-grid .fc-day[data-date="' + formatIsoDay(dropDate) + '"]')
slatIndex = dropDate.getUTCHours() * 2 + (dropDate.getUTCMinutes() / 30) // assumes slotDuration:'30:00'
slatEl = $('.fc-slats tr:eq(' + slatIndex + ')')
=======
if (dropDate.hasTime()) {
dragEl = getEventElTimeEl(eventEl)
dayEl = getTimeGridDayEls(dropDate)
slatIndex = dropDate.hours() * 2 + (dropDate.minutes() / 30) // assumes slotDuration:'30:00'
slatEl = getSlotElByIndex(slatIndex)
>>>>>>>
if (dropDateHasTime) {
dragEl = getEventElTimeEl(eventEl)
dayEl = getTimeGridDayEls(dropDate)
slatIndex = dropDate.getUTCHours() * 2 + (dropDate.getUTCMinutes() / 30) // assumes slotDuration:'30:00'
slatEl = getSlotElByIndex(slatIndex)
<<<<<<<
dragEl = eventEl.find('.fc-title')
dayEl = $('.fc-day-grid .fc-day[data-date="' + formatIsoDay(dropDate) + '"]')
=======
dragEl = getEventElTitleEl(eventEl)
dayEl = getDayEl(dropDate.clone())
>>>>>>>
dragEl = getEventElTitleEl(eventEl)
dayEl = getDayEl(dropDate)
<<<<<<<
lastDayEl = $('.fc-day-grid .fc-day[data-date="' + formatIsoDay(FullCalendar.addDays(resizeDate, -1)) + '"]')
=======
lastDayEl = getDayEl(resizeDate.clone().add(-1, 'day'))
>>>>>>>
lastDayEl = getDayEl(addDays(resizeDate, -1))
<<<<<<<
if (!isAllDay) {
firstDayEl = $('.fc-time-grid .fc-day[data-date="' + formatIsoDay(start) + '"]')
lastDayEl = $('.fc-time-grid .fc-day[data-date="' + formatIsoDay(end) + '"]')
firstSlatIndex = start.getUTCHours() * 2 + (start.getUTCMinutes() / 30) // assumes slotDuration:'30:00'
lastSlatIndex = end.getUTCHours() * 2 + (end.getUTCMinutes() / 30) - 1 // assumes slotDuration:'30:00'
firstSlatEl = $('.fc-slats tr:eq(' + firstSlatIndex + ')')
lastSlatEl = $('.fc-slats tr:eq(' + lastSlatIndex + ')')
=======
calendar = currentCalendar
start = calendar.moment('2014-11-12')
end = calendar.moment(end)
if (startTime) {
start.time(startTime)
firstDayEl = getTimeGridDayEls(start)
lastDayEl = getTimeGridDayEls(end)
firstSlatIndex = start.hours() * 2 + (start.minutes() / 30) // assumes slotDuration:'30:00'
lastSlatIndex = end.hours() * 2 + (end.minutes() / 30) - 1 // assumes slotDuration:'30:00'
firstSlatEl = getSlotElByIndex(firstSlatIndex)
lastSlatEl = getSlotElByIndex(lastSlatIndex)
>>>>>>>
if (!isAllDay) {
firstDayEl = getTimeGridDayEls(start)
lastDayEl = getTimeGridDayEls(end)
firstSlatIndex = start.getUTCHours() * 2 + (start.getUTCMinutes() / 30) // assumes slotDuration:'30:00'
lastSlatIndex = end.getUTCHours() * 2 + (end.getUTCMinutes() / 30) - 1 // assumes slotDuration:'30:00'
firstSlatEl = getSlotElByIndex(firstSlatIndex)
lastSlatEl = getSlotElByIndex(lastSlatIndex)
<<<<<<<
firstDayEl = $('.fc-day-grid .fc-day[data-date="' + formatIsoDay(start) + '"]')
lastDayEl = $('.fc-day-grid .fc-day[data-date="' + formatIsoDay(new Date(end.valueOf() - 1)) + '"]') // inclusive
=======
end.stripTime()
firstDayEl = getDayEl(start)
lastDayEl = getDayEl(end.clone().add(-1, 'day'))
>>>>>>>
firstDayEl = getDayEl(start)
lastDayEl = getDayEl(new Date(end.valueOf() - 1)) // inclusive |
<<<<<<<
if (now.isWithin(currentView.intervalStart, currentView.intervalEnd)) {
toolbarsManager.proxyCall('disableButton', 'today');
=======
if (now >= currentView.intervalStart && now < currentView.intervalEnd) {
header.disableButton('today');
>>>>>>>
if (now >= currentView.intervalStart && now < currentView.intervalEnd) {
toolbarsManager.proxyCall('disableButton', 'today'); |
<<<<<<<
t.fetchEventSources = fetchEventSources;
=======
t.getEventSources = getEventSources;
>>>>>>>
t.fetchEventSources = fetchEventSources;
t.getEventSources = getEventSources; |
<<<<<<<
settings.defaultDate = FullCalendar.moment(referenceDate).add(index, 'months')
settings.eventAfterAllRender = function() {
expect($('.fc-toolbar h2')).toContainText(month)
done()
}
$('#cal').fullCalendar(settings)
=======
initCalendar({
defaultDate: $.fullCalendar.moment(referenceDate).add(index, 'months'),
eventAfterAllRender: function() {
expect($('.fc-toolbar h2')).toContainText(month)
done()
}
})
>>>>>>>
initCalendar({
defaultDate: FullCalendar.moment(referenceDate).add(index, 'months'),
eventAfterAllRender: function() {
expect($('.fc-toolbar h2')).toContainText(month)
done()
}
})
<<<<<<<
settings.defaultDate = FullCalendar.moment(referenceDate).add(index, 'months')
settings.eventAfterAllRender = function() {
if (viewClass === 'month') { // with month view check for occurence of the monthname in the title
expect($('.fc-toolbar h2')).toContainText(localeMonth)
} else { // with day views ensure that title contains the properly formatted phrase
expect($('.fc-toolbar h2')).toHaveText(settings.defaultDate.format('LL'))
=======
var defaultDate = $.fullCalendar.moment(referenceDate).add(index, 'months')
initCalendar({
defaultDate: defaultDate,
eventAfterAllRender: function() {
if (viewClass === 'month') { // with month view check for occurence of the monthname in the title
expect($('.fc-toolbar h2')).toContainText(localeMonth)
} else { // with day views ensure that title contains the properly formatted phrase
expect($('.fc-toolbar h2')).toHaveText(defaultDate.format('LL'))
}
done()
>>>>>>>
var defaultDate = FullCalendar.moment(referenceDate).add(index, 'months')
initCalendar({
defaultDate: defaultDate,
eventAfterAllRender: function() {
if (viewClass === 'month') { // with month view check for occurence of the monthname in the title
expect($('.fc-toolbar h2')).toContainText(localeMonth)
} else { // with day views ensure that title contains the properly formatted phrase
expect($('.fc-toolbar h2')).toHaveText(defaultDate.format('LL'))
}
done()
<<<<<<<
settings.defaultDate = FullCalendar.moment(referenceDate).add(index, 'months')
settings.monthNames = months
settings.eventAfterAllRender = function() {
expect($('.fc-toolbar h2')).toContainText(month)
done()
}
$('#cal').fullCalendar(settings)
=======
initCalendar({
defaultDate: $.fullCalendar.moment(referenceDate).add(index, 'months'),
monthNames: months,
eventAfterAllRender: function() {
expect($('.fc-toolbar h2')).toContainText(month)
done()
}
})
>>>>>>>
initCalendar({
defaultDate: FullCalendar.moment(referenceDate).add(index, 'months'),
monthNames: months,
eventAfterAllRender: function() {
expect($('.fc-toolbar h2')).toContainText(month)
done()
}
}) |
<<<<<<<
expect(currentCalendar.getEvents().length).toEqual(3)
expect($('.fc-event').length).toEqual(3)
=======
expect(currentCalendar.clientEvents().length).toEqual(3)
expect(getEventEls().length).toEqual(3)
>>>>>>>
expect(currentCalendar.getEvents().length).toEqual(3)
expect(getEventEls().length).toEqual(3) |
<<<<<<<
=======
for(let i=0;i< loanCount.valueOf();i++)
{
contractInstance.getLoanDetailsByAddressPosition.call(account, i).then(function(el) {
console.log(el);
var newRowContent = '<tr class="'+LOANSTATECLASS[el[0].valueOf()]+'">\
<td>'+LOANSTATE[el[0].valueOf()]+'</td>\
<td>'+Date(el[1].valueOf())+'</td>\
<td>'+el[2].valueOf()/wtoE+'</td>\
<td>'+el[3].valueOf()+'</td>\
<td>'+el[4].valueOf()+'</td>\
<td>'+el[5].valueOf()+'</td>\
</tr>';
$("#loan-rows tbody").append(newRowContent);
});
}
>>>>>>>
<<<<<<<
contractInstance.newLoan(amount,date,{gas: 1400000, from: account}).then(function() {
window.href = '/borrower.html';
=======
// contractInstance.defaultAccount = account;
contractInstance.newLoan(web3.toWei(amount,'ether'),date,{gas: 1400000, from: account}).then(function() {
console.log("CREATED NEW LOAN");
>>>>>>>
// contractInstance.defaultAccount = account;
contractInstance.newLoan(web3.toWei(amount,'ether'),date,{gas: 1400000, from: account}).then(function() {
console.log("CREATED NEW LOAN"); |
<<<<<<<
date: new Date('2018-05-20'),
changes: <React.Fragment>Added support for <SpellLink id={SPELLS.DELUGE_TALENT.id} /> and <ItemLink id={ITEMS.ELEMENTAL_REBALANCERS.id}/>.</React.Fragment>,
contributors: [niseko],
},
{
=======
date: new Date('2018-05-26'),
changes: <React.Fragment>The <SpellLink id={SPELLS.CLOUDBURST_TOTEM_TALENT.id} /> buff is now displayed in the timeline.</React.Fragment>,
contributors: [niseko],
},
{
>>>>>>>
date: new Date('2018-05-26'),
changes: <React.Fragment>The <SpellLink id={SPELLS.CLOUDBURST_TOTEM_TALENT.id} /> buff is now displayed in the timeline.</React.Fragment>,
contributors: [niseko],
},
{
date: new Date('2018-05-20'),
changes: <React.Fragment>Added support for <SpellLink id={SPELLS.DELUGE_TALENT.id} /> and <ItemLink id={ITEMS.ELEMENTAL_REBALANCERS.id}/>.</React.Fragment>,
contributors: [niseko],
},
{ |
<<<<<<<
var only = false;
=======
var closed = false;
>>>>>>>
var only = false;
var closed = false;
<<<<<<<
out.close();
if (!code && !t._ok && (!only || name === only)) {
process.exit(1);
}
=======
if (!closed) {
closed = true
out.close();
}
if (!code && !t._ok) process.exit(1);
>>>>>>>
if (!closed) {
closed = true
out.close();
}
if (!code && !t._ok && (!only || name === only)) {
process.exit(1);
} |
<<<<<<<
adBridge.pushChange({'size': size, 'orientation': adContainerOrientation, 'currentPosition': currentPosition});
=======
//adBridge.pushChange({'size': size, 'orientation': adContainerOrientation, 'currentPosition': currentPosition});
currentPosition = {'x': currentPosition.y, 'y': (maxSize.width - expandProperties.width - currentPosition.x), 'width': currentPosition.height, 'height': currentPosition.width};
screenSize = {width: screenSize.height, height: screenSize.width};
adBridge.pushChange({'size': size, 'orientation': adContainerOrientation, 'currentPosition': currentPosition, 'screenSize': screenSize});
>>>>>>>
screenSize = {width: screenSize.height, height: screenSize.width};
adBridge.pushChange({'size': size, 'orientation': adContainerOrientation, 'currentPosition': currentPosition, 'screenSize': screenSize}); |
<<<<<<<
let url = History.getState().data.url || History.getState().url;
url = url.replace(this.appUrl, '');
if (url === '') {
url = '/';
}
=======
this.activeRoute = null;
const url = History.getState().data.url || History.getState().hash;
>>>>>>>
this.activeRoute = null;
let url = History.getState().data.url || History.getState().hash;
url = url.replace(this.appUrl, '');
if (url === '') {
url = '/';
} |
<<<<<<<
=======
/**
* SoupSpec constructor
*/
var SoupSpec = function (soupName, features) {
this.soupName = soupName;
this.features = features;
};
>>>>>>>
/**
* SoupSpec constructor
*/
var SoupSpec = function (soupName, features) {
this.soupName = soupName;
this.features = features;
};
<<<<<<<
var removeSoup = function (isGlobalStore, soupName, successCB, errorCB) {
if (checkFirstArg(arguments)) return;
storeConsole.debug("SmartStore.removeSoup:isGlobalStore=" +isGlobalStore+ ",soupName=" + soupName);
=======
var registerSoupWithSpec = function (soupSpec, indexSpecs, successCB, errorCB) {
storeConsole.debug("SmartStore.registerSoupWithSpec: '" + JSON.stringify(soupSpec) + "' indexSpecs: " + JSON.stringify(indexSpecs));
exec(SALESFORCE_MOBILE_SDK_VERSION, successCB, errorCB, SERVICE,
"pgRegisterSoup",
[{"soupSpec": soupSpec, "indexes": indexSpecs}]
);
};
var removeSoup = function (soupName, successCB, errorCB) {
storeConsole.debug("SmartStore.removeSoup: " + soupName);
>>>>>>>
var registerSoupWithSpec = function (isGlobalStore, soupSpec, indexSpecs, successCB, errorCB) {
storeConsole.debug("SmartStore.registerSoupWithSpec:isGlobalStore=" +isGlobalStore+ ",soupSpec="+ JSON.stringify(soupSpec) + ",indexSpecs: " + JSON.stringify(indexSpecs));
exec(SALESFORCE_MOBILE_SDK_VERSION, successCB, errorCB, SERVICE,
"pgRegisterSoup",
[{"soupSpec": soupSpec, "indexes": indexSpecs, "isGlobalStore": isGlobalStore}]
);
};
var removeSoup = function (isGlobalStore, soupName, successCB, errorCB) {
if (checkFirstArg(arguments)) return;
storeConsole.debug("SmartStore.removeSoup:isGlobalStore=" +isGlobalStore+ ",soupName=" + soupName);
<<<<<<<
var alterSoup = function (isGlobalStore, soupName, indexSpecs, reIndexData, successCB, errorCB) {
if (checkFirstArg(arguments)) return;
storeConsole.debug("SmartStore.alterSoup:isGlobalStore=" +isGlobalStore+ ",soupName=" + soupName + ",indexSpecs=" + JSON.stringify(indexSpecs));
=======
var getSoupSpec = function(soupName, successCB, errorCB) {
storeConsole.debug("SmartStore.getSoupSpec: " + soupName);
exec(SALESFORCE_MOBILE_SDK_VERSION, successCB, errorCB, SERVICE,
"pgGetSoupSpec",
[{"soupName": soupName}]
);
};
var alterSoup = function (soupName, indexSpecs, reIndexData, successCB, errorCB) {
storeConsole.debug("SmartStore.alterSoup: '" + soupName + "' indexSpecs: " + JSON.stringify(indexSpecs));
>>>>>>>
var getSoupSpec = function(isGlobalStore, soupName, successCB, errorCB) {
storeConsole.debug("SmartStore.getSoupSpec:isGlobalStore=" +isGlobalStore+ ",soupName=" + soupName);
exec(SALESFORCE_MOBILE_SDK_VERSION, successCB, errorCB, SERVICE,
"pgGetSoupSpec",
[{"soupName": soupName, "isGlobalStore": isGlobalStore}]
);
};
var alterSoup = function (isGlobalStore, soupName, indexSpecs, reIndexData, successCB, errorCB) {
if (checkFirstArg(arguments)) return;
storeConsole.debug("SmartStore.alterSoup:isGlobalStore=" +isGlobalStore+ ",soupName=" + soupName + ",indexSpecs=" + JSON.stringify(indexSpecs)); |
<<<<<<<
/*! angular-google-maps 1.1.0-SNAPSHOT 2014-03-30
=======
/*! angular-google-maps 1.0.18 2014-04-03
>>>>>>>
/*! angular-google-maps 1.1.0-SNAPSHOT 2014-04-03
<<<<<<<
},
convertPathPoints: function(path) {
var array, i, result;
result = new google.maps.MVCArray();
i = 0;
if (angular.isUndefined(path.type)) {
while (i < path.length) {
result.push(new google.maps.LatLng(path[i].latitude, path[i].longitude));
i++;
}
=======
};
return doChunk();
}
};
});
}).call(this);
/*
Useful function callbacks that should be defined at later time.
Mainly to be used for specs to verify creation / linking.
This is to lead a common design in notifying child stuff.
*/
(function() {
this.ngGmapModule("directives.api.utils", function() {
return this.ChildEvents = {
onChildCreation: function(child) {}
};
});
}).call(this);
(function() {
this.ngGmapModule("directives.api.utils", function() {
return this.GmapUtil = {
getLabelPositionPoint: function(anchor) {
var xPos, yPos;
if (anchor === void 0) {
return void 0;
}
anchor = /^([-\d\.]+)\s([-\d\.]+)$/.exec(anchor);
xPos = parseFloat(anchor[1]);
yPos = parseFloat(anchor[2]);
if ((xPos != null) && (yPos != null)) {
return new google.maps.Point(xPos, yPos);
}
},
createMarkerOptions: function(coords, icon, defaults, map) {
var opts;
if (map == null) {
map = void 0;
}
if (defaults == null) {
defaults = {};
}
opts = angular.extend({}, defaults, {
position: defaults.position != null ? defaults.position : new google.maps.LatLng(coords.latitude, coords.longitude),
icon: defaults.icon != null ? defaults.icon : icon,
visible: defaults.visible != null ? defaults.visible : (coords.latitude != null) && (coords.longitude != null)
});
if (map != null) {
opts.map = map;
}
return opts;
},
createWindowOptions: function(gMarker, scope, content, defaults) {
if ((content != null) && (defaults != null)) {
return angular.extend({}, defaults, {
content: defaults.content != null ? defaults.content : content,
position: defaults.position != null ? defaults.position : angular.isObject(gMarker) ? gMarker.getPosition() : new google.maps.LatLng(scope.coords.latitude, scope.coords.longitude)
});
} else {
if (!defaults) {
>>>>>>>
},
convertPathPoints: function(path) {
var array, i, result;
result = new google.maps.MVCArray();
i = 0;
if (angular.isUndefined(path.type)) {
while (i < path.length) {
result.push(new google.maps.LatLng(path[i].latitude, path[i].longitude));
i++;
}
<<<<<<<
angular.module("google-maps.directives.api.managers").factory("ClustererMarkerManager", [
"BaseObject", "Logger", function(BaseObject, Logger) {
var ClustererMarkerManager;
ClustererMarkerManager = (function(_super) {
__extends(ClustererMarkerManager, _super);
function ClustererMarkerManager(gMap, opt_markers, opt_options, opt_events) {
this.clear = __bind(this.clear, this);
this.draw = __bind(this.draw, this);
this.removeMany = __bind(this.removeMany, this);
this.remove = __bind(this.remove, this);
this.addMany = __bind(this.addMany, this);
this.add = __bind(this.add, this);
var eventHandler, eventName, self;
ClustererMarkerManager.__super__.constructor.call(this);
self = this;
this.opt_options = opt_options;
if ((opt_options != null) && opt_markers === void 0) {
this.clusterer = new MarkerClusterer(gMap, void 0, opt_options);
} else if ((opt_options != null) && (opt_markers != null)) {
this.clusterer = new MarkerClusterer(gMap, opt_markers, opt_options);
=======
this.ngGmapModule("directives.api.models.child", function() {
return this.MarkerChildModel = (function(_super) {
__extends(MarkerChildModel, _super);
MarkerChildModel.include(directives.api.utils.GmapUtil);
function MarkerChildModel(index, model, parentScope, gMap, $timeout, defaults, doClick, gMarkerManager, $injector) {
var self,
_this = this;
this.index = index;
this.model = model;
this.parentScope = parentScope;
this.gMap = gMap;
this.defaults = defaults;
this.doClick = doClick;
this.gMarkerManager = gMarkerManager;
this.watchDestroy = __bind(this.watchDestroy, this);
this.setLabelOptions = __bind(this.setLabelOptions, this);
this.isLabelDefined = __bind(this.isLabelDefined, this);
this.setOptions = __bind(this.setOptions, this);
this.setIcon = __bind(this.setIcon, this);
this.setCoords = __bind(this.setCoords, this);
this.destroy = __bind(this.destroy, this);
this.maybeSetScopeValue = __bind(this.maybeSetScopeValue, this);
this.createMarker = __bind(this.createMarker, this);
this.setMyScope = __bind(this.setMyScope, this);
self = this;
this.iconKey = this.parentScope.icon;
this.coordsKey = this.parentScope.coords;
this.clickKey = this.parentScope.click();
this.labelContentKey = this.parentScope.labelContent;
this.optionsKey = this.parentScope.options;
this.labelOptionsKey = this.parentScope.labelOptions;
this.myScope = this.parentScope.$new(false);
this.$injector = $injector;
this.myScope.model = this.model;
this.setMyScope(this.model, void 0, true);
this.createMarker(this.model);
this.myScope.$watch('model', function(newValue, oldValue) {
if (newValue !== oldValue) {
return _this.setMyScope(newValue, oldValue);
}
}, true);
this.$log = directives.api.utils.Logger;
this.$log.info(self);
this.watchDestroy(this.myScope);
}
MarkerChildModel.prototype.setMyScope = function(model, oldModel, isInit) {
var _this = this;
if (oldModel == null) {
oldModel = void 0;
}
if (isInit == null) {
isInit = false;
}
this.maybeSetScopeValue('icon', model, oldModel, this.iconKey, this.evalModelHandle, isInit, this.setIcon);
this.maybeSetScopeValue('coords', model, oldModel, this.coordsKey, this.evalModelHandle, isInit, this.setCoords);
this.maybeSetScopeValue('labelContent', model, oldModel, this.labelContentKey, this.evalModelHandle, isInit);
if (_.isFunction(this.clickKey) && this.$injector) {
this.myScope.click = function() {
return _this.$injector.invoke(_this.clickKey, void 0, {
"$markerModel": model
});
};
} else {
this.maybeSetScopeValue('click', model, oldModel, this.clickKey, this.evalModelHandle, isInit);
}
return this.createMarker(model, oldModel, isInit);
};
MarkerChildModel.prototype.createMarker = function(model, oldModel, isInit) {
var _this = this;
if (oldModel == null) {
oldModel = void 0;
}
if (isInit == null) {
isInit = false;
}
return this.maybeSetScopeValue('options', model, oldModel, this.optionsKey, function(lModel, lModelKey) {
var value;
if (lModel === void 0) {
return void 0;
}
value = lModelKey === 'self' ? lModel : lModel[lModelKey];
if (value === void 0) {
return value = lModelKey === void 0 ? _this.defaults : _this.myScope.options;
>>>>>>>
angular.module("google-maps.directives.api.managers").factory("ClustererMarkerManager", [
"BaseObject", "Logger", function(BaseObject, Logger) {
var ClustererMarkerManager;
ClustererMarkerManager = (function(_super) {
__extends(ClustererMarkerManager, _super);
function ClustererMarkerManager(gMap, opt_markers, opt_options, opt_events) {
this.clear = __bind(this.clear, this);
this.draw = __bind(this.draw, this);
this.removeMany = __bind(this.removeMany, this);
this.remove = __bind(this.remove, this);
this.addMany = __bind(this.addMany, this);
this.add = __bind(this.add, this);
var eventHandler, eventName, self;
ClustererMarkerManager.__super__.constructor.call(this);
self = this;
this.opt_options = opt_options;
if ((opt_options != null) && opt_markers === void 0) {
this.clusterer = new MarkerClusterer(gMap, void 0, opt_options);
} else if ((opt_options != null) && (opt_markers != null)) {
this.clusterer = new MarkerClusterer(gMap, opt_markers, opt_options);
<<<<<<<
angular.module("google-maps.directives.api").factory("Polyline", [
"IPolyline", "$timeout", "array-sync", "PolylineChildModel", function(IPolyline, $timeout, arraySync, PolylineChildModel) {
var Polyline, _ref;
return Polyline = (function(_super) {
__extends(Polyline, _super);
=======
this.ngGmapModule("directives.api.models.parent", function() {
return this.MarkersParentModel = (function(_super) {
__extends(MarkersParentModel, _super);
MarkersParentModel.include(directives.api.utils.ModelsWatcher);
function MarkersParentModel(scope, element, attrs, mapCtrl, $timeout, $injector) {
this.fit = __bind(this.fit, this);
this.onDestroy = __bind(this.onDestroy, this);
this.onWatch = __bind(this.onWatch, this);
this.reBuildMarkers = __bind(this.reBuildMarkers, this);
this.createMarkers = __bind(this.createMarkers, this);
this.validateScope = __bind(this.validateScope, this);
this.onTimeOut = __bind(this.onTimeOut, this);
var self;
MarkersParentModel.__super__.constructor.call(this, scope, element, attrs, mapCtrl, $timeout, $injector);
self = this;
this.markersIndex = 0;
this.gMarkerManager = void 0;
this.scope = scope;
this.scope.markerModels = [];
this.bigGulp = directives.api.utils.AsyncProcessor;
this.$timeout = $timeout;
this.$injector = $injector;
this.$log.info(this);
}
MarkersParentModel.prototype.onTimeOut = function(scope) {
this.watch('models', scope);
this.watch('doCluster', scope);
this.watch('clusterOptions', scope);
this.watch('fit', scope);
return this.createMarkers(scope);
};
MarkersParentModel.prototype.validateScope = function(scope) {
var modelsNotDefined;
modelsNotDefined = angular.isUndefined(scope.models) || scope.models === void 0;
if (modelsNotDefined) {
this.$log.error(this.constructor.name + ": no valid models attribute found");
}
return MarkersParentModel.__super__.validateScope.call(this, scope) || modelsNotDefined;
};
MarkersParentModel.prototype.createMarkers = function(scope) {
var markers,
_this = this;
if ((scope.doCluster != null) && scope.doCluster === true) {
if (scope.clusterOptions != null) {
if (this.gMarkerManager === void 0) {
this.gMarkerManager = new directives.api.managers.ClustererMarkerManager(this.mapCtrl.getMap(), void 0, scope.clusterOptions);
} else {
if (this.gMarkerManager.opt_options !== scope.clusterOptions) {
this.gMarkerManager = new directives.api.managers.ClustererMarkerManager(this.mapCtrl.getMap(), void 0, scope.clusterOptions);
}
}
} else {
this.gMarkerManager = new directives.api.managers.ClustererMarkerManager(this.mapCtrl.getMap());
}
} else {
this.gMarkerManager = new directives.api.managers.MarkerManager(this.mapCtrl.getMap());
}
markers = [];
scope.isMarkerModelsReady = false;
return this.bigGulp.handleLargeArray(scope.models, function(model) {
var child;
scope.doRebuild = true;
child = new directives.api.models.child.MarkerChildModel(_this.markersIndex, model, scope, _this.mapCtrl, _this.$timeout, _this.DEFAULTS, _this.doClick, _this.gMarkerManager, _this.$injector);
_this.$log.info('child', child, 'markers', markers);
markers.push(child);
return _this.markersIndex++;
}, (function() {}), function() {
_this.gMarkerManager.draw();
scope.markerModels = markers;
if (angular.isDefined(_this.attrs.fit) && (scope.fit != null) && scope.fit) {
_this.fit();
}
scope.isMarkerModelsReady = true;
if (scope.onMarkerModelsReady != null) {
return scope.onMarkerModelsReady(scope);
}
});
};
>>>>>>>
angular.module("google-maps.directives.api").factory("Polyline", [
"IPolyline", "$timeout", "array-sync", "PolylineChildModel", function(IPolyline, $timeout, arraySync, PolylineChildModel) {
var Polyline, _ref;
return Polyline = (function(_super) {
__extends(Polyline, _super);
<<<<<<<
=======
/*
Map marker directive
This directive is used to create a marker on an existing map.
This directive creates a new scope.
{attribute coords required} object containing latitude and longitude properties
{attribute icon optional} string url to image used for marker icon
{attribute animate optional} if set to false, the marker won't be animated (on by default)
*/
(function() {
angular.module("google-maps").directive("markers", [
"$timeout", "$injector", function($timeout, $injector) {
return new directives.api.Markers($timeout, $injector);
}
]);
}).call(this);
/*
!
The MIT License
Copyright (c) 2010-2013 Google, Inc. http://angularjs.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
angular-google-maps
https://github.com/nlaplante/angular-google-maps
@authors Bruno Queiroz, [email protected]
*/
/*
Marker label directive
This directive is used to create a marker label on an existing map.
{attribute content required} content of the label
{attribute anchor required} string that contains the x and y point position of the label
{attribute class optional} class to DOM object
{attribute style optional} style for the label
*/
>>>>>>> |
<<<<<<<
$scope.staticMarker = {
id: 0,
coords: {
latitude: 40.1451,
longitude: -99.6680
},
options: { draggable: true },
events: {
dragend: function (marker, eventName, args) {
$log.log('marker dragend');
$log.log(marker.getPosition().lat());
$log.log(marker.getPosition().lng());
}
}
=======
$scope.staticMarker = {
id: 0,
icon: 'assets/images/plane.png',
coords: {
latitude: 40.1451,
longitude: -99.6680
},
options: { draggable: true },
events: {
dragend: function (marker, eventName, args) {
$log.log('marker dragend');
$log.log(marker.getPosition().lat());
$log.log(marker.getPosition().lng());
>>>>>>>
$scope.staticMarker = {
id: 0,
icon: 'assets/images/plane.png',
coords: {
latitude: 40.1451,
longitude: -99.6680
},
options: { draggable: true },
events: {
dragend: function (marker, eventName, args) {
$log.log('marker dragend');
$log.log(marker.getPosition().lat());
$log.log(marker.getPosition().lng());
}
} |
<<<<<<<
PHOENIX_REBORN: {
id: 215775,
name: 'Phoenix Reborn',
icon: 'inv_misc_phoenixegg',
},
=======
METEOR_DAMAGE: {
id: 153564,
name: 'Meteor',
icon: 'spell_mage_meteor',
},
>>>>>>>
PHOENIX_REBORN: {
id: 215775,
name: 'Phoenix Reborn',
icon: 'inv_misc_phoenixegg',
},
METEOR_DAMAGE: {
id: 153564,
name: 'Meteor',
icon: 'spell_mage_meteor',
},
<<<<<<<
PHOENIX_REBORN_TRAIT: {
id: 215773,
name: 'Phoenix Reborn',
icon: 'inv_sword_1h_artifactfelomelorn_d_01',
},
=======
ERUPTING_INFERNAL_CORE: {
id: 248147,
name: 'Erupting Infernal Core',
icon: 'spell_mage_flameorb',
},
>>>>>>>
PHOENIX_REBORN_TRAIT: {
id: 215773,
name: 'Phoenix Reborn',
icon: 'inv_sword_1h_artifactfelomelorn_d_01',
},
ERUPTING_INFERNAL_CORE: {
id: 248147,
name: 'Erupting Infernal Core',
icon: 'spell_mage_flameorb',
}, |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.