conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
OAuth.showPopup(
loginUrl,
_.bind(credentialRequestCompleteCallback, null, credentialToken)
);
});
=======
Oauth.showPopup(
loginUrl,
_.bind(credentialRequestCompleteCallback, null, credentialToken)
);
>>>>>>>
OAuth.showPopup(
loginUrl,
_.bind(credentialRequestComp... |
<<<<<<<
var oldValue = self.keys[key];
if (value === oldValue)
=======
if (typeof value !== 'string' &&
typeof value !== 'number' &&
typeof value !== 'boolean' &&
value !== null && value !== undefined)
throw new Error("Session.set: value can't be an object");
var old_val... |
<<<<<<<
// Has key, credential, and createdAt fields.
Oauth._pendingCredentials = new Meteor.Collection(
=======
// Has token, credential, and createdAt fields.
OAuth._pendingCredentials = new Meteor.Collection(
>>>>>>>
// Has key, credential, and createdAt fields.
OAuth._pendingCredentials = new Meteor.Collection(
... |
<<<<<<<
};
UI._parentData = Blaze._parentData;
=======
};
UI.getElementData = function (el) {
return Blaze.getElementDataVar(el).get();
};
UI._parentData = Blaze._parentData;
>>>>>>>
};
UI._parentData = Blaze._parentData;
UI.getElementData = function (el) {
return Blaze.getElementDataVar(el).get();
}; |
<<<<<<<
// Will be updated by main before we listen.
var boilerplateFunc = null;
var boilerplateBaseData = null;
var boilerplateByAttributes = {};
=======
>>>>>>>
<<<<<<<
var htmlAttributes = getHtmlAttributes(request);
// The only thing that changes from request to request (for now) are the
//... |
<<<<<<<
};
=======
}
// Like Perl's quotemeta: quotes all regexp metacharacters. See
// https://github.com/substack/quotemeta/blob/master/index.js
exports.quotemeta = function (str) {
return String(str).replace(/(\W)/g, '\\$1');
};
>>>>>>>
};
// Like Perl's quotemeta: quotes all regexp metacharacters. See
//... |
<<<<<<<
var runLog = require('./run-log.js').runLog;
var packageCache = require('./package-cache.js');
var PackageSource = require('./package-source.js');
var compiler = require('./compiler.js');
=======
var runLog = require('./run-log.js');
>>>>>>>
var runLog = require('./run-log.js');
var packageCache = require('... |
<<<<<<<
/*
// @export Template
=======
>>>>>>>
/* |
<<<<<<<
"spacebars-tests - template_tests - UI._parentData from helper",
=======
"spacebars-tests - template_tests - UI._parentData from helpers",
>>>>>>>
"spacebars-tests - template_tests - UI._parentData from helpers",
<<<<<<<
);
Tinytest.add(
"spacebars-tests - template_tests - created/rendered/destroye... |
<<<<<<<
// @export Random
Random = {};
=======
>>>>>>> |
<<<<<<<
resultsDeps.changed();
Deps.flush();
=======
_resultsChanged();
Meteor.flush();
Meteor.default_connection._unsubscribeAll();
>>>>>>>
resultsDeps.changed();
Deps.flush();
Meteor.default_connection._unsubscribeAll(); |
<<<<<<<
// Our connection is going to be closed, but we don't want to call the
// onReconnect handler until the result comes back for this method, because
// the token will have been deleted on the server. Instead, wait until we get
// a new token and call the reconnect handler with that.
// XXX this is messy... |
<<<<<<<
var supported = function (expected, selector, options) {
var cursor = OplogCollection.find(selector, options);
=======
var oplogEnabled =
!!MongoInternals.defaultRemoteCollectionDriver().mongo._oplogHandle;
var supported = function (expected, selector) {
var cursor = OplogCollection.fin... |
<<<<<<<
var ctx = Facet._globals.ctx;
if (previous_batch_opts.attributes) {
for (var key in previous_batch_opts.attributes) {
ctx.disableVertexAttribArray(previous_batch_opts.program[key]);
=======
if (!previous_batch._ctx)
return;
var ctx = previous_batch._ctx;
if (pre... |
<<<<<<<
var url = Npm.require('url');
// unique id for this instantiation of the server. If this changes
// between client reconnects, the client will reload. You can set the
// environment variable "SERVER_ID" to control this. For example, if
// you want to only force a reload on major changes, you can use a
// custo... |
<<<<<<<
// for the purpose of splitting attributes in a string like
// 'a="b" c="d"', assume they are separated by a single space
// and values are double-quoted, but allow for spaces inside
// the quotes. Split on space following quote.
var attrList = attrs.replace(/" /g, '"\u0000').split('\u0000'... |
<<<<<<<
Tinytest.add("spacebars-tests - template_tests - tables", function (test) {
=======
// Make sure that if you bind an event on "div p", for example,
// both the div and the p need to be in the template. jQuery's
// `$(elem).find(...)` works this way, but the browser's
// querySelector doesn't.
Tinytest.add(
... |
<<<<<<<
// api.add_files(['template.js']);
=======
api.add_files(['template.js']);
api.add_files(['render.js']); // xcxc filename?
>>>>>>>
api.add_files(['render.js']); |
<<<<<<<
// XXX HACK: If a sockjs connection, save off the URL. This is
// temporary and will go away in the near future.
self._socketUrl = socket.url;
// The `ConnectionHandle` for this session, passed to
// `Meteor.server.onConnection` callbacks.
=======
// This object is the public interface to the ses... |
<<<<<<<
=======
try {
var ast = Handlebars.to_json_ast(contents);
} catch (e) {
if (e instanceof Handlebars.ParseError) {
if (typeof(e.line) === "number")
// subtract one from e.line because it is one-based but we
// need it to be an offset from contentsStartIndex
... |
<<<<<<<
Tinytest.add("ui - render - isolate GC", function (test) {
=======
// IE strips malformed styles like "bar::d" from the `style`
// attribute. We detect this to adjust expectations for the StyleHandler
// test below.
var malformedStylesAllowed = function () {
var div = document.createElement("div");
div.se... |
<<<<<<<
var serverCatalog = require('./catalog.js').serverCatalog;
=======
var stats = require('./stats.js');
>>>>>>>
var serverCatalog = require('./catalog.js').serverCatalog;
var stats = require('./stats.js'); |
<<<<<<<
}()).actualVersion;
/**
* This extends the basic functionality of every Node. Will check if a Node has a className
* @param {string} className The class to check for
* @return {Boolean}
*/
Node.prototype.hasClass = function (className) {
if (this.classList) {
return this.classList.contains(c... |
<<<<<<<
var // jQuery and jQueryUI version
=======
var // jQuery and jQueryUI version
// jqver = '3.3.1',
jqver = '1.12.4', // current Typesetter version
uiver = '1.12.1', // current Typesetter version
>>>>>>>
var // jQuery and jQueryUI version
<<<<<<<
'elfinder' : 'js/elfinder.min',
'encoding-japa... |
<<<<<<<
function getFilteredContent(data, filters) {
const content = [];
const applied = filters.applied || {};
const filterAcceptKeys = applied.acceptItems && Object.keys(applied.acceptItems);
=======
// Return filtered data, sorted by location, in a flat list
// (flattened so it's easy to present only a piece... |
<<<<<<<
const contentTags = [];
const title = separator ? ce('h5', 'separator', ctn(name)) : ce('h5', null, ctn(name));
=======
const contentTags = [header];
>>>>>>>
const contentTags = [];
const title = ce('h5', separator ? 'separator' : null, ctn(entry.name));
// only show the link copier if the main ... |
<<<<<<<
const generateBottomNav = () => {
const localeDropdown = document.getElementById('locales-dropdown-selector');
const countryDropdown = document.getElementById('countries-dropdown-selector');
if (localeDropdown && countryDropdown) {
locales.forEach((locale) => {
const element = document.createEl... |
<<<<<<<
const ExchangeFunctions = require('./ExchangeFunctions')
=======
const commonComponents_navigationBarButtons = require('../../MMAppUICommonComponents/navigationBarButtons.web')
>>>>>>>
const ExchangeFunctions = require('./ExchangeFunctions')
const commonComponents_navigationBarButtons = require('../../MMAppU... |
<<<<<<<
/** @type {chokidar.FSWatcher=} */
let watcher;
/** @type {chokidar.FSWatcher=} */
let watcher2;
let usedWatchers = [];
let fixturesPath;
let subdir = 0;
let options;
let osXFsWatch;
let win32Polling;
let slowerDelay;
const PERM_ARR = 0o755; // rwe, r+e, r+e
=======
let watcher,
watcher2,
usedWatchers... |
<<<<<<<
emitRaw(rawEvent, path);
if (path && item !== path) {
fsWatchBroadcast(sysPath.resolve(path), 'listeners', path);
}
=======
emitRaw(rawEvent, path, {watchedPath: item});
>>>>>>>
emitRaw(rawEvent, path, {watchedPath: item});
if (path && item !== path) {
fsWatchBroadcast(sys... |
<<<<<<<
return file === target || !target && previous.indexOf(file) === -1;
=======
return !previous.has(file);
>>>>>>>
return file === target || !target && !previous.has(file); |
<<<<<<<
this._emitReady();
return this.watchers.push(watcher);
=======
return this._watchers.push(watcher);
>>>>>>>
this._emitReady();
return this._watchers.push(watcher); |
<<<<<<<
const ProvidePlugin = require('webpack/lib/ProvidePlugin');
=======
const HtmlElementsPlugin = require('./html-elements-plugin');
>>>>>>>
const HtmlElementsPlugin = require('./html-elements-plugin');
<<<<<<<
helpers.root('node_modules/primeng') // https://github.com/primefaces/primeng/issues/201
... |
<<<<<<<
=======
/**
* Webpack Plugins
*/
var CopyWebpackPlugin = require('copy-webpack-plugin');
var HtmlWebpackPlugin = require('html-webpack-plugin');
var ForkCheckerPlugin = require('awesome-typescript-loader').ForkCheckerPlugin;
/**
* Webpack Constants
*/
const ENV = process.env.ENV = process.env.NODE_ENV = ... |
<<<<<<<
obj.__read = undefined;
if (options)
obj.__options = undefined;
=======
delete obj.__read;
>>>>>>>
obj.__read = undefined; |
<<<<<<<
var segmentCount = 0;
var pathCount = 0;
var reportSegments = false && !window.silent;
var reportWindings = false && !window.silent;
var textAngle = 0;
var fontSize = 1 / paper.project.activeLayer.scaling.x;
function labelSegment(seg, text, color) {
... |
<<<<<<<
function netlifyPlugin(conf) {
return {
=======
module.exports = {
name: 'netlify-plugin-a11y',
>>>>>>>
module.exports = { |
<<<<<<<
var task = require ('./base'),
ejs = require ('ejs'),
=======
var task = require ('task/base'),
>>>>>>>
var task = require ('./base'),
<<<<<<<
var templateIO = project.root.fileIO (this.file);
=======
// TODO: add absolute paths
// no more presentation files in strange places
var templa... |
<<<<<<<
// TODO:
// 1. detect instance name after reading var/instance
// 2. load configuration
// 3. load local fixup for configuration and override default
=======
// TODO: detect instance from var/instance
root.fileIO ('var/instance').readFile (function (data, err) {
});
// TODO: read config
// TO... |
<<<<<<<
/**
* Checks if the EnumItem is the same as the passing object.
* @param {EnumItem || String || Number} key The object to check with.
* @return {Boolean} The check result.
*/
is: function(key) {
if (key instanceof EnumItem || (typeof(key) === 'object' && key.key !==... |
<<<<<<<
var dest = './temp/cc.json';
fs.writeFile(dest, JSON.stringify(contract.cc), function(e){
=======
var dest = __dirname + '/temp/cc.json';
fs.writeFile(dest, JSON.stringify(contract), function(e){
>>>>>>>
var dest = __dirname + '/temp/cc.json';
fs.writeFile(dest, JSON.stringify(contract.cc), function(e)... |
<<<<<<<
var defaultProps = {};
if(this.props.itemDivider)
defaultProps = {
=======
if(this.props['item-divider'])
var defaultProps = {
>>>>>>>
var defaultProps = {};
if(this.props['item-divider'])
defaultProps = { |
<<<<<<<
footerHeight: 55,
footerDefaultBg: platform === "ios" ? "#F8F8F8" : "#4179F7",
footerPaddingBottom: 0,
=======
footerHeight: isIphoneX ? 89 : 55,
footerDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5",
footerPaddingBottom: isIphoneX ? 34 : 0,
>>>>>>>
footerHeight: 55,
footerDefaultBg: pl... |
<<<<<<<
brandPrimary: (Platform.OS === 'ios') ? '#007aff' : '#3F51B5',
brandInfo: '#5bc0de',
=======
brandPrimary: '#5067FF',
brandInfo: '#62B1F6',
>>>>>>>
brandPrimary: (Platform.OS === 'ios') ? '#007aff' : '#3F51B5',
brandInfo: '#62B1F6', |
<<<<<<<
let squareThumbs = false;
if (this.thumbnailPresent()) {
React.Children.forEach(this.props.children, (child) => {
if (child && child.props.square) {
=======
var squareThumbs = false;
if (this.thumbnailPresent() || this.gravatarPresent()) {
... |
<<<<<<<
return computeProps(this.props, defaultProps);
}
render() {
const variables = this.context.theme
? this.context.theme["@@shoutem.theme/themeStyle"].variables
: variable;
const platformStyle = variables.platformStyle;
const platform = variables.platform;
return (
<Toucha... |
<<<<<<<
var ldefined = ltype !== 'undefined' || (stack && (0 < stack.length) && stack[stack.length - 1].lhs && stack[stack.length - 1].lhs.hasOwnProperty(key));
var rdefined = rtype !== 'undefined' || (stack && (0 < stack.length) && stack[stack.length - 1].rhs && stack[stack.length - 1].rhs.hasOwnProperty(key));
=... |
<<<<<<<
var ldefined = ltype !== 'undefined' || (stack && (0 < stack.length) && stack[stack.length - 1].lhs && stack[stack.length - 1].lhs.hasOwnProperty(key));
var rdefined = rtype !== 'undefined' || (stack && (0 < stack.length) && stack[stack.length - 1].rhs && stack[stack.length - 1].rhs.hasOwnProperty(key));
=... |
<<<<<<<
color: '#58575C',
alignSelf: 'center',
fontWeight: '100',
flex: 1,
textAlign: 'right',
=======
color: '#999'
},
itemSubNote: {
fontSize: 15,
color: '#999'
... |
<<<<<<<
componentWillReceiveProps({ dataSource }) {
if (dataSource.length !== this.props.dataSource.length) {
if (dataSource.length <= 1) {
this.setState({
...this.state,
selectedItem: dataSource[0],
selectedItem2: undefined,
disabled: dataSource.length === 0,... |
<<<<<<<
var mergedStyle = {};
var btnType = {
color: ((this.props.bordered) && (this.props.primary)) ? this.getTheme().btnPrimaryBg :
((this.props.bordered) && (this.props.success)) ? this.getTheme().btnSuccessBg :
((this.props.bordered) && (this.pr... |
<<<<<<<
const Icomoon = createIconSetFromIcoMoon(icoMoonConfig);
class IconNB extends Component {
=======
class IconNB extends React.PureComponent {
>>>>>>>
const Icomoon = createIconSetFromIcoMoon(icoMoonConfig);
class IconNB extends React.PureComponent {
<<<<<<<
return <this.Icon ref={(c) => (this._root = ... |
<<<<<<<
getSelectedItem() {
return _.find(this.props.children, child => child.props.value === this.props.selectedValue);
}
modifyHeader() {
const childrenArray = React.Children.toArray(this.props.headerComponent.props.children);
const newChildren = [];
childrenArray.forEach((child) => {
... |
<<<<<<<
QUnit.test('SQL/MongoDB export + MongoDB import', function(assert) {
=======
QUnit.test('SQL/MongoDB/Loopback export', function(assert) {
>>>>>>>
QUnit.test('SQL/MongoDB/Loopback export/import', function(assert) {
<<<<<<<
assert.deepEqual($('#container9').queryBuilder('getRulesFromMongo',basic_rul... |
<<<<<<<
// DEFAULT CONFIG
// ===============================
$.fn.queryBuilder.defaults.set({
mongoOperators: {
equal: function(v){ return v[0]; },
not_equal: function(v){ return {'$ne': v[0]}; },
in: function(v){ return {'$in': v};... |
<<<<<<<
=======
twttr.txt.regexen.atSigns = /[@＠]/;
twttr.txt.regexen.extractMentions = regexSupplant(/(^|[^a-zA-Z0-9_!#$%&*@＠])(#{atSigns})([a-zA-Z0-9_]{1,20})/g);
twttr.txt.regexen.extractReply = regexSupplant(/^(?:#{spaces})*#{atSigns}([a-zA-Z0-9_]{1,20})/);
twttr.txt.regexen.listName = /[a-zA-Z][a-zA-Z0-9... |
<<<<<<<
console.log("Uploading outputs")
await helpers.uploadOutputs(taskID, tasks[taskID].vm)
=======
logger.log({
level: 'info',
message: `Revealed solution for task: ${taskID}`
})
>>>>>>>
await helpers.uploadOutputs(taskID, tasks[taskID].vm)
... |
<<<<<<<
data = toCamelCase(data, ['substitutions', 'customArgs', 'headers', 'sections']);
=======
data = toCamelCase(data, ['substitutions', 'dynamicTemplateData', 'customArgs', 'headers']);
>>>>>>>
data = toCamelCase(data, ['substitutions', 'dynamicTemplateData', 'customArgs', 'headers', 'sections']);
... |
<<<<<<<
const setupAction = (NODE_ENV, action, options = {}) => (cliOptions = {}) => {
if (!process.env.NODE_ENV || process.env.NODE_ENV && process.env.NODE_ENV.trim().length === 0) {
process.env.NODE_ENV = NODE_ENV
log(`Setting NODE_ENV=${NODE_ENV}`)
} else {
log(`Using NODE_ENV=${NODE_ENV}`)
}
====... |
<<<<<<<
const body = ReactDOM.renderToString(<RouterContext {...renderProps} />);
const { stylesheet, favicon, bundle } = addHash(this.options, compilation.hash);
=======
const body = renderToString(component);
>>>>>>>
const body = renderToString(component);
<<<<<<<
/... |
<<<<<<<
{ name: 'background-image-containment', type: t.bgContainment },
=======
{ name: 'background-image-smoothing', type: t.bools },
>>>>>>>
{ name: 'background-image-containment', type: t.bgContainment },
{ name: 'background-image-smoothing', type: t.bools },
<<<<<<<
'background-image-cont... |
<<<<<<<
describe("writtenNumber(n, { lang: 'uk', ... })", function() {
before(function() {
writtenNumber.defaults.lang = "uk";
});
it("gets exposed", function() {
should.exist(writtenNumber);
writtenNumber.should.be.instanceof(Function);
});
it("correctly converts numbers < 10",... |
<<<<<<<
var importFilename = typedExport.convertToOutputFilename(visitor.imports[key]);
return 'import ' + key + ' from \'' + importFilename + '\';';
=======
var importFilename = TypedExport.convertToOutputFilename(visitor.imports[key]);
return "import " + key + " from \"" + importFilename + '";';
>>... |
<<<<<<<
$(window).focus(() => {
this.chatConversationVw && this.isConvoOpen() &&
this.markConvoAsRead(this.chatConversationVw.model.get('guid'));
});
},
setAggregateUnreadCount: function() {
var unread = 0;
this.chatConversationsCl.forEach((md) => {
if (!this.model.isBlock... |
<<<<<<<
close: function(){
"use strict";
=======
close: function(){
__.each(this.subModels, function(subModel) {
subModel.off();
});
>>>>>>>
close: function(){
"use strict";
__.each(this.subModels, function(subModel) {
subModel.off();
}); |
<<<<<<<
socketView: this.socketView,
chatAppView: this.chatAppView
}));
$('body').addClass("userPage");
=======
socketView: this.socketView
}),"userPage");
>>>>>>>
socketView: this.socketView,
chatAppView: this.chatAppView
}),"userPage"); |
<<<<<<<
AllItems: "Todos los items", // not translated
FreeShipping: "Envío gratuito", // not translated
DomesticShippingPrice: "Precio de envío nacional", // not translated
InternationalShippingPrice: "Precio de envío internacional", // not translated
Minimu... |
<<<<<<<
baseModal.prototype.render.apply(self);
self.setState(self.tabState);
=======
// add blur to container
$('#obContainer').addClass('modalOpen').scrollTop(0);
self.delegateEvents(); //reapply events if this is a second render
self.$el.parent().fadeIn(300);
>>>>>>>
... |
<<<<<<<
Signature: "PGP-signatur",
=======
Signature: "PGP Signature", //not translated
SignaturePlaceholder: "A PGP Signature is required if you enter a PGP Key", //not translated
>>>>>>>
Signature: "PGP-signatur",
SignaturePlaceholder: "A PGP Signature is required if you ent... |
<<<<<<<
$ = require('jquery');
Backbone.$ = $;
var loadTemplate = require('../utils/loadTemplate'),
app = require('../App.js').getApp(),
pageVw = require('./pageVw'),
=======
loadTemplate = require('../utils/loadTemplate'),
baseVw = require('./baseVw'),
>>>>>>>
loadTemplate = require('../util... |
<<<<<<<
remove: function() {
=======
changeAppBarStyle: function(e) {
app.appBar.setStyle($(e.target).val());
},
close: function(){
__.each(this.subModels, function(subModel) {
subModel.off();
});
__.each(this.subViews, function(subView) {
if (subView.close){
subView.close... |
<<<<<<<
=======
Blocked: "Blocked", // not translated
Advanced: "Advanced", // not translated
General: "General", // not translated
>>>>>>>
Blocked: "Blocked", // not translated
Advanced: "Advanced", // not translated
General: "General", // not translated
<<<<<<<
===... |
<<<<<<<
Shipping: "Forsendelse:",
CountryOfOrigin: "Oprindelsesland:",
CanBeShippedTo: "Kan sendes til dig i:",
=======
Shipping: "Forsendelse",
ShippingReturns: "Shipping & Returns", //not translated
CountryOfOrigin: "Country of Origin:", //not translated
CanBe... |
<<<<<<<
Summary: "Summary", // not translated
Funds: "Funds", // not translated
Discussion: "Discussion", // not translated
Quantity: "Quantity", //not translated
ShippingTo: "Shipping To", //not translated
ModeratedBy: "Moderated by", //not translated
Submit: "Su... |
<<<<<<<
Shipping: "Доставка:",
CountryOfOrigin: "Страна происхождения:",
CanBeShippedTo: "Возможна отправка в:",
=======
Shipping: "Доставка",
ShippingReturns: "Shipping & Returns", //not translated
CountryOfOrigin: "Country of Origin:", //not translated
CanBeSh... |
<<<<<<<
'GET /board': 'BoardController.home',
'GET /stickers': 'MerchController.stickers',
'POST /stickers/order': 'MerchController.order_stickers',
'GET /stickers/check_code/:code': 'MerchController.check_code',
=======
>>>>>>>
'GET /stickers': 'MerchController.stickers',
'POST /stickers/ord... |
<<<<<<<
textArea.value = prettier.format(textArea.value, {
=======
const formattedText = window.prettier.format(textArea.value, {
>>>>>>>
const formattedText = prettier.format(textArea.value, { |
<<<<<<<
var express = require('express')
var fs = require('fs')
var Error = require('http-errors')
var compression = require('compression')
var Auth = require('./auth')
var Logger = require('./logger')
var Config = require('./config')
var Middleware =... |
<<<<<<<
'vendor/npm/jquery-ui/jquery-ui.js': {
format: 'amd',
deps: ['jquery'],
},
'vendor/npm/gridstack/dist/gridstack.js': {
format: 'global',
deps: ['jquery', 'jquery-ui', 'lodash'],
},
"vendor/npm/gridstack/dist/gridstack.jQueryUI.js": {
format: 'global',
deps... |
<<<<<<<
function convertTargetToQuery(target) {
if (!target.metric || target.hide) {
=======
function convertTargetToQuery(target, interval) {
if (!target.metric) {
>>>>>>>
function convertTargetToQuery(target, interval) {
if (!target.metric || target.hide) { |
<<<<<<<
'./dashgrid/dashgrid',
=======
'./acl/acl',
'./folder_picker/picker',
'./folder_modal/folder'
>>>>>>>
'./dashgrid/dashgrid',
'./acl/acl',
'./folder_picker/picker',
'./folder_modal/folder' |
<<<<<<<
'specs/influxSeries-specs',
'specs/overview-ctrl-specs',
=======
'specs/dashboardViewStateSrv-specs',
'specs/influxSeries-specs'
>>>>>>>
'specs/influxSeries-specs',
'specs/dashboardViewStateSrv-specs',
'specs/overview-ctrl-specs', |
<<<<<<<
if (scope.openConfigureModal) {
scope.openConfigureModal();
scope.$apply();
return;
}
=======
// Create a temp scope so we can discard changes to it if needed
var tmpScope = scope.$new();
tmpScope.panel = a... |
<<<<<<<
'./inspectCtrl',
=======
'./opentsdbTargetCtrl',
>>>>>>>
'./inspectCtrl',
'./opentsdbTargetCtrl', |
<<<<<<<
addGridThresholds(options, panel);
=======
addTimeAxis(options);
thresholdManager.addPlotOptions(options, panel);
>>>>>>>
thresholdManager.addPlotOptions(options, panel);
<<<<<<<
function addXSeriesAxis(options) {
var ticks = _.map(data, function(ser... |
<<<<<<<
var template = "select [[group]][[group_comma]] [[func]]([[column]]) as [[column]]_[[func]] from [[series]] " +
=======
var template = "select [[func]](\"[[column]]\") as \"[[column]]_[[func]]\" from \"[[series]]\" " +
>>>>>>>
var template = "select [[group]][[group_comma]] [[fu... |
<<<<<<<
$scope.setVariableValue = function(param, option) {
templateValuesSrv.setVariableValue(param, option).then(function() {
dynamicDashboardSrv.update($scope.dashboard);
$rootScope.$broadcast('refresh');
});
=======
$scope.variableUpdated = function(variable) {
templateVa... |
<<<<<<<
this.dashboard.setViewMode(ctrl.panel, false, false);
=======
>>>>>>>
this.dashboard.setViewMode(ctrl.panel, false, false);
<<<<<<<
=======
$(window).scrollTop(0);
>>>>>>> |
<<<<<<<
var supportedLanguages = ["en", "nl", "da", "cn", "zhtw", "fa", "tr", "cz"];
=======
var supportedLanguages = ["en", "nl", "da", "cn", "zhtw", "fa", "tr", "ru"];
>>>>>>>
var supportedLanguages = ["en", "nl", "da", "cn", "zhtw", "fa", "tr", "ru", "cz"];
<<<<<<<
tr : "Türkçe",
cz : "Česky"
=======
tr : "... |
<<<<<<<
Native["javax/microedition/io/file/FileSystemRegistry.getRoots.()[Ljava/lang/String;"] = function() {
var arrayAddr = J2ME.newStringArray(MIDP.fsRoots.length);
var array = J2ME.getArrayFromAddr(arrayAddr);
=======
Native["javax/microedition/io/file/FileSystemRegistry.getRoots.()[Ljava/lang/String;"] =... |
<<<<<<<
load("polyfill/promise.js", "libs/encoding.js", "bld/native.js", "bld/j2me.js",
"libs/zipfile.js",
"blackBox.js",
"util.js",
"libs/jarstore.js",
"libs/long.js",
"native.js",
"midp/content.js",
"midp/midp.js",
"midp/frameanimator.js",
"midp/fs.js",
"midp/crypto.js",
... |
<<<<<<<
this.numCalled = 100;
this.compiled = null;
this.dontCompile = false;
=======
this.consumes = Signature.getINSlots(this.signature);
if (!this.isStatic) {
this.consumes++;
}
>>>>>>>
this.consumes = Signature.getINSlots(this.signature);
if (!this.isStatic) {
this.... |
<<<<<<<
"nokia.connectivity-settings" ];
=======
"nokia.connectivity-settings", "nokia.file-ui",
"nokia.image-processing" ];
>>>>>>>
"nokia.connectivity-settings", "nokia.image-processing" ]; |
<<<<<<<
Native["java/lang/System.arraycopy.(Ljava/lang/Object;ILjava/lang/Object;II)V"] = function(src, srcOffset, dst, dstOffset, length) {
if (!src || !dst) {
=======
Native["java/lang/System.arraycopy.(Ljava/lang/Object;ILjava/lang/Object;II)V"] = function(addr, src, srcOffset, dst, dstOffset, length) {
if... |
<<<<<<<
var self = getHandle(addr);
return $.getRuntimeKlass(self.klass).classObject;
=======
return $.getRuntimeKlass(this.klass).classObject._address;
>>>>>>>
var self = getHandle(addr);
return $.getRuntimeKlass(self.klass).classObject._address;
<<<<<<<
return new self.runtimeKlass.templateK... |
<<<<<<<
if (!frame) {
return;
=======
function resolve(idx, isStatic) {
var constant = cp[idx];
if (!constant.tag)
return constant;
switch(constant.tag) {
case 3: // TAGS.CONSTANT_Integer
constant = constant.integer;
break;
case... |
<<<<<<<
var keyboardVisibilityListener = null;
Native["com/nokia/mid/ui/VirtualKeyboard.setVisibilityListener.(Lcom/nokia/mid/ui/KeyboardVisibilityListener;)V"] = function(addr, listener) {
keyboardVisibilityListener = listener;
=======
var keyboardVisibilityListener = J2ME.Constants.NULL;
Native["com/nok... |
<<<<<<<
Native["com/sun/mmedia/DefaultConfiguration.nListContentTypesOpen.(Ljava/lang/String;)I"] = function(jProtocol) {
=======
Media.convert3gpToAmr = function(inBuffer) {
// The buffer to store the converted amr file.
var outBuffer = new Uint8Array(inBuffer.length);
// Add AMR header.
var AMR_HEA... |
<<<<<<<
[x, y] = withAnchor(g, c, anchor, x, y, texture.width, texture.height);
=======
var pair = withAnchor(this, c, anchor, x, y, texture.width, texture.height);
x = pair[0];
y = pair[1];
>>>>>>>
var pair = withAnchor(g, c, anchor, x, y, texture.width, texture.height);
... |
<<<<<<<
var numArgs = Signature.getINSlots(key.substring(key.lastIndexOf(".") + 1)) + 1;
var doReturn = getReturnFunction(key);
var postExec = usesPromise ? executePromise : doReturn;
object[key] = function(ctx, stack, isStatic) {
=======
var numArgs = fn.length;
object[key] = function(ctx, stack, isStat... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.