conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
config: { redirect: 'second' },
router
=======
config: { redirect: 'second' },
router: new AppRouter(new Container(), new MockHistory(), new PipelineProvider(new Container()))
});
redirectSecondInstruction = new NavigationInstruction({
fragment: 'first/10',
querySt... |
<<<<<<<
beforeEach( () => {
modelDoc = new ModelDocument();
modelRoot = modelDoc.createRoot();
modelSelection = modelDoc.selection;
modelDoc.schema.allow( { name: '$text', inside: '$root' } );
viewDoc = new ViewDocument();
viewRoot = viewDoc.createRoot( 'div' );
viewSelection = viewDoc.selection;
mapper = ne... |
<<<<<<<
<CustomSocketsDialog />
<InnerToolbar>
=======
<SocketsDialog />
<SocketsInnerToolbar>
>>>>>>>
<SocketsDialog />
<InnerToolbar> |
<<<<<<<
=======
moveDirectoryUp(depth) {
const { previousFolders, directoryDepth } = this.state;
const depthLevel = _.isFinite(depth) ? depth : 1;
this.setState({
directoryDepth: directoryDepth - depthLevel,
currentFolderName: previousFolders[directoryDepth - 1 - depthLevel] || '',
pr... |
<<<<<<<
import { DialogsMixin, SnackbarNotificationMixin } from '../../mixins';
=======
import { FormMixin, SnackbarNotificationMixin } from '../../mixins';
>>>>>>>
import { DialogsMixin, FormMixin, SnackbarNotificationMixin } from '../../mixins';
<<<<<<<
DialogsMixin,
=======
FormMixin,
>>>>>>>
Dial... |
<<<<<<<
urlLabel="Hosting Socket"
=======
urlLabel="Hosting"
description={description}
docsUrl="http://docs.syncano.io/docs/"
actionButton={actionButton}
CLITitle="Use Syncano CLI"
CLIDescription="The best way to manage your hosting files is with "
bashSnippets={bashSni... |
<<<<<<<
const client = new hello_proto.Greeter(
=======
// start client and create credentials
const client = new hello_proto.Greeter(
>>>>>>>
// start client and create credentials
const client = new hello_proto.Greeter(
<<<<<<<
// set request value
let user;
// returns an array containing the comm... |
<<<<<<<
it( 'change attribute of split element that reinserts from graveyard', () => {
const gy = doc.graveyard;
const splitDelta = new SplitDelta();
splitDelta.operations[ 0 ] = new ReinsertOperation(
new Position( gy, [ 1 ] ),
1,
new Position( root, [ 2 ] ),
baseVersion
);
... |
<<<<<<<
console.log("reqStream at THIS moment : ", { ...reqStream });
=======
>>>>>>>
<<<<<<<
console.log("ending request");
=======
>>>>>>>
<<<<<<<
console.log("reqStream at THIS moment : ", { ...reqStream });
=======
>>>>>>>
<<<<<<<
console.log(
"connectionArry before push: ",
... |
<<<<<<<
const undoMode = context.aWasUndone || context.bWasUndone;
=======
// Do not apply special transformation case if `SplitDelta` has `NoOperation` as the second operation.
if ( !b.position ) {
return defaultTransform( a, b, context );
}
>>>>>>>
// Do not apply special transformation case if `SplitDelta... |
<<<<<<<
"fetch-meta-and-client",
=======
"open-http",
>>>>>>>
"fetch-meta-and-client",
"open-http",
<<<<<<<
"meta-and-client",
=======
"reqResUpdate",
>>>>>>>
"meta-and-client",
"reqResUpdate", |
<<<<<<<
const { app, BrowserWindow, TouchBar } = require('electron');
const path = require('path');
const url = require('url');
const {
TouchBarLabel,
TouchBarButton,
TouchBarSpacer,
TouchBarColorPicker,
TouchBarSlider,
TouchBarPopover,
} = TouchBar;
=======
const { app, BrowserWindow, TouchBar } = requi... |
<<<<<<<
view.attachDomRoot( domEditor );
viewDocument.selection.removeAllRanges();
=======
viewDocument.attachDomRoot( domEditor );
viewDocument.selection.setTo( null );
>>>>>>>
view.attachDomRoot( domEditor );
viewDocument.selection.setTo( null ); |
<<<<<<<
// formattedHeaders["Access-Control-Allow-Origin"] = '*';
=======
console.log(formattedHeaders);
>>>>>>>
// formattedHeaders["Access-Control-Allow-Origin"] = '*';
<<<<<<<
const signal = abortController.signal;
=======
// const controller = new AbortController();
const signal = ab... |
<<<<<<<
const formattedHeaders = {};
headers.forEach((head) => {
formattedHeaders[head.key] = head.value;
});
const outputObj = {
method,
mode: 'cors', // no-cors, cors, *same-origin
cache: 'no-cache', // *default, no-cache, reload, force-cache, only-if-cached
credentials... |
<<<<<<<
// Quest storage config settings
'GCLOUD_PROJECT', // This is the id of your project in the Google Cloud Developers Console.
'CLOUD_BUCKET', // Bucket for compiled quest XML
'DATABASE_URL', // URL of postgres database storing quest metadata, user data, feedback, etc.
// Feedback email sende... |
<<<<<<<
});
test('impossibleOneWays', function(t) {
t.plan(2);
logInterceptor();
processors.impossibleOneWays(opts, mbtiles, function() {
var logs = logInterceptor.end();
var geoJSON = JSON.parse(logs[0]);
t.equal(geoJSON.features[0].properties._osmlint, 'impossibleoneways', 'Should be impossibleonew... |
<<<<<<<
it('should merge a path with colon properly', function(){
urljoin('/users/:userId', '/cars/:carId')
.should.eql('/users/:userId/cars/:carId');
});
it('should merge slashes in protocol correctly', function () {
=======
it('should merge a simple path with a number correctly', function() {
... |
<<<<<<<
CREATE_APPLICATION,
CREATE_APPLICATION_SUCCESS,
CREATE_APPLICATION_ERROR,
=======
TOGGLE_DRAGGING,
MOVE_TO_BOTTOM,
OPEN_EXPANSION_PANEL,
>>>>>>>
CREATE_APPLICATION,
CREATE_APPLICATION_SUCCESS,
CREATE_APPLICATION_ERROR,
TOGGLE_DRAGGING,
MOVE_TO_BOTTOM,
OPEN_EXPANSION_PANEL,
<<<<<<<
})... |
<<<<<<<
* @param {module:engine/model/selection~Selection} data.selection
* @param {Object} data.options See {@link module:engine/controller/modifyselection~modifySelection}'s options.
=======
* @param {engine.model.Selection} data.selection
* @param {Object} data.options See {@link engine.controller.modifySelect... |
<<<<<<<
legend:PropTypes.object,
scaleX: PropTypes.number,
scaleY: PropTypes.number,
translateX: PropTypes.number,
translateY: PropTypes.number,
rotation: PropTypes.number,
renderToHardwareTextureAndroid: React.PropTypes.bool,
onLayout: React.PropTypes.bool,
accessibilityLiveRegion:... |
<<<<<<<
'use strict';
import {
getNodesAndText,
jsonParseStringify,
wrapInDelta,
itemAt,
getText
} from '/tests/engine/model/_utils/utils.js';
=======
import { getNodesAndText, jsonParseStringify, wrapInDelta } from '/tests/engine/model/_utils/utils.js';
>>>>>>>
import {
getNodesAndText,
jsonParseStringify,
... |
<<<<<<<
_scopes: {
'Aloha.empty' : {
'name' : 'Aloha.empty',
'extendedScopes' : [],
'buttons' : []
},
'Aloha.global' : {
'name' : 'Aloha.global',
'extendedScopes' : ['Aloha.empty'],
'buttons' : []
},
'Aloha.continuoustext' : {
'name' : 'Aloha.continuoustext',
'extendedSc... |
<<<<<<<
'aloha/copypaste'
=======
'aloha/copypaste',
'util/dom',
'aloha/contenthandlermanager'
>>>>>>>
'aloha/copypaste',
'aloha/contenthandlermanager'
<<<<<<<
CopyPaste
=======
CopyPaste,
Dom,
ContentHandlerManager
>>>>>>>
CopyPaste,
ContentHandlerManager |
<<<<<<<
register: function(repository) {
// if (repository instanceof Aloha.AbstractRepository) {
if ( !this.getRepository(repository.repositoryId) ) {
this.repositories.push(repository);
=======
Aloha.RepositoryManager = Class.extend({
repositories : [],
openCallbacks : [],
/**
* Initialize all... |
<<<<<<<
define([
'aloha/jquery',
'table/table-plugin-utils',
'table/table-selection'
], function (
jQuery,
Utils,
TableSelection
) {
=======
define([
'jquery',
'aloha/ephemera',
'table/table-plugin-utils'
], function (
jQuery,
Ephemera,
Utils
) {
>>>>>>>
define([
'aloha/jquery',
'aloha/ephemera',
'tab... |
<<<<<<<
if ( b.type == 'remove' && !context.wasUndone( b ) ) {
=======
if ( b instanceof RemoveOperation && !context.bWasUndone ) {
>>>>>>>
if ( b.type == 'remove' && !context.bWasUndone ) { |
<<<<<<<
//me.insertAbbrButton.hide();
//me.formatAbbrButton.setState( true );
FloatingmenuPortHelper.hideAll('insertAbbr');
FloatingmenuPortHelper.setStateTrueAll('formatAbbrButton');
Toolbar.setScope( 'abbr' );
=======
me.insertAbbrButton.hide();
... |
<<<<<<<
var _savedRange;
=======
var _savedRange;
>>>>>>>
var _savedRange;
<<<<<<<
if ( typeof Aloha.settings.plugins != 'undefined'
&& typeof Aloha.settings.plugins.characterpicker != 'undefined' ) {
self.settings = Aloha.settings.plugins.characterpicker;
}
this._characterPickerButton = ... |
<<<<<<<
it( 'should skip context.aIsStrong and be less important than MoveOperation', () => {
const transOp = transform.transform( op, transformBy, { aIsStrong: true } );
=======
it( 'should skip context.aIsStrong and be less important than RemoveOperation', () => {
const transOp = transform.transform( ... |
<<<<<<<
* Sets the currently selected elements as headers of the table, or removes header-status
* if the whole selection is already used as a header
*
* @param {Aloha.Table} table the table-object for which the headers are to be set
* @param {string} scope for which the header should be used (i.e. 'row' or '... |
<<<<<<<
return this._createAfter( node );
} else if ( offset !== 0 && !offset ) {
throw new CKEditorError(
'model-position-createAt-required-second-parameter: ' +
'Position.createAt requires the second parameter offset when first parameter is a model item.' );
}
if ( !node.is( 'element' ) &&... |
<<<<<<<
cell.tableObj.selection.baseCellPosition = [cell._virtualY(), cell._virtualX()];
if ($event.shiftKey) {
// shift-click to select a coherent cell range
//
// in IE it's not possible to select multiple cells when you "select+drag" over other cells
// click into the first cell and the... |
<<<<<<<
'use strict';
import Text from './text.js';
=======
import CharacterProxy from './characterproxy.js';
>>>>>>>
import Text from './text.js'; |
<<<<<<<
'query' : queryString,
=======
'name' : p.queryString,
>>>>>>>
'query' : p.queryString, |
<<<<<<<
// add the markup
GENTICS.Utils.Dom.addMarkup( rangeObject, markup );
}
// select the modified range
rangeObject.select();
return false;
},
/**
* Change markup
*/
changeMarkup: function( button ) {
Aloha.Selection.changeMarkupOnSelection(jQuery('<' + button + '><... |
<<<<<<<
define(
['aloha/jquery',
'aloha/plugin',
'ui/component',
'ui/toggleButton',
'i18n!numerated-headers/nls/i18n',
'i18n!aloha/nls/i18n',
'css!numerated-headers/css/numerated-headers.css'],
function(jQuery, Plugin, Component, ToggleButton, i18n, i18nCore) {
=======
define ([
'aloha/jquery',
'aloha/plugin'... |
<<<<<<<
this.initButtons();
Aloha.ready( function () {
// @todo add config option for sidebar panel
me.initSidebar( Aloha.Sidebar.right );
} );
// apply specific configuration if an editable has been activated
Aloha.bind('aloha-editable-activated',function (e, params) {
me.applyButtonConfi... |
<<<<<<<
['aloha', 'aloha/jquery', 'aloha/plugin', 'aloha/pluginmanager', 'aloha/floatingmenu', 'i18n!table/nls/i18n', 'i18n!aloha/nls/i18n', 'table/table-create-layer', 'table/table', 'table/table-plugin-utils', 'css!table/css/table.css'],
function(Aloha, jQuery, Plugin, PluginManager, FloatingMenu, i18n, i18nCore, Cre... |
<<<<<<<
=======
//window.console.log('6');
>>>>>>>
<<<<<<<
=======
//window.console.log('7');
>>>>>>>
<<<<<<<
=======
//window.console.log('8');
>>>>>>>
<<<<<<<
=======
// window.console.log("endNodeHasChildnodes: " + endNode.hasChildNodes());
>>>>>>>
<<<<<<<
=======
//window.console.log("... |
<<<<<<<
[ 'aloha/core', 'jquery', 'util/class', 'util/range', 'util/arrays', 'util/strings', 'aloha/console', 'PubSub', 'aloha/engine', 'aloha/rangy-core' ],
function(Aloha, jQuery, Class, Range, Arrays, Strings, console, PubSub, Engine) {
var GENTICS = window.GENTICS;
=======
[ 'aloha/core', 'aloha/jquery', 'util/c... |
<<<<<<<
if (1 === groupedComponents[j].length &&
groupedComponents[j].charCodeAt(0) === 10) {
group.append('<div>');
} else {
component = Component.render(groupedComponents[j]);
group.append(component.element);
}
=======
component = Component.render(groupedCompon... |
<<<<<<<
'i18n!aloha/nls/i18n',
'ui/port-helper-floatingmenu'
], function (Aloha,
jQuery,
Plugin,
Component,
ToggleButton,
Button,
Toolbar,
AttributeField,
i18n,
i18nCore,
FloatingmenuPortHelper) {
'use strict';
=======
'i18n!aloha/nls/i18n'
], function(
Aloha,
j... |
<<<<<<<
* Aloha Editor is a WYSIWYG HTML5 inline editing library and editor.
* Copyright (c) 2010-2014 Gentics Software GmbH, Vienna, Austria.
* Contributors http://aloha-editor.org/contribution.php
* License http://aloha-editor.org/license.php
=======
* Aloha Editor is a WYSIWYG HTML5 inline editing library and... |
<<<<<<<
var deleteHandle = jQuery('<span class="block-draghandle-topright"><a href="#"><span>x</span> delete</a></span>');
=======
var deleteHandle = $('<span class="block-draghandle-topleft"><a href="#"><span>x</span> delete</a></span>');
>>>>>>>
var deleteHandle = jQuery('<span class="block-draghandle-top... |
<<<<<<<
* Selection into which the content should be inserted. If not provided the current model document selection will be used.
* @param {Number|'before'|'end'|'after'|'on'|'in'} [placeOrOffset] To be used when a model item was passed as `selectable`.
* This param defines a position in relation to that item.
=... |
<<<<<<<
//
//function getActiveRange() {
//
// var ret;
// if (globalRange) {
// ret = globalRange;
// } else if (Aloha.getSelection().rangeCount) {
// ret = Aloha.getSelection().getRangeAt(0);
// } else {
// return null;
// }
// if ([Node.TEXT_NODE, Node.ELEMENT_NODE].indexOf(ret.startContainer.nodeType) == -1
// |... |
<<<<<<<
/* undo-plugin.js is part of Aloha Editor project http://aloha-editor.org
*
* Aloha Editor is a WYSIWYG HTML5 inline editing library and editor.
* Copyright (c) 2010-2012 Gentics Software GmbH, Vienna, Austria.
* Contributors http://aloha-editor.org/contribution.php
*
* Aloha Editor is free software; y... |
<<<<<<<
define([
=======
define([
// js
>>>>>>>
define([
<<<<<<<
'RepositoryBrowser',
=======
'browser/browser-plugin',
// i18n
>>>>>>>
'RepositoryBrowser',
<<<<<<<
], function(
Aloha,
jQuery,
Plugin,
PluginManager,
Ui,
Button,
Links,
RepositoryBrowser,
i18n,
i18nCore
) {
=======
], function( A... |
<<<<<<<
// We need to bind to selection-changed event to recognize
// backspace and delete interactions.
Aloha.bind('aloha-smart-content-changed', function (event) {
if (that.showNumbers()) {
=======
// We need to bind to smart-content-changed event to recognize
// backspace and delete interactions... |
<<<<<<<
const $label = qs('.preference__label', this.$container);
$label.innerHTML = this.label;
this._addDescription($label);
=======
qs('.pref-container__label', this.$container).innerHTML = this.label;
qs('.pref-container__description', this.$container).innerHTML = this.description;
this._f... |
<<<<<<<
import punycode from 'punycode';
=======
export const PREFIX_REGEX = '@';
export const PREFIX_GLOB = '!';
>>>>>>>
import punycode from 'punycode';
export const PREFIX_REGEX = '@';
export const PREFIX_GLOB = '!';
<<<<<<<
return punycode.toUnicode(parsedUrl.hostname.replace('www.', '')) + parsedUrl.path... |
<<<<<<<
/* Copyright (C) 2017 Nicola Zambello
*
* https://github.com/nzambello/ellipsed
*
* The JavaScript code in this page is free software: you can
* redistribute it and/or modify it under the terms of the GNU
* General Public License (GNU GPL) as published by the Free Software
* Foun... |
<<<<<<<
//setup model that will fetch all the data for us
this.dataModel = new App.Models.ChartDataModel();
=======
this.mapTab = new App.Views.Chart.MapTab( { dispatcher: this.dispatcher } );
>>>>>>>
//setup model that will fetch all the data for us
this.dataModel = new App.Models.ChartDataModel();... |
<<<<<<<
var minimatch = require('minimatch');
var CMD_PREFIX = '##vso[';
=======
var tcm = require('./taskcommand');
var trm = require('./toolrunner');
>>>>>>>
var minimatch = require('minimatch');
var tcm = require('./taskcommand');
var trm = require('./toolrunner');
<<<<<<<
return ToolRunner;
})();
exports.T... |
<<<<<<<
this.heartbeat();
this.emit.apply(this, ['start']);
};
Worker.prototype.stop = function() {
clearInterval(this.hbTimer);
if (this.socket) {
this.sendDisconnect();
if (this.socket._zmq.state != zmq.STATE_CLOSED) {
this.socket.close();
}
delete this.socket;
}
this.onDisconnec... |
<<<<<<<
this.logBookEvent({'event': 'shortanswer', 'act': JSON.stringify(value), 'div_id': directive_id});
}
=======
logBookEvent({"event": "shortanswer", "act": JSON.stringify(value), "div_id": this.divid});
};
ShortAnswer.prototype.loadJournal = function () {
var len = localStorage.length;
if (len ... |
<<<<<<<
this.useRunestoneServices = opts.useRunestoneServices;
=======
>>>>>>>
this.useRunestoneServices = opts.useRunestoneServices;
<<<<<<<
this.qNumList.appendChild(tmpLi);
=======
this.qNumWrapperList.appendChild(tmpLi);
>>>>>>>
this.qNumWrapperList.appendChild(tmpLi);
<<... |
<<<<<<<
<<<<<<< HEAD
=======
>>>>>>> |
<<<<<<<
// TODO: check all docs
// TODO: writer should be protected
// TODO: check errors/event descriptions if everything is up to date
export default class Writer {
/**
* Breaks attribute nodes at provided position or at boundaries of provided range. It breaks attribute elements inside
* up to a container elemen... |
<<<<<<<
if (report['version'] == 2){
// new version; would be better to embed this in HTML for the activecode
body = "<h4>Grade Report</h4>" +
"<p>This question: " + report['grade'] + " out of " + report['max'] + "</p>" +
"<p>" + ... |
<<<<<<<
mkdirp.sync(path.dirname(outfile));
bundle.pipe(fs.createWriteStream(outfile));
=======
// we'll output to a temp file within same filesystem, then atomically overwrite outfile once successful
tmpfile = outfile + ".tmp-browserify-" + Math.random().toFixed(20).slice(2)
bundle.pipe(fs.create... |
<<<<<<<
* @protected
* @param {module:engine/view/item~Item|module:engine/model/position~Position} itemOrPosition
* @param {Number|'end'|'before'|'after'} [offset] Offset or one of the flags. Used only when
=======
* @param {module:engine/view/item~Item|module:engine/view/position~Position} itemOrPosition
*... |
<<<<<<<
convertChanges( differ, writer ) {
this.conversionApi.writer = writer;
// First, before changing view structure, remove all markers that has changed.
for ( const change of differ.getMarkersToRemove() ) {
this.convertMarkerRemove( change.name, change.range, writer );
}
=======
convertChanges( di... |
<<<<<<<
* @param {String} config.model Name of the model marker (or model marker group) to convert.
* @param {module:engine/view/elementdefinition~ElementDefinition|Function} config.view View element definition or a function
* that takes model marker data as a parameter and returns view ui element.
* @param {module... |
<<<<<<<
var assigneeListBtn = $('.ticket-assignee > a');
=======
var ticketTypeSelect = $('select#tType');
var ticketPriority = $('select#tPriority');
var ticketGroup = $('select#tGroup');
>>>>>>>
var assigneeListBtn = $('.ticket-assign... |
<<<<<<<
require('../src/socketserver')(ws)
cb()
=======
cb()
})
>>>>>>>
require('../src/socketserver')(ws)
cb()
}) |
<<<<<<<
className: 'class',
beginKeywords: 'trait enum', end: '({|<)',
contains: [hljs.UNDERSCORE_TITLE_MODE],
=======
beginKeywords: 'trait enum', end: '{',
contains: [
hljs.inherit(hljs.UNDERSCORE_TITLE_MODE, {endsParent: true})
],
>>>>>>>
className... |
<<<<<<<
'<div class="fixed-table-toolbar"></div>',
'<div class="fixed-table-container">',
'<div class="fixed-table-header"><table></table></div>',
'<div class="fixed-table-body">',
'<div class="fixed-table-loading">',
this.options.formatLoadingMess... |
<<<<<<<
cookieName, '=', cookieValue,
`; expires=${UtilsCookie.calculateExpiration(that.options.cookieExpire)}`,
that.options.cookiePath ? `; path=${that.options.cookiePath}` : '',
that.options.cookieDomain ? `; domain=${that.options.cookieDomain}` : '',
=======
... |
<<<<<<<
let dispatcher, mapper, model, view, modelDoc, modelRoot, modelSelection, viewDoc, viewRoot, viewSelection, highlightDescriptor;
=======
let dispatcher, mapper, model, modelDoc, modelRoot, docSelection, viewDoc, viewRoot, viewSelection, highlightDescriptor;
>>>>>>>
let dispatcher, mapper, model, view, mod... |
<<<<<<<
var z = that.options.pagination ?
(that.options.sidePagination === 'server' ? that.pageTo : that.options.totalRows) :
that.pageTo;
=======
for (var i = bootstrapTable.pageFrom - 1; i < bootstrapTable.pageTo; i++) {
$.each(bootstrapTable.header.fields, funct... |
<<<<<<<
=======
// Display related links in grid ?
searchSettings.gridRelated = ['parent', 'children',
'services', 'datasets'];
// Object to store the current Map context
viewerSettings.storage = 'sessionStorage';
>>>>>>>
// Object to store the current M... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
goog.require('gn_suggestion');
=======
goog.require('gn_validation');
>>>>>>>
goog.require('gn_suggestion');
goog.require('gn_validation');
<<<<<<<
'gn_suggestion',
=======
'gn_validation',
>>>>>>>
'gn_suggestion',
'gn_validat... |
<<<<<<<
const fixedStart = expandStart ? expandSelectionOnIsLimitNode( Position.createAt( startLimitElement ), schema, 'start' ) : start;
const fixedEnd = expandEnd ? expandSelectionOnIsLimitNode( Position.createAt( endLimitElement ), schema, 'end' ) : end;
=======
const startPosition = Position._createAt( star... |
<<<<<<<
if ( a.sourcePosition.isEqual( b.splitPosition ) && context.abRelation == 'mergeSameElement' ) {
a.sourcePosition = Position._createAt( b.moveTargetPosition );
=======
if ( a.sourcePosition.isEqual( b.splitPosition ) && ( context.abRelation == 'mergeSameElement' || a.sourcePosition.offset > 0 ) ) {
a.so... |
<<<<<<<
}]);
module.directive('gnPopoverDropdown', ['$timeout', function($timeout) {
return {
restrict: 'A',
link: function(scope, element, attrs) {
// Container is one ul with class list-group
// Avoid to set style on embedded drop down menu
var content = element.find('ul.l... |
<<<<<<<
// Link is localized when using associated resource service
// and is not when using search
var url = $filter('gnLocalized')(link.url) || link.url;
var layerName = $filter('gnLocalized')(link.title) || link.title;
if (layerName) {
gnMap.a... |
<<<<<<<
=======
goog.require('gn_admin_menu');
>>>>>>>
goog.require('gn_admin_menu'); |
<<<<<<<
'gnUtilityService', 'gnConfigService',
=======
'gnUtilityService',
'gnCurrentEdit',
>>>>>>>
'gnConfigService',
'gnUtilityService',
'gnCurrentEdit',
<<<<<<<
gnUtilityService, gnConfigService) {
=======
gnUtilityService, gnCurrentEdit) {
>>>>>>>
g... |
<<<<<<<
gulp
.src('src/lib/codemirror/theme/*')
.pipe(gulp.dest('app/lib/codemirror/theme')),
gulp
.src('src/lib/codemirror/mode/**/*')
.pipe(gulp.dest('app/lib/codemirror/mode')),
gulp.src('src/lib/transpilers/*').pipe(gulp.dest('app/lib/transpilers')),
gulp.src('src/lib/screenlog.js').pipe(gulp.dest('app/... |
<<<<<<<
=======
chrome.storage.sync.set({
htmlMode: value
}, function () {});
trackEvent('ui', 'updateCodeMode', 'html', value);
>>>>>>>
trackEvent('ui', 'updateCodeMode', 'html', value);
<<<<<<<
=======
chrome.storage.sync.set({
cssMode: value
}, function () {});
trackEvent('ui', 'updateCodeM... |
<<<<<<<
modes[JsModes.ES6] = { label: 'ES6 (Babel)', cmMode: 'javascript', codepenVal: 'babel' };
modes[JsModes.TS] = { label: 'TypeScript', cmMode: 'javascript', codepenVal: 'typescript' };
=======
modes[JsModes.ES6] = { label: 'ES6 (Babel)', cmMode: 'jsx', codepenVal: 'babel' };
>>>>>>>
modes[JsModes.ES6] = { ... |
<<<<<<<
viewDocument.selection.addRange( ViewRange.createFromParentsAndOffsets( viewBar, 1, viewBar, 2 ) );
view.render();
=======
viewDocument.selection.setTo( ViewRange.createFromParentsAndOffsets( viewBar, 1, viewBar, 2 ) );
viewDocument.render();
>>>>>>>
viewDocument.selection.setTo( ViewRange.createFr... |
<<<<<<<
const isProUser = userService.isPro();
const exportPngButtonHtml =
=======
const enableExportButton = !featureToggle.isPaymentEnabled || userService.isPro();
const exportButtonHtml =
>>>>>>>
const enableExportButton = !featureToggle.isPaymentEnabled || userService.isPro();
const exportPngButtonHtml =
... |
<<<<<<<
indent(concat([parenLine, concat(printedArguments)])),
ifBreak(shouldPrintComma(options, "all") ? "," : ""),
parenLine,
=======
indent(concat([softline, concat(printedArguments)])),
ifBreak(maybeTrailingComma),
softline,
>>>>>>>
indent(concat([parenLine, concat(print... |
<<<<<<<
function addFood(toAdd) {
while(toAdd--){
food.push({
// make ids unique
id: ((new Date()).getTime() + '' + (new Date()).getMilliseconds() + '' + food.length) >>> 0,
x: genPos(0, c.gameWidth),
y: genPos(0, c.gameHeight),
color: randomColor(... |
<<<<<<<
graph.fillStyle = backgroundColor;
graph.fillRect(0, 0, gameWidth, gameHeight);
=======
graph.fillStyle = "#EEEEEE";
graph.fillRect(0, 0, screenWidth, screenHeight);
>>>>>>>
graph.fillStyle = backgroundColor;
graph.fillRect(0, 0, screenWidth, screenHeight); |
<<<<<<<
.to.equal( '<div>foo<span class="marker2">[]</span>bar</div>' );
} );
it( 'in marker - should merge with the rest of attribute elements', () => {
dispatcher.on( 'addMarker:marker2', highlightText( data => ( { 'class': data.markerName } ) ) );
dispatcher.on( 'addMarker:marker2', highlightElem... |
<<<<<<<
.controller('ProjectCtrl', ['$scope', '$modalStack', '$location', '$routeParams'
, 'growl', 'ProjectService', 'ModalService', 'ActivityService','$cookies',
function ($scope, $modalStack, $location, $routeParams, growl, ProjectService, ModalService, ActivityService, $cookies) ... |
<<<<<<<
/**
* @param {!Object} labelInfo
* @param {Object} changeLabelsRecord not used, but added as a parameter in
* order to trigger computation when a label is removed from the change.
*/
_computeShowPlaceholder(labelInfo, changeLabelsRecord) {
if (labelInfo && labelInfo.all) {
for (cons... |
<<<<<<<
.controller('ProjectCtrl', ['$scope', '$modalStack', '$location', '$routeParams'
, 'growl', 'ProjectService', 'ModalService', 'ActivityService',
function ($scope, $modalStack, $location, $routeParams, growl, ProjectService, ModalService, ActivityService) {
var se... |
<<<<<<<
self.init();
self.showTopic = function(){
=======
self.init();
self.showTopic = function(){
>>>>>>>
self.init();
self.init();
self.showTopic = function(){ |
<<<<<<<
}]);
=======
>>>>>>> |
<<<<<<<
import { getValidity, getForm, isValidityValid, isValidityInvalid } from '../utils';
=======
import { getValidity, getForm, isValid, isInvalid } from '../utils';
import { trackable } from '../utils/track';
>>>>>>>
import { getValidity, getForm, isValidityValid, isValidityInvalid } from '../utils';
import { t... |
<<<<<<<
class Errors extends Component {
shouldComponentUpdate(nextProps) {
const { fieldValue, formValue } = nextProps;
const { dynamic } = this.props;
if (dynamic) {
return !shallowEqual(this.props, nextProps);
}
return fieldValue !== this.props.fieldValue
|| formValue !== this.pro... |
<<<<<<<
=======
import {
Form,
modelReducer,
formReducer,
Field,
Control,
actions,
actionTypes,
} from '../src';
>>>>>>>
<<<<<<<
=======
});
describe('submitting after invalid', () => {
const store = createStore(combineReducers({
login: modelReducer('login', { username: '' }),
l... |
<<<<<<<
if (!validators && !errors && (modelValue !== nextProps.modelValue)) {
if (!isValid(formValue)) {
dispatch(actions.setValidity(model, true));
}
return;
=======
if (!validators && !errors && (modelValue !== nextProps.modelValue)) {
// If the form is invalid (d... |
<<<<<<<
import { checkoutNganLuong } from './nganluong.handlers';
=======
import { checkoutSohaPay, callbackSohaPay } from './sohapay-handlers';
>>>>>>>
import { checkoutNganLuong } from './nganluong.handlers';
import { checkoutSohaPay, callbackSohaPay } from './sohapay-handlers';
<<<<<<<
case 'nganluong':
asy... |
<<<<<<<
const controlAction = (controlActionMap[controlType] || controlActionMap.default)(props);
=======
let controlAction = (controlActionMap[control.props.type] || controlActionMap.default)(props);
>>>>>>>
const controlAction = (controlActionMap[control.props.type] || controlActionMap.default)(props); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.