conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
=======
var SparqlResultWriter = require('./lib/writers/SparqlResultWriter');
SparqlResultWriter.register('application/json', './JSONResultWriter');
SparqlResultWriter.register('application/sparql-results+json', './SparqlJSONResultWriter');
SparqlResultWriter.register('application/sparql-results+xml', './SparqlXMLResultWriter');
SparqlResultWriter.register('debug', './StatsResultWriter');
>>>>>>> |
<<<<<<<
}
=======
},
{
name: 'esplora',
baud: 57600,
signature: new Buffer([0x43, 0x41, 0x54, 0x45, 0x52, 0x49, 0x4e]),
productId: ['0x003C', '0x803C'],
protocol: 'avr109'
},
>>>>>>>
},
{
name: 'esplora',
baud: 57600,
signature: new Buffer([0x43, 0x41, 0x54, 0x45, 0x52, 0x49, 0x4e]),
productId: ['0x003C', '0x803C'],
protocol: 'avr109'
} |
<<<<<<<
import removeRootPath from './handlebars/removeRootPath'
=======
import setVariable from './handlebars/setVariable'
import isAuthorized from './handlebars/isAuthorized'
import concat from './handlebars/concat'
import getCurrentuserRole from './handlebars/getCurrentuserRole'
>>>>>>>
import removeRootPath from './handlebars/removeRootPath'
import setVariable from './handlebars/setVariable'
import isAuthorized from './handlebars/isAuthorized'
import concat from './handlebars/concat'
import getCurrentuserRole from './handlebars/getCurrentuserRole'
<<<<<<<
Handlebars.registerHelper('removeRootPath', removeRootPath)
=======
Handlebars.registerHelper('setVariable', setVariable)
Handlebars.registerHelper('isAuthorized', isAuthorized)
Handlebars.registerHelper('concat', concat)
Handlebars.registerHelper('getCurrentuserRole', getCurrentuserRole)
>>>>>>>
Handlebars.registerHelper('removeRootPath', removeRootPath)
Handlebars.registerHelper('setVariable', setVariable)
Handlebars.registerHelper('isAuthorized', isAuthorized)
Handlebars.registerHelper('concat', concat)
Handlebars.registerHelper('getCurrentuserRole', getCurrentuserRole) |
<<<<<<<
<Close
onClick={this.props.onCloseClick}
showIcon={this.state.isOver}
disabled={this.props.disableClose}
/>
=======
<Close
onClick={this.props.onCloseClick}
showIcon={this.state.isOver}
isWindowFocused={this.props.isWindowFocused}
/>
>>>>>>>
<Close
onClick={this.props.onCloseClick}
showIcon={this.state.isOver}
disabled={this.props.disableClose}
isWindowFocused={this.props.isWindowFocused}
/>
<<<<<<<
disabled={this.props.disableMinimize}
=======
isWindowFocused={this.props.isWindowFocused}
>>>>>>>
disabled={this.props.disableMinimize}
isWindowFocused={this.props.isWindowFocused}
<<<<<<<
disabled={this.props.disableResize}
disableFullscreen={this.props.disableFullscreen}
=======
isWindowFocused={this.props.isWindowFocused}
>>>>>>>
disabled={this.props.disableResize}
disableFullscreen={this.props.disableFullscreen}
isWindowFocused={this.props.isWindowFocused} |
<<<<<<<
self.showHelp = function(callback) {
=======
self.enableChat = function(chat_options) {
self.chat = Chat(chat_options);
};
function _addChatToStep() {
var introJs = this;
var $stepElt = $('.introjs-tooltip');
// added already
if ($stepElt.find('.chat').length > 0)
return;
var $chatElt = $('<div class="chat"><br>Problems? <a href="#">Chat with us.</a></div>');
$chatElt.find('a').click(function(e) {
e.preventDefault();
introJs.exit();
self.chat.activate();
});
$stepElt.append($chatElt);
}
self.showHelp = function() {
>>>>>>>
self.enableChat = function(chat_options) {
self.chat = Chat(chat_options);
};
function _addChatToStep() {
var introJs = this;
var $stepElt = $('.introjs-tooltip');
// added already
if ($stepElt.find('.chat').length > 0)
return;
var $chatElt = $('<div class="chat"><br>Problems? <a href="#">Chat with us.</a></div>');
$chatElt.find('a').click(function(e) {
e.preventDefault();
introJs.exit();
self.chat.activate();
});
$stepElt.append($chatElt);
}
self.showHelp = function(callback) {
<<<<<<<
if (typeof callback === 'function'){
intro.oncomplete(callback);
intro.onexit(callback);
}
=======
if (self.chat) {
intro.onafterchange(_addChatToStep);
}
>>>>>>>
if (typeof callback === 'function'){
intro.oncomplete(callback);
intro.onexit(callback);
}
if (self.chat) {
intro.onafterchange(_addChatToStep);
} |
<<<<<<<
afterRender(this, renderItem);
object.onAfterRender(renderItem);
=======
// Ensure depth buffer writing is enabled so it can be cleared on next render
state.enable(gl.DEPTH_TEST);
state.depthMask( true );
state.colorMask( true );
object.onAfterRender();
>>>>>>>
// Ensure depth buffer writing is enabled so it can be cleared on next render
state.enable(gl.DEPTH_TEST);
state.depthMask( true );
state.colorMask( true );
afterRender(this, renderItem);
object.onAfterRender(renderItem); |
<<<<<<<
export {default as geoWiechel, wiechelRaw as geoWiechelRaw} from "./src/wiechel.js";
=======
export {default as geoWagner4, wagner4Raw as geoWagner4Raw} from "./src/wagner4.js";
export {default as geoWagner6, wagner6Raw as geoWagner6Raw} from "./src/wagner6.js";
export {default as geoWagner7, wagner7Raw as geoWagner7Raw} from "./src/wagner7.js";
>>>>>>>
export {default as geoWagner4, wagner4Raw as geoWagner4Raw} from "./src/wagner4.js";
export {default as geoWagner6, wagner6Raw as geoWagner6Raw} from "./src/wagner6.js";
export {default as geoWagner7, wagner7Raw as geoWagner7Raw} from "./src/wagner7.js";
export {default as geoWiechel, wiechelRaw as geoWiechelRaw} from "./src/wiechel.js"; |
<<<<<<<
export {default as geoPatterson, pattersonRaw as geoPattersonRaw} from "./src/patterson";
=======
export {default as geoNellHammer, nellHammerRaw as geoNellHammerRaw} from "./src/nellHammer";
>>>>>>>
export {default as geoNellHammer, nellHammerRaw as geoNellHammerRaw} from "./src/nellHammer";
export {default as geoPatterson, pattersonRaw as geoPattersonRaw} from "./src/patterson"; |
<<<<<<<
this.mousedown_dimensions = { x: null, y: null, width: null, height: null };
this.keyboard_move_start_position = null;
this.moving = false;
this.resizing = false;
=======
this.last_post = {x: null, y: null};
this.ctrl_pressed = false;
this.snap_line_info = {x: null, y: null};
>>>>>>>
this.mousedown_dimensions = { x: null, y: null, width: null, height: null };
this.keyboard_move_start_position = null;
this.moving = false;
this.resizing = false;
this.ctrl_pressed = false;
this.snap_line_info = {x: null, y: null};
<<<<<<<
document.addEventListener('keydown', (e) => {
if (config.TOOL.name != this.name)
=======
document.addEventListener('keydown', (event) => {
if (config.TOOL.name != _this.name)
>>>>>>>
document.addEventListener('keydown', (event) => {
if (config.TOOL.name != this.name)
<<<<<<<
mouseup(e) {
var mouse = this.get_mouse_info(e);
if (mouse.valid == false || mouse.click_valid == false) {
return;
}
if (this.resizing) {
let x = config.layer.x;
let y = config.layer.y;
let width = config.layer.width;
let height = config.layer.height;
config.layer.x = this.mousedown_dimensions.x;
config.layer.y = this.mousedown_dimensions.y;
config.layer.width = this.mousedown_dimensions.width;
config.layer.height = this.mousedown_dimensions.height;
if (
this.mousedown_dimensions.x !== x || this.mousedown_dimensions.y !== y ||
this.mousedown_dimensions.width !== width || this.mousedown_dimensions.height !== height
) {
app.State.do_action(
new app.Actions.Bundle_action('resize_layer', 'Resize Layer', [
new app.Actions.Update_layer_action(config.layer.id, {
x, y, width, height
})
])
);
}
}
else if (this.moving) {
config.layer.x = this.mousedown_dimensions.x;
config.layer.y = this.mousedown_dimensions.y;
const new_x = Math.round(mouse.x - mouse.click_x + this.mousedown_dimensions.x);
const new_y = Math.round(mouse.y - mouse.click_y + this.mousedown_dimensions.y);
if (this.mousedown_dimensions.x !== new_x || this.mousedown_dimensions.y !== new_y) {
app.State.do_action(
new app.Actions.Bundle_action('move_layer', 'Move Layer', [
new app.Actions.Update_layer_action(config.layer.id, {
x: new_x,
y: new_y
})
])
);
}
}
this.moving = false;
this.resizing = false;
=======
//move object
config.layer.x = Math.round(mouse.x - mouse.click_x + this.last_post.x);
config.layer.y = Math.round(mouse.y - mouse.click_y + this.last_post.y);
this.apply_snap(e, config.layer);
this.Base_layers.render();
}
dragEnd(event) {
this.Base_layers.render();
>>>>>>>
mouseup(e) {
var mouse = this.get_mouse_info(e);
if (mouse.valid == false || mouse.click_valid == false) {
return;
}
if (this.resizing) {
this.apply_snap(e, config.layer);
let x = config.layer.x;
let y = config.layer.y;
let width = config.layer.width;
let height = config.layer.height;
config.layer.x = this.mousedown_dimensions.x;
config.layer.y = this.mousedown_dimensions.y;
config.layer.width = this.mousedown_dimensions.width;
config.layer.height = this.mousedown_dimensions.height;
if (
this.mousedown_dimensions.x !== x || this.mousedown_dimensions.y !== y ||
this.mousedown_dimensions.width !== width || this.mousedown_dimensions.height !== height
) {
app.State.do_action(
new app.Actions.Bundle_action('resize_layer', 'Resize Layer', [
new app.Actions.Update_layer_action(config.layer.id, {
x, y, width, height
})
])
);
}
}
else if (this.moving) {
this.apply_snap(e, config.layer);
const new_x = Math.round(mouse.x - mouse.click_x + this.mousedown_dimensions.x);
const new_y = Math.round(mouse.y - mouse.click_y + this.mousedown_dimensions.y);
config.layer.x = this.mousedown_dimensions.x;
config.layer.y = this.mousedown_dimensions.y;
if (this.mousedown_dimensions.x !== new_x || this.mousedown_dimensions.y !== new_y) {
app.State.do_action(
new app.Actions.Bundle_action('move_layer', 'Move Layer', [
new app.Actions.Update_layer_action(config.layer.id, {
x: new_x,
y: new_y
})
])
);
}
}
this.moving = false;
this.resizing = false;
}
dragEnd(event) {
this.Base_layers.render(); |
<<<<<<<
import snippetMiddleware from './store/snippetMiddleware.js';
import cx from './utils/classnames.js';
=======
import transformerMiddleware from './store/transformerMiddleware';
>>>>>>>
import snippetMiddleware from './store/snippetMiddleware.js';
import transformerMiddleware from './store/transformerMiddleware';
import cx from './utils/classnames.js';
<<<<<<<
applyMiddleware(snippetMiddleware(storageAdapter), parserMiddleware),
=======
applyMiddleware(sagaMiddleware, parserMiddleware, transformerMiddleware),
>>>>>>>
applyMiddleware(snippetMiddleware(storageAdapter), parserMiddleware, transformerMiddleware), |
<<<<<<<
it('should import multiple from a single file on multiple lines', () => {
test(
`@value (
blue,
red
) from "./colors.css";
.foo { color: red; }
.bar { color: blue }`,
`:import("./colors.css") {
i__const_blue_10: blue;
i__const_red_11: red;
}
:export {
blue: i__const_blue_10;
red: i__const_red_11;
}
.foo { color: i__const_red_11; }
.bar { color: i__const_blue_10 }`)
})
=======
it('should allow definitions with commas in them', () => {
test(
'@value coolShadow: 0 11px 15px -7px rgba(0,0,0,.2),0 24px 38px 3px rgba(0,0,0,.14) ;\n' +
'.foo { box-shadow: coolShadow; }',
':export {\n coolShadow: 0 11px 15px -7px rgba(0,0,0,.2),0 24px 38px 3px rgba(0,0,0,.14);\n}\n' +
'.foo { box-shadow: 0 11px 15px -7px rgba(0,0,0,.2),0 24px 38px 3px rgba(0,0,0,.14); }')
})
>>>>>>>
it('should import multiple from a single file on multiple lines', () => {
test(
`@value (
blue,
red
) from "./colors.css";
.foo { color: red; }
.bar { color: blue }`,
`:import("./colors.css") {
i__const_blue_10: blue;
i__const_red_11: red;
}
:export {
blue: i__const_blue_10;
red: i__const_red_11;
}
.foo { color: i__const_red_11; }
.bar { color: i__const_blue_10 }`)
})
it('should allow definitions with commas in them', () => {
test(
'@value coolShadow: 0 11px 15px -7px rgba(0,0,0,.2),0 24px 38px 3px rgba(0,0,0,.14) ;\n' +
'.foo { box-shadow: coolShadow; }',
':export {\n coolShadow: 0 11px 15px -7px rgba(0,0,0,.2),0 24px 38px 3px rgba(0,0,0,.14);\n}\n' +
'.foo { box-shadow: 0 11px 15px -7px rgba(0,0,0,.2),0 24px 38px 3px rgba(0,0,0,.14); }')
}) |
<<<<<<<
it('should import multiple from a single file on multiple lines', () => {
test(
`@value (
blue,
red
) from "./colors.css";
.foo { color: red; }
.bar { color: blue }`,
`:import("./colors.css") {
i__const_blue_10: blue;
i__const_red_11: red;
}
:export {
blue: i__const_blue_10;
red: i__const_red_11;
}
.foo { color: i__const_red_11; }
.bar { color: i__const_blue_10 }`)
})
it('should allow definitions with commas in them', () => {
test(
'@value coolShadow: 0 11px 15px -7px rgba(0,0,0,.2),0 24px 38px 3px rgba(0,0,0,.14) ;\n' +
'.foo { box-shadow: coolShadow; }',
':export {\n coolShadow: 0 11px 15px -7px rgba(0,0,0,.2),0 24px 38px 3px rgba(0,0,0,.14);\n}\n' +
'.foo { box-shadow: 0 11px 15px -7px rgba(0,0,0,.2),0 24px 38px 3px rgba(0,0,0,.14); }')
})
=======
it('should allow values with nested parantheses', () => {
test(
'@value aaa: color(red lightness(50%));',
':export {\n aaa: color(red lightness(50%))\n}'
)
})
>>>>>>>
it('should import multiple from a single file on multiple lines', () => {
test(
`@value (
blue,
red
) from "./colors.css";
.foo { color: red; }
.bar { color: blue }`,
`:import("./colors.css") {
i__const_blue_10: blue;
i__const_red_11: red;
}
:export {
blue: i__const_blue_10;
red: i__const_red_11;
}
.foo { color: i__const_red_11; }
.bar { color: i__const_blue_10 }`)
})
it('should allow definitions with commas in them', () => {
test(
'@value coolShadow: 0 11px 15px -7px rgba(0,0,0,.2),0 24px 38px 3px rgba(0,0,0,.14) ;\n' +
'.foo { box-shadow: coolShadow; }',
':export {\n coolShadow: 0 11px 15px -7px rgba(0,0,0,.2),0 24px 38px 3px rgba(0,0,0,.14);\n}\n' +
'.foo { box-shadow: 0 11px 15px -7px rgba(0,0,0,.2),0 24px 38px 3px rgba(0,0,0,.14); }')
})
it('should allow values with nested parantheses', () => {
test(
'@value aaa: color(red lightness(50%));',
':export {\n aaa: color(red lightness(50%))\n}'
)
}) |
<<<<<<<
BLCAdmin.runPostFormSubmitHandlers($form, data);
=======
BLCAdmin.ruleBuilders.removeModalRuleBuilders($form);
>>>>>>>
BLCAdmin.runPostFormSubmitHandlers($form, data);
BLCAdmin.ruleBuilders.removeModalRuleBuilders($form); |
<<<<<<<
$('.boolean-link').each(function() {
$(this).next().find('input:not(:checked)').click();
});
$('body').on('click', '.boolean-link', function(e) {
e.preventDefault();
$(this).next().find('input:not(:checked)').click();
if ($(this).hasClass('view-options')) {
$(this).removeClass('view-options').addClass('hide-options');
BLCAdmin.updateContentHeight($(this));
=======
$('body').on('click', 'button.page-reset', function() {
var currentUrl = '//' + location.host + location.pathname;
window.location = currentUrl;
});
/**
* Make the sticky bar (breadcrumb) lock at the top of the window when it's scrolled off the page
*/
$(window).on('scroll', function() {
var $sc = $('.sticky-container');
var $scp = $('.sticky-container-padding');
if ($(window).scrollTop() < BLCAdmin.getOriginalStickyBarOffset()) {
$sc.removeClass('sticky-fixed');
$sc.width('');
$scp.hide();
>>>>>>>
$('body').on('click', 'button.page-reset', function() {
var currentUrl = '//' + location.host + location.pathname;
window.location = currentUrl;
});
$('.boolean-link').each(function() {
$(this).next().find('input:not(:checked)').click();
});
$('body').on('click', '.boolean-link', function(e) {
e.preventDefault();
$(this).next().find('input:not(:checked)').click();
if ($(this).hasClass('view-options')) {
$(this).removeClass('view-options').addClass('hide-options');
BLCAdmin.updateContentHeight($(this)); |
<<<<<<<
import AnnouncementScreen from '../../features/announcements/Component';
=======
import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator';
import { workspaceStore } from '../../features/workspaces';
>>>>>>>
import AnnouncementScreen from '../../features/announcements/Component';
import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator';
import { workspaceStore } from '../../features/workspaces'; |
<<<<<<<
import { serviceLimitStore } from '../features/serviceLimit';
import { communityRecipesStore } from '../features/communityRecipes';
=======
import { todosStore } from '../features/todos';
>>>>>>>
import { serviceLimitStore } from '../features/serviceLimit';
import { communityRecipesStore } from '../features/communityRecipes';
import { todosStore } from '../features/todos';
<<<<<<<
serviceLimit: serviceLimitStore,
communityRecipes: communityRecipesStore,
=======
todos: todosStore,
>>>>>>>
serviceLimit: serviceLimitStore,
communityRecipes: communityRecipesStore,
todos: todosStore, |
<<<<<<<
import { serviceLimitStore } from '../features/serviceLimit';
=======
import { communityRecipesStore } from '../features/communityRecipes';
>>>>>>>
import { serviceLimitStore } from '../features/serviceLimit';
import { communityRecipesStore } from '../features/communityRecipes';
<<<<<<<
serviceLimit: serviceLimitStore,
=======
communityRecipes: communityRecipesStore,
>>>>>>>
serviceLimit: serviceLimitStore,
communityRecipes: communityRecipesStore, |
<<<<<<<
import TrialActivationInfoBar from '../TrialActivationInfoBar';
=======
import Todos from '../../features/todos/containers/TodosScreen';
>>>>>>>
import TrialActivationInfoBar from '../TrialActivationInfoBar';
import Todos from '../../features/todos/containers/TodosScreen';
<<<<<<<
{hasActivatedTrial && (
<TrialActivationInfoBar />
)}
=======
>>>>>>>
{hasActivatedTrial && (
<TrialActivationInfoBar />
)} |
<<<<<<<
BaseElement.prototype.getLayerSize = function(){
return {w:this.data.width,h:this.data.height};
};
=======
>>>>>>>
<<<<<<<
this.matteElement.setAttribute("mask", "url(#" + id + ")");
};
BaseElement.prototype.hide = function(){
};
BaseElement.prototype.mHelper = new Matrix();
=======
};
>>>>>>>
};
BaseElement.prototype.hide = function(){
};
BaseElement.prototype.mHelper = new Matrix(); |
<<<<<<<
<button
onClick={() => togglePanel()}
className={isVisible ? classes.closeTodosButton : classes.openTodosButton}
type="button"
>
<Icon icon={isVisible ? mdiChevronRight : mdiCheckAll} size={2} />
</button>
=======
<Icon icon={isVisible ? 'mdiChevronRight' : 'mdiCheckAll'} size={2} />
</button>
<div
className={classes.resizeHandler}
style={Object.assign({ left: delta }, isDragging ? { width: 600, marginLeft: -200 } : {})} // This hack is required as resizing with webviews beneath behaves quite bad
onMouseDown={e => this.startResize(e)}
/>
{isDragging && (
>>>>>>>
<Icon icon={isVisible ? mdiChevronRight : mdiCheckAll} size={2} />
</button>
<div
className={classes.resizeHandler}
style={Object.assign({ left: delta }, isDragging ? { width: 600, marginLeft: -200 } : {})} // This hack is required as resizing with webviews beneath behaves quite bad
onMouseDown={e => this.startResize(e)}
/>
{isDragging && (
<<<<<<<
className={classes.resizeHandler}
style={Object.assign({ left: delta }, isDragging ? { width: 600, marginLeft: -200 } : {})} // This hack is required as resizing with webviews beneath behaves quite bad
onMouseDown={e => this.startResize(e)}
/>
{isDragging && (
<div
className={classes.dragIndicator}
style={{ left: delta }} // This hack is required as resizing with webviews beneath behaves quite bad
/>
)}
{isTodosIncludedInCurrentPlan ? (
<Webview
className={classes.webview}
onDidAttach={() => {
const { setTodosWebview } = this.props;
setTodosWebview(this.webview);
this.startListeningToIpcMessages();
}}
partition="persist:todos"
preload="./features/todos/preload.js"
ref={(webview) => { this.webview = webview ? webview.view : null; }}
src={environment.TODOS_FRONTEND}
/>
) : (
<Appear>
<div className={classes.premiumContainer}>
<Icon icon={mdiCheckAll} className={classes.premiumIcon} size={5} />
<p>{intl.formatMessage(messages.premiumInfo)}</p>
<p>{intl.formatMessage(messages.rolloutInfo)}</p>
<ActivateTrialButton
className={classes.premiumCTA}
gaEventInfo={{ category: 'Todos', event: 'upgrade' }}
short
/>
</div>
</Appear>
)}
</div>
</>
=======
className={classes.dragIndicator}
style={{ left: delta }} // This hack is required as resizing with webviews beneath behaves quite bad
/>
)}
<Webview
className={classes.webview}
onDidAttach={() => {
const { setTodosWebview } = this.props;
setTodosWebview(this.webview);
this.startListeningToIpcMessages();
}}
partition="persist:todos"
preload="./features/todos/preload.js"
ref={(webview) => { this.webview = webview ? webview.view : null; }}
src={environment.TODOS_FRONTEND}
/>
</div>
>>>>>>>
className={classes.dragIndicator}
style={{ left: delta }} // This hack is required as resizing with webviews beneath behaves quite bad
/>
)}
{isTodosIncludedInCurrentPlan ? (
<Webview
className={classes.webview}
onDidAttach={() => {
const { setTodosWebview } = this.props;
setTodosWebview(this.webview);
this.startListeningToIpcMessages();
}}
partition="persist:todos"
preload="./features/todos/preload.js"
ref={(webview) => { this.webview = webview ? webview.view : null; }}
src={environment.TODOS_FRONTEND}
/>
) : (
<Appear>
<div className={classes.premiumContainer}>
<Icon icon={mdiCheckAll} className={classes.premiumIcon} size={5} />
<p>{intl.formatMessage(messages.premiumInfo)}</p>
<p>{intl.formatMessage(messages.rolloutInfo)}</p>
<ActivateTrialButton
className={classes.premiumCTA}
gaEventInfo={{ category: 'Todos', event: 'upgrade' }}
short
/>
</div>
</Appear>
)}
</div> |
<<<<<<<
export const API = api;
export const WS_API = wsApi;
export const WEBSITE = web;
=======
export const API = api;
export const API_VERSION = 'v1';
>>>>>>>
export const API = api;
export const API_VERSION = 'v1';
export const WS_API = wsApi;
export const WEBSITE = web; |
<<<<<<<
var data = message(num, msg)
=======
var data = JSON.stringify(new Message(num, msg))
var value
>>>>>>>
var data = message(num, msg)
var value |
<<<<<<<
'backup.style': './resources/assets/sass/backup/backup.scss',
'backup': './resources/assets/js/backup.js',
'medialibrary': './resources/assets/js/medialibrary.js',
'medialibrary.style': './resources/assets/sass/medialibrary/medialibrary.scss',
'menu': './resources/assets/js/menu.js',
'menu.style': './resources/assets/sass/menu/menu.scss',
=======
'laravel-backup.style': './resources/assets/sass/laravel-backup/laravel-backup.scss',
'laravel-backup': './resources/assets/js/laravel-backup.js',
'laravel-medialibrary': './resources/assets/js/laravel-medialibrary.js',
'laravel-medialibrary.style': './resources/assets/sass/laravel-medialibrary/laravel-medialibrary.scss',
>>>>>>>
'laravel-backup.style': './resources/assets/sass/laravel-backup/laravel-backup.scss',
'laravel-backup': './resources/assets/js/laravel-backup.js',
'laravel-medialibrary': './resources/assets/js/laravel-medialibrary.js',
'laravel-medialibrary.style': './resources/assets/sass/laravel-medialibrary/laravel-medialibrary.scss',
'menu': './resources/assets/js/menu.js',
'menu.style': './resources/assets/sass/menu/menu.scss', |
<<<<<<<
folderId: request.params.folder_id,
threadId: request.params.id,
},
=======
folderId: request.payload.folder_id,
threadId: request.params.id,
}
>>>>>>>
folderId: request.payload.folder_id,
threadId: request.params.id,
}, |
<<<<<<<
}
export function typeInstructionFunc(
params: Array<FuncParam> = [],
result: Array<Valtype> = [],
id: ?Index
): TypeInstruction {
return {
type: "TypeInstruction",
id,
functype: {
params,
result
}
};
=======
}
export function callIndirectInstruction(
params: Array<FuncParam>,
results: Array<Valtype>,
intrs: Array<Expression>
): CallIndirectInstruction {
return {
type: "CallIndirectInstruction",
params,
results,
intrs
};
>>>>>>>
}
export function typeInstructionFunc(
params: Array<FuncParam> = [],
result: Array<Valtype> = [],
id: ?Index
): TypeInstruction {
return {
type: "TypeInstruction",
id,
functype: {
params,
result
}
};
}
export function callIndirectInstruction(
params: Array<FuncParam>,
results: Array<Valtype>,
intrs: Array<Expression>
): CallIndirectInstruction {
return {
type: "CallIndirectInstruction",
params,
results,
intrs
}; |
<<<<<<<
{"name": "ComputationalGenomics",
"type": "org"},
=======
{"name": "zosconnect",
"type": "org"},
{"name": "IBM-ATAT",
"type": "org"},
{"name": "IBMResilient",
"type": "org"}
>>>>>>>
{"name": "zosconnect",
"type": "org"},
{"name": "IBM-ATAT",
"type": "org"},
{"name": "IBMResilient",
"type": "org"},
{"name": "ComputationalGenomics",
"type": "org"} |
<<<<<<<
var orgs = [
{"name": "csync/TogetherStream",
"type": "repo"},
{"name": "bradleyjeck/epanetReader",
"type": "repo"},
{"name": "wasdev",
"type": "org",
"link": "http://wasdev.github.io/"},
{"name": "acmeair",
"type": "org"},
{"name": "kimchi-project",
"type": "org"},
{"name": "OpenSocial",
"type": "org"},
{"name": "softlayer",
"type": "org"},
{"name": "cloudant",
"type": "org"},
{"name": "cloudant-labs",
"type": "org"},
{"name": "node-red",
"type": "org"},
{"name": "ibmjstart",
"type": "org"},
{"name": "ibm-js",
"type": "org"},
{"name": "IBMStreams",
"type": "org"},
{"name": "ibm-bioinformatics",
"type":"user"},
{"name": "ld4apps",
"type":"org"},
{"name": "wsadminlib",
"type": "user"},
{"name": "apimanagement",
"type": "org"},
{"name": "Watson-Explorer",
"type": "org"},
{"name": "ot4i/event-filter-pattern",
"type": "repo"},
{"name": "ot4i/mqtt-client-connector",
"type": "repo"},
{"name": "beloglazov/hamcrest-querydsl",
"type": "repo"},
{"name": "beloglazov/couchdb-scala",
"type": "repo"},
{"name": "andrewlow/node",
"type": "repo"},
{"name": "andrewlow/v8ppc",
"type": "repo"},
{"name": "andrewlow/v8z",
"type": "repo"},
{"name": "ibm-rtvs",
"type": "user"},
{"name": "bigfix",
"type": "org"},
{"name": "Open-I-Beam",
"type": "org"},
{"name": "fog/fog-softlayer",
"type": "repo"},
{"name": "y-omura/TransProg",
"type": "repo"},
{"name": "IBM-Bluemix",
"type": "org"},
{"name": "watson-developer-cloud",
"type": "org"},
{"name": "IBM-Watson",
"type": "org"},
{"name": "ibm-research",
"type": "org"},
{"name": "nadgowdas/cargo",
"type": "repo"},
{"name": "digexp",
"type": "org"},
{"name": "andybalaam/git-history-data",
"type": "repo"},
{"name": "ibm-cds-labs",
"type": "org"},
{"name": "OpenWhisk",
"type": "org"},
{"name": "IBM-DBWKL",
"type": "org"},
{"name": "apache/incubator-systemml",
"type": "repo"},
{"name": "node-red/node-red",
"type": "repo"},
{"name": "Brunel-Visualization/Brunel",
"type": "repo"},
{"name": "J9Java/panama-layout-prototype",
"type": "repo" },
{"name": "xdevops/ibm-containers-emulator",
"type": "repo"},
{"name": "ibmalchemy",
"type": "org"},
{"name": "jasnell/activitystrea.ms",
"type": "repo"},
{"name": "openstack/storlets",
"type": "repo"},
{"name": "maximilien/i18n4go",
"type": "repo"},
{"name": "ibm-et",
"type": "org"},
{"name": "RuntimeTools/appmetrics",
"type": "repo"},
{"name": "gaiandb/gaiandb",
"type": "repo"},
{"name": "cloudviz/agentless-system-crawler",
"type": "repo"},
{"name": "shmul/mule",
"type": "repo"},
{"name": "ibmstorage",
"type": "org"},
{"name": "djwillia/solo5",
"type": "repo"},
{"name": "quarks-edge",
"type": "org"},
{"name": "jamiejennings/rosie-pattern-language",
"type": "repo"},
{"name": "openblockchain",
"type": "org"},
{"name": "aruniyengar/storage-client-library",
"type": "repo"},
{"name": "IBM-MIL",
"type": "org"},
{"name": "cognitive-catalyst",
"type": "org"},
{"name": "ibm-design",
"type": "org"},
{"name": "presence-insights",
"type": "org"},
{"name": "ibm-bluemix-mobile-services",
"type": "org"},
{"name": "ibm-security-innovation",
"type": "org"},
{"name": "cicsdev",
"type": "org"},
{"name": "strongloop",
"type": "org"},
{"name": "personality-insights",
"type": "org"},
{"name": "zosconnect",
"type": "org"},
{"name": "IBM-ATAT",
"type": "org"},
{"name": "IBMResilient",
"type": "org"},
{"name": "ComputationalGenomics",
"type": "org"},
{"name": "IzODA",
"type": "org"}
];
=======
var orgs = [
{
"name": "csync/TogetherStream",
"type": "repo"
},
{
"name": "bradleyjeck/epanetReader",
"type": "repo"
},
{
"name": "wasdev",
"type": "org",
"link": "http://wasdev.github.io/"
},
{
"name": "acmeair",
"type": "org"
},
{
"name": "kimchi-project",
"type": "org"
},
{
"name": "OpenSocial",
"type": "org"
},
{
"name": "softlayer",
"type": "org"
},
{
"name": "cloudant",
"type": "org"
},
{
"name": "cloudant-labs",
"type": "org"
},
{
"name": "node-red",
"type": "org"
},
{
"name": "ibmjstart",
"type": "org"
},
{
"name": "ibm-js",
"type": "org"
},
{
"name": "IBMStreams",
"type": "org"
},
{
"name": "ibm-bioinformatics",
"type": "user"
},
{
"name": "ld4apps",
"type": "org"
},
{
"name": "wsadminlib",
"type": "user"
},
{
"name": "apimanagement",
"type": "org"
},
{
"name": "Watson-Explorer",
"type": "org"
},
{
"name": "ot4i/event-filter-pattern",
"type": "repo"
},
{
"name": "ot4i/mqtt-client-connector",
"type": "repo"
},
{
"name": "beloglazov/hamcrest-querydsl",
"type": "repo"
},
{
"name": "beloglazov/couchdb-scala",
"type": "repo"
},
{
"name": "andrewlow/node",
"type": "repo"
},
{
"name": "andrewlow/v8ppc",
"type": "repo"
},
{
"name": "andrewlow/v8z",
"type": "repo"
},
{
"name": "ibm-rtvs",
"type": "user"
},
{
"name": "bigfix",
"type": "org"
},
{
"name": "Open-I-Beam",
"type": "org"
},
{
"name": "fog/fog-softlayer",
"type": "repo"
},
{
"name": "y-omura/TransProg",
"type": "repo"
},
{
"name": "IBM-Bluemix",
"type": "org"
},
{
"name": "watson-developer-cloud",
"type": "org"
},
{
"name": "IBM-Watson",
"type": "org"
},
{
"name": "ibm-research",
"type": "org"
},
{
"name": "nadgowdas/cargo",
"type": "repo"
},
{
"name": "digexp",
"type": "org"
},
{
"name": "andybalaam/git-history-data",
"type": "repo"
},
{
"name": "ibm-cds-labs",
"type": "org"
},
{
"name": "OpenWhisk",
"type": "org"
},
{
"name": "IBM-DBWKL",
"type": "org"
},
{
"name": "apache/incubator-systemml",
"type": "repo"
},
{
"name": "node-red/node-red",
"type": "repo"
},
{
"name": "Brunel-Visualization/Brunel",
"type": "repo"
},
{
"name": "J9Java/panama-layout-prototype",
"type": "repo"
},
{
"name": "xdevops/ibm-containers-emulator",
"type": "repo"
},
{
"name": "ibmalchemy",
"type": "org"
},
{
"name": "jasnell/activitystrea.ms",
"type": "repo"
},
{
"name": "openstack/storlets",
"type": "repo"
},
{
"name": "maximilien/i18n4go",
"type": "repo"
},
{
"name": "ibm-et",
"type": "org"
},
{
"name": "RuntimeTools/appmetrics",
"type": "repo"
},
{
"name": "gaiandb/gaiandb",
"type": "repo"
},
{
"name": "cloudviz/agentless-system-crawler",
"type": "repo"
},
{
"name": "shmul/mule",
"type": "repo"
},
{
"name": "ibmstorage",
"type": "org"
},
{
"name": "djwillia/solo5",
"type": "repo"
},
{
"name": "quarks-edge",
"type": "org"
},
{
"name": "jamiejennings/rosie-pattern-language",
"type": "repo"
},
{
"name": "openblockchain",
"type": "org"
},
{
"name": "aruniyengar/storage-client-library",
"type": "repo"
},
{
"name": "IBM-MIL",
"type": "org"
},
{
"name": "cognitive-catalyst",
"type": "org"
},
{
"name": "ibm-design",
"type": "org"
},
{
"name": "presence-insights",
"type": "org"
},
{
"name": "ibm-bluemix-mobile-services",
"type": "org"
},
{
"name": "ibm-security-innovation",
"type": "org"
},
{
"name": "cicsdev",
"type": "org"
},
{
"name": "strongloop",
"type": "org"
},
{
"name": "personality-insights",
"type": "org"
},
{
"name": "zosconnect",
"type": "org"
},
{
"name": "IBM-ATAT",
"type": "org"
},
{
"name": "IBMResilient",
"type": "org"
},
{
"name": "ComputationalGenomics",
"type": "org"
},
{
"name": "ibm-watson-iot",
"type": "org"
}
];
>>>>>>>
var orgs = [
{
"name": "csync/TogetherStream",
"type": "repo"
},
{
"name": "bradleyjeck/epanetReader",
"type": "repo"
},
{
"name": "wasdev",
"type": "org",
"link": "http://wasdev.github.io/"
},
{
"name": "acmeair",
"type": "org"
},
{
"name": "kimchi-project",
"type": "org"
},
{
"name": "OpenSocial",
"type": "org"
},
{
"name": "softlayer",
"type": "org"
},
{
"name": "cloudant",
"type": "org"
},
{
"name": "cloudant-labs",
"type": "org"
},
{
"name": "node-red",
"type": "org"
},
{
"name": "ibmjstart",
"type": "org"
},
{
"name": "ibm-js",
"type": "org"
},
{
"name": "IBMStreams",
"type": "org"
},
{
"name": "ibm-bioinformatics",
"type": "user"
},
{
"name": "ld4apps",
"type": "org"
},
{
"name": "wsadminlib",
"type": "user"
},
{
"name": "apimanagement",
"type": "org"
},
{
"name": "Watson-Explorer",
"type": "org"
},
{
"name": "ot4i/event-filter-pattern",
"type": "repo"
},
{
"name": "ot4i/mqtt-client-connector",
"type": "repo"
},
{
"name": "beloglazov/hamcrest-querydsl",
"type": "repo"
},
{
"name": "beloglazov/couchdb-scala",
"type": "repo"
},
{
"name": "andrewlow/node",
"type": "repo"
},
{
"name": "andrewlow/v8ppc",
"type": "repo"
},
{
"name": "andrewlow/v8z",
"type": "repo"
},
{
"name": "ibm-rtvs",
"type": "user"
},
{
"name": "bigfix",
"type": "org"
},
{
"name": "Open-I-Beam",
"type": "org"
},
{
"name": "fog/fog-softlayer",
"type": "repo"
},
{
"name": "y-omura/TransProg",
"type": "repo"
},
{
"name": "IBM-Bluemix",
"type": "org"
},
{
"name": "watson-developer-cloud",
"type": "org"
},
{
"name": "IBM-Watson",
"type": "org"
},
{
"name": "ibm-research",
"type": "org"
},
{
"name": "nadgowdas/cargo",
"type": "repo"
},
{
"name": "digexp",
"type": "org"
},
{
"name": "andybalaam/git-history-data",
"type": "repo"
},
{
"name": "ibm-cds-labs",
"type": "org"
},
{
"name": "OpenWhisk",
"type": "org"
},
{
"name": "IBM-DBWKL",
"type": "org"
},
{
"name": "apache/incubator-systemml",
"type": "repo"
},
{
"name": "node-red/node-red",
"type": "repo"
},
{
"name": "Brunel-Visualization/Brunel",
"type": "repo"
},
{
"name": "J9Java/panama-layout-prototype",
"type": "repo"
},
{
"name": "xdevops/ibm-containers-emulator",
"type": "repo"
},
{
"name": "ibmalchemy",
"type": "org"
},
{
"name": "jasnell/activitystrea.ms",
"type": "repo"
},
{
"name": "openstack/storlets",
"type": "repo"
},
{
"name": "maximilien/i18n4go",
"type": "repo"
},
{
"name": "ibm-et",
"type": "org"
},
{
"name": "RuntimeTools/appmetrics",
"type": "repo"
},
{
"name": "gaiandb/gaiandb",
"type": "repo"
},
{
"name": "cloudviz/agentless-system-crawler",
"type": "repo"
},
{
"name": "shmul/mule",
"type": "repo"
},
{
"name": "ibmstorage",
"type": "org"
},
{
"name": "djwillia/solo5",
"type": "repo"
},
{
"name": "quarks-edge",
"type": "org"
},
{
"name": "jamiejennings/rosie-pattern-language",
"type": "repo"
},
{
"name": "openblockchain",
"type": "org"
},
{
"name": "aruniyengar/storage-client-library",
"type": "repo"
},
{
"name": "IBM-MIL",
"type": "org"
},
{
"name": "cognitive-catalyst",
"type": "org"
},
{
"name": "ibm-design",
"type": "org"
},
{
"name": "presence-insights",
"type": "org"
},
{
"name": "ibm-bluemix-mobile-services",
"type": "org"
},
{
"name": "ibm-security-innovation",
"type": "org"
},
{
"name": "cicsdev",
"type": "org"
},
{
"name": "strongloop",
"type": "org"
},
{
"name": "personality-insights",
"type": "org"
},
{
"name": "zosconnect",
"type": "org"
},
{
"name": "IBM-ATAT",
"type": "org"
},
{
"name": "IBMResilient",
"type": "org"
},
{
"name": "ComputationalGenomics",
"type": "org"
},
{
"name": "ibm-watson-iot",
"type": "org"
},
{
"name": "IzODA",
"type": "org"
}
]; |
<<<<<<<
var uuid = require('node-uuid');
=======
var dataTypes = types.dataTypes;
>>>>>>>
var uuid = require('node-uuid');
var dataTypes = types.dataTypes; |
<<<<<<<
});
// from http://jsfiddle.net/naveen/HkxJg/
// Function to get the Max value in Array
Array.max = function(array) {
return Math.max.apply(Math, array);
};
// Function to get the Min value in Array
Array.min = function(array) {
return Math.min.apply(Math, array);
};
=======
});
/**
* @author Remy Sharp
* @url http://remysharp.com/2007/01/25/jquery-tutorial-text-box-hints/
*/
(function ($) {
$.fn.hint = function (blurClass) {
if (!blurClass) {
blurClass = 'blur';
}
return this.each(function () {
// get jQuery version of 'this'
var $input = $(this),
// capture the rest of the variable to allow for reuse
title = $input.attr('title'),
$form = $(this.form),
$win = $(window);
function remove() {
if ($input.val() === title && $input.hasClass(blurClass)) {
$input.val('').removeClass(blurClass);
}
}
// only apply logic if the element has the attribute
if (title) {
// on blur, set value to title attr if text is blank
$input.blur(function () {
if (this.value === '') {
$input.val(title).addClass(blurClass);
}
}).focus(remove).blur(); // now change all inputs to title
// clear the pre-defined text when form is submitted
$form.submit(remove);
$win.unload(remove); // handles Firefox's autocomplete
}
});
};
})(jQuery);
var altBeautify = jQuery('<div id="alt-beautify" style="display:none; position: absolute"/>')
.append('<div class="alt-beautify-content"/>')
.append('<div class="alt-beautify-arrow-border alt-beautify-arrow"/>')
.append('<div class="alt-beautify-arrow-inner alt-beautify-arrow"/>');
var altTarget;
jQuery(document).ready(function () {
jQuery('body').append(altBeautify);
});
function altTimeout() {
if (!altTarget)
return;
altBeautify.css('top', jQuery(altTarget).offset().top + jQuery(altTarget).height());
altBeautify.css('left', jQuery(altTarget).offset().left);
altBeautify.find('.alt-beautify-content').html(jQuery(altTarget).attr('alt-beautify'));
altBeautify.show();
}
function altHide() {
altTarget = null;
altBeautify.hide();
}
jQuery('a[title]').live('mouseover', function (e) {
alt = jQuery(this).attr('title');
if (alt != '') {
jQuery(this).attr('alt-beautify', alt);
jQuery(this).attr('title', '');
}
altTarget = this;
setTimeout("altTimeout()", 500);
});
jQuery('a[title]').live('mouseout', altHide);
jQuery('a[title]').live('click', altHide);
function facet_options_toggle(id, url) {
jQuery('#facet-menu-'+id+' .facet-menu-options').toggle('fast' , function () {
more = jQuery('#facet-menu-'+id+' .facet-menu-more-options');
console.log(more);
if (more.is(':visible') && more.children().length == 0) {
more.addClass('small-loading');
more.load(url, function () {
more.removeClass('small-loading');
});
}
});
}
>>>>>>>
});
// from http://jsfiddle.net/naveen/HkxJg/
// Function to get the Max value in Array
Array.max = function(array) {
return Math.max.apply(Math, array);
};
// Function to get the Min value in Array
Array.min = function(array) {
return Math.min.apply(Math, array);
};
/**
* @author Remy Sharp
* @url http://remysharp.com/2007/01/25/jquery-tutorial-text-box-hints/
*/
(function ($) {
$.fn.hint = function (blurClass) {
if (!blurClass) {
blurClass = 'blur';
}
return this.each(function () {
// get jQuery version of 'this'
var $input = $(this),
// capture the rest of the variable to allow for reuse
title = $input.attr('title'),
$form = $(this.form),
$win = $(window);
function remove() {
if ($input.val() === title && $input.hasClass(blurClass)) {
$input.val('').removeClass(blurClass);
}
}
// only apply logic if the element has the attribute
if (title) {
// on blur, set value to title attr if text is blank
$input.blur(function () {
if (this.value === '') {
$input.val(title).addClass(blurClass);
}
}).focus(remove).blur(); // now change all inputs to title
// clear the pre-defined text when form is submitted
$form.submit(remove);
$win.unload(remove); // handles Firefox's autocomplete
}
});
};
})(jQuery);
var altBeautify = jQuery('<div id="alt-beautify" style="display:none; position: absolute"/>')
.append('<div class="alt-beautify-content"/>')
.append('<div class="alt-beautify-arrow-border alt-beautify-arrow"/>')
.append('<div class="alt-beautify-arrow-inner alt-beautify-arrow"/>');
var altTarget;
jQuery(document).ready(function () {
jQuery('body').append(altBeautify);
});
function altTimeout() {
if (!altTarget)
return;
altBeautify.css('top', jQuery(altTarget).offset().top + jQuery(altTarget).height());
altBeautify.css('left', jQuery(altTarget).offset().left);
altBeautify.find('.alt-beautify-content').html(jQuery(altTarget).attr('alt-beautify'));
altBeautify.show();
}
function altHide() {
altTarget = null;
altBeautify.hide();
}
jQuery('a[title]').live('mouseover', function (e) {
alt = jQuery(this).attr('title');
if (alt != '') {
jQuery(this).attr('alt-beautify', alt);
jQuery(this).attr('title', '');
}
altTarget = this;
setTimeout("altTimeout()", 500);
});
jQuery('a[title]').live('mouseout', altHide);
jQuery('a[title]').live('click', altHide);
function facet_options_toggle(id, url) {
jQuery('#facet-menu-'+id+' .facet-menu-options').toggle('fast' , function () {
more = jQuery('#facet-menu-'+id+' .facet-menu-more-options');
console.log(more);
if (more.is(':visible') && more.children().length == 0) {
more.addClass('small-loading');
more.load(url, function () {
more.removeClass('small-loading');
});
}
});
} |
<<<<<<<
*= require comments.js
=======
*
* serviceworker
*= require serviceworker-companion.js
*
* push notifications
*= require webpush.js
>>>>>>>
*= require comments.js
*
* serviceworker
*= require serviceworker-companion.js
*
* push notifications
*= require webpush.js |
<<<<<<<
transformInterface = TransformExpressionInterface(elem.finalTransform.mProp);
Object.defineProperty(_thisLayerFunction, "rotation", getDescriptor(transformInterface, 'rotation'));
Object.defineProperty(_thisLayerFunction, "scale", getDescriptor(transformInterface, 'scale'));
Object.defineProperty(_thisLayerFunction, "position", getDescriptor(transformInterface, 'position'));
Object.defineProperty(_thisLayerFunction, "opacity", getDescriptor(transformInterface, 'opacity'));
Object.defineProperty(_thisLayerFunction, "anchorPoint", getDescriptor(transformInterface, 'anchorPoint'));
=======
Object.defineProperty(_thisLayerFunction, "rotation", getDescriptor(transformInterface, 'rotation'));
Object.defineProperty(_thisLayerFunction, "scale", getDescriptor(transformInterface, 'scale'));
Object.defineProperty(_thisLayerFunction, "position", getDescriptor(transformInterface, 'position'));
Object.defineProperty(_thisLayerFunction, "opacity", getDescriptor(transformInterface, 'opacity'));
var anchorPointDescriptor = getDescriptor(transformInterface, 'anchorPoint');
Object.defineProperty(_thisLayerFunction, "anchorPoint", anchorPointDescriptor);
Object.defineProperty(_thisLayerFunction, "anchor_point", anchorPointDescriptor);
>>>>>>>
transformInterface = TransformExpressionInterface(elem.finalTransform.mProp);
Object.defineProperty(_thisLayerFunction, "rotation", getDescriptor(transformInterface, 'rotation'));
Object.defineProperty(_thisLayerFunction, "scale", getDescriptor(transformInterface, 'scale'));
Object.defineProperty(_thisLayerFunction, "position", getDescriptor(transformInterface, 'position'));
Object.defineProperty(_thisLayerFunction, "opacity", getDescriptor(transformInterface, 'opacity'));
var anchorPointDescriptor = getDescriptor(transformInterface, 'anchorPoint');
Object.defineProperty(_thisLayerFunction, "anchorPoint", anchorPointDescriptor);
Object.defineProperty(_thisLayerFunction, "anchor_point", anchorPointDescriptor); |
<<<<<<<
// ex. (theme "f_main") -> :root { --f_main: "#fff" }
return getComputedStyle(el).getPropertyValue(`--${variable}`)
=======
return getComputedStyle(el).getPropertyValue(variable) // ex. styleprop('--f_high') to get css variable value
}
// Pixels
this.pixels = (rect, fn, q) => {
const img = ronin.surface.context.getImageData(0, 0, rect.w, rect.h)
for (let i = 0, loop = img.data.length; i < loop; i += 4) {
const pixel = { r: img.data[i], g: img.data[i + 1], b: img.data[i + 2], a: img.data[i + 3] }
const processed = fn(pixel, q)
img.data[i] = processed[0]
img.data[i + 1] = processed[1]
img.data[i + 2] = processed[2]
img.data[i + 3] = processed[3]
}
ronin.surface.context.putImageData(img, 0, 0)
return rect
}
this.saturation = (pixel, q = 1) => {
const color = 0.2126 * pixel.r + 0.7152 * pixel.g + 0.0722 * pixel.b
return [color, color, color, pixel.a]
}
this.contrast = (pixel, q = 1) => {
const intercept = 128 * (1 - q)
return [pixel.r * q + intercept, pixel.g * q + intercept, pixel.b * q + intercept, pixel.a]
>>>>>>>
// ex. (theme "f_main") -> :root { --f_main: "#fff" }
return getComputedStyle(el).getPropertyValue(`--${variable}`)
}
// Pixels
this.pixels = (rect, fn, q) => {
const img = ronin.surface.context.getImageData(0, 0, rect.w, rect.h)
for (let i = 0, loop = img.data.length; i < loop; i += 4) {
const pixel = { r: img.data[i], g: img.data[i + 1], b: img.data[i + 2], a: img.data[i + 3] }
const processed = fn(pixel, q)
img.data[i] = processed[0]
img.data[i + 1] = processed[1]
img.data[i + 2] = processed[2]
img.data[i + 3] = processed[3]
}
ronin.surface.context.putImageData(img, 0, 0)
return rect
}
this.saturation = (pixel, q = 1) => {
const color = 0.2126 * pixel.r + 0.7152 * pixel.g + 0.0722 * pixel.b
return [color, color, color, pixel.a]
}
this.contrast = (pixel, q = 1) => {
const intercept = 128 * (1 - q)
return [pixel.r * q + intercept, pixel.g * q + intercept, pixel.b * q + intercept, pixel.a] |
<<<<<<<
var _that = this,
_mesh = options.mesh;
Object.defineProperty( this, "mesh", {
enumerable: true,
get: function() {
return _mesh;
}
});
=======
var that = this;
var _mesh = options.mesh || null;
var _material = options.material || null;
>>>>>>>
var _that = this,
_mesh = options.mesh || null;
_material = options.material || null;
Object.defineProperty( this, "mesh", {
enumerable: true,
get: function() {
return _mesh;
}
}); |
<<<<<<<
import HomePage from './pages/HomePage'
import ColorsPage from './pages/ColorsPage'
import TypographyPage from './pages/TypographyPage'
import IconographyPage from './pages/IconographyPage'
import LayoutPage from './pages/LayoutPage'
import ProgressBarPage from './pages/ProgressBarPage'
=======
import HomePage from './pages/Home/Page'
import ColorsPage from './pages/Colors/Page'
import TypographyPage from './pages/Typography/Page'
import IconographyPage from './pages/Iconography/Page'
import LayoutPage from './pages/Layout/Page'
import FirstPage from './pages/First/Page'
import ProgressBarPage from './pages/ProgressBar/Page'
>>>>>>>
import HomePage from './pages/Home/Page'
import ColorsPage from './pages/Colors/Page'
import TypographyPage from './pages/Typography/Page'
import IconographyPage from './pages/Iconography/Page'
import LayoutPage from './pages/Layout/Page'
import ProgressBarPage from './pages/ProgressBar/Page'
<<<<<<<
<Route path="/foundations" />
<Route path="/foundations/colors" component={ColorsPage} />
<Route path="/foundations/typography" component={TypographyPage} />
<Route path="/foundations/iconography" component={IconographyPage} />
<Route path="/foundations/layout" component={LayoutPage} />
<Route path="/components" />
<Route path="/components/progress-bar" component={ProgressBarPage} />
=======
<Redirect from="foundations" to="/foundations/colors" />
<Route path="foundations">
<Route path="colors" component={ColorsPage} />
<Route path="typography" component={TypographyPage} />
<Route path="iconography" component={IconographyPage} />
<Route path="layout" component={LayoutPage} />
</Route>
<Redirect from="components" to="/components/first" />
<Route path="components">
<Route path="first" component={FirstPage} />
<Route path="progress-bar" component={ProgressBarPage} />
</Route>
<Route path="patterns">
</Route>
<Route path="resources">
</Route>
>>>>>>>
<Redirect from="foundations" to="/foundations/colors" />
<Route path="foundations">
<Route path="colors" component={ColorsPage} />
<Route path="typography" component={TypographyPage} />
<Route path="iconography" component={IconographyPage} />
<Route path="layout" component={LayoutPage} />
</Route>
<Redirect from="components" to="/components/progress-bar" />
<Route path="components">
<Route path="progress-bar" component={ProgressBarPage} />
</Route>
<Route path="patterns">
</Route>
<Route path="resources">
</Route> |
<<<<<<<
class Nav extends React.Component {
constructor(props) {
super(props);
}
render() {
return (
<div role='nav' className={style.nav}>
<ul>
<li className={style.active}><NavLink to='/foundations'>Foundations</NavLink>
<ul>
<li><NavLink to='/foundations/colors'>Colors</NavLink></li>
<li><NavLink to='/foundations/typography'>Typography</NavLink></li>
<li><NavLink to='/foundations/iconography'>Iconography</NavLink></li>
<li><NavLink to='/foundations/layout'>Layout</NavLink></li>
</ul>
</li>
<li className={style.active}><NavLink to='/components'>Components</NavLink>
<ul>
<li><NavLink to='/components/progress-bar'>Progress Bar</NavLink></li>
<li><NavLink to='/components/icons'>Icons</NavLink></li>
<li><NavLink to='/components/buttons'>Buttons</NavLink></li>
</ul>
</li>
<li><NavLink to='/patterns'>Patterns</NavLink></li>
<li><NavLink to='/resources'>Resources</NavLink></li>
</ul>
</div>
)
}
=======
const Nav = (props) => {
return (
<div role='nav' className={style.nav}>
<ul>
<li className={style.active}><NavLink to='/foundations'>Foundations</NavLink>
<ul>
<li><NavLink to='/foundations/colors'>Colors</NavLink></li>
<li><NavLink to='/foundations/typography'>Typography</NavLink></li>
<li><NavLink to='/foundations/iconography'>Iconography</NavLink></li>
<li><NavLink to='/foundations/layout'>Layout</NavLink></li>
</ul>
</li>
<li className={style.active}><NavLink to='/components'>Components</NavLink>
<ul>
<li><NavLink to='/components/progress-bar'>Progress Bar</NavLink></li>
<li><NavLink to='/components/icons'>Icons</NavLink></li>
</ul>
</li>
<li><NavLink to='/patterns'>Patterns</NavLink></li>
<li><NavLink to='/resources'>Resources</NavLink></li>
</ul>
</div>
)
>>>>>>>
const Nav = (props) => {
return (
<div role='nav' className={style.nav}>
<ul>
<li className={style.active}><NavLink to='/foundations'>Foundations</NavLink>
<ul>
<li><NavLink to='/foundations/colors'>Colors</NavLink></li>
<li><NavLink to='/foundations/typography'>Typography</NavLink></li>
<li><NavLink to='/foundations/iconography'>Iconography</NavLink></li>
<li><NavLink to='/foundations/layout'>Layout</NavLink></li>
</ul>
</li>
<li className={style.active}><NavLink to='/components'>Components</NavLink>
<ul>
<li><NavLink to='/components/progress-bar'>Progress Bar</NavLink></li>
<li><NavLink to='/components/icons'>Icons</NavLink></li>
<li><NavLink to='/components/buttons'>Buttons</NavLink></li>
</ul>
</li>
<li><NavLink to='/patterns'>Patterns</NavLink></li>
<li><NavLink to='/resources'>Resources</NavLink></li>
</ul>
</div>
) |
<<<<<<<
return (
<div role='nav' className={style.nav}>
<ul>
<li className={style.active}><NavLink to='/foundations'>Foundations</NavLink>
<ul>
<li><NavLink to='/foundations/colors'>Colors</NavLink></li>
<li><NavLink to='/foundations/typography'>Typography</NavLink></li>
<li><NavLink to='/foundations/iconography'>Iconography</NavLink></li>
<li><NavLink to='/foundations/layout'>Layout</NavLink></li>
</ul>
</li>
<li className={style.active}><NavLink to='/components'>Components</NavLink>
<ul>
<li><NavLink to='/components/progress-bar'>Progress Bar</NavLink></li>
<li><NavLink to='/components/icons'>Icons</NavLink></li>
<li><NavLink to='/components/buttons'>Buttons</NavLink></li>
<li><NavLink to='/components/checkbox'>Checkbox</NavLink></li>
<li><NavLink to='/components/radio'>Radio</NavLink></li>
</ul>
=======
return (
<div role='nav' className={style.nav}>
<ul>
<li className={style.active}><NavLink to='/foundations'>Foundations</NavLink>
<ul>
<li><NavLink to='/foundations/colors'>Colors</NavLink></li>
<li><NavLink to='/foundations/typography'>Typography</NavLink></li>
<li><NavLink to='/foundations/iconography'>Iconography</NavLink></li>
<li><NavLink to='/foundations/layout'>Layout</NavLink></li>
</ul>
</li>
<li className={style.active}><NavLink to='/components'>Components</NavLink>
<ul>
<li><NavLink to='/components/progress-bar'>Progress Bar</NavLink></li>
<li><NavLink to='/components/icons'>Icons</NavLink></li>
<li><NavLink to='/components/buttons'>Buttons</NavLink></li>
<li><NavLink to='/components/radio'>Radio</NavLink></li>
<li><NavLink to='/components/radio-group'>Radio Group</NavLink></li>
</ul>
>>>>>>>
return (
<div role='nav' className={style.nav}>
<ul>
<li className={style.active}><NavLink to='/foundations'>Foundations</NavLink>
<ul>
<li><NavLink to='/foundations/colors'>Colors</NavLink></li>
<li><NavLink to='/foundations/typography'>Typography</NavLink></li>
<li><NavLink to='/foundations/iconography'>Iconography</NavLink></li>
<li><NavLink to='/foundations/layout'>Layout</NavLink></li>
</ul>
</li>
<li className={style.active}><NavLink to='/components'>Components</NavLink>
<ul>
<li><NavLink to='/components/progress-bar'>Progress Bar</NavLink></li>
<li><NavLink to='/components/icons'>Icons</NavLink></li>
<li><NavLink to='/components/buttons'>Buttons</NavLink></li>
<li><NavLink to='/components/checkbox'>Checkbox</NavLink></li>
<li><NavLink to='/components/radio'>Radio</NavLink></li>
<li><NavLink to='/components/radio-group'>Radio Group</NavLink></li>
</ul> |
<<<<<<<
function completeLayers(compData, layers, mainLayers){
if(!mainLayers){
mainLayers = layers;
}
ExpressionManager.searchExpressions(compData);
=======
function completeLayers(layers, comps){
>>>>>>>
function completeLayers(compData,layers, comps){
ExpressionManager.searchExpressions(compData);
<<<<<<<
if(layerData.ty=='PreCompLayer'){
if(layerData.refId && !layerData.layers){
layerData.layers = findCompLayers(layerData.refId,mainLayers);
}else{
completeLayers(layerData, layerData.layers,mainLayers);
}
}else if(layerData.ty == 'ShapeLayer'){
=======
if(layerData.ty===0){
layerData.layers = findCompLayers(layerData.refId, comps);
completeLayers(layerData.layers, comps);
}else if(layerData.ty === 4){
>>>>>>>
if(layerData.ty===0){
layerData.layers = findCompLayers(layerData.refId, comps);
completeLayers(layerData, layerData.layers,comps);
}else if(layerData.ty === 4){
<<<<<<<
renderedData.an = {
tr: dataOb
};
renderedData.mt = [mtParams[0],mtParams[1],mtParams[2],mtParams[3],mtParams[4]];
//if(!((item.ks.p.s && (item.ks.p.x.x || item.ks.p.y.x)) || item.ks.p.x || item.ks.r.x || item.ks.s.x)){
renderedData.an.matrixArray = matrixInstance.getMatrixArrayFromParams(mtParams[0],mtParams[1],mtParams[2],mtParams[3],mtParams[4]);
//}
=======
matArr = matrixInstance.getMatrixArrayFromParams(mtParams[0],mtParams[1],mtParams[2],mtParams[3],mtParams[4]);
newData = false;
if(!item.__lastRenderAn || dataOb.o !== item.__lastRenderAn.tr.o || dataOb.a[0] !== item.__lastRenderAn.tr.a[0] || dataOb.a[1] !== item.__lastRenderAn.tr.a[1] || matArr[1] !== item.__lastRenderAn.matrixArray[1] || matArr[2] !== item.__lastRenderAn.matrixArray[2] || matArr[3] !== item.__lastRenderAn.matrixArray[3] || matArr[4] !== item.__lastRenderAn.matrixArray[4] || matArr[5] !== item.__lastRenderAn.matrixArray[5]){
renderedData.an = {
tr: dataOb
};
renderedData.an.matrixArray = matArr;
item.__lastRenderAn = renderedData.an;
}else{
renderedData.an = item.__lastRenderAn;
}
>>>>>>>
matArr = matrixInstance.getMatrixArrayFromParams(mtParams[0],mtParams[1],mtParams[2],mtParams[3],mtParams[4]);
newData = false;
if(!item.__lastRenderAn || dataOb.o !== item.__lastRenderAn.tr.o || dataOb.a[0] !== item.__lastRenderAn.tr.a[0] || dataOb.a[1] !== item.__lastRenderAn.tr.a[1] || matArr[1] !== item.__lastRenderAn.matrixArray[1] || matArr[2] !== item.__lastRenderAn.matrixArray[2] || matArr[3] !== item.__lastRenderAn.matrixArray[3] || matArr[4] !== item.__lastRenderAn.matrixArray[4] || matArr[5] !== item.__lastRenderAn.matrixArray[5]){
renderedData.an = {
tr: dataOb
};
renderedData.mt = [mtParams[0],mtParams[1],mtParams[2],mtParams[3],mtParams[4]];
//if(!((item.ks.p.s && (item.ks.p.x.x || item.ks.p.y.x)) || item.ks.p.x || item.ks.r.x || item.ks.s.x)){
renderedData.an.matrixArray = matArr;
//}
item.__lastRenderAn = renderedData.an;
}else{
renderedData.an = item.__lastRenderAn;
}
<<<<<<<
}else if(item.ty == 'ShapeLayer'){
iterateShape(item.shapes,offsettedFrameNum,item.startTime,renderType, null);
=======
}else if(item.ty === 4){
iterateShape(item.shapes,offsettedFrameNum,item.st,renderType);
>>>>>>>
}else if(item.ty === 4){
iterateShape(item.shapes,offsettedFrameNum,item.startTime,renderType, null);
<<<<<<<
iterateLayers(animationData.animation.layers, num, animationData._animType);
ExpressionManager.iterateExpressions(animationData.animation.layers, num, animationData._animType);
=======
iterateLayers(animationData.layers, num, animationData._animType);
>>>>>>>
iterateLayers(animationData.layers, num, animationData._animType);
ExpressionManager.iterateExpressions(animationData.layers, num, animationData._animType); |
<<<<<<<
import Modal from './pages/components/Modal/Page'
=======
import TextareaPage from './pages/components/Textarea/Page'
import InputPage from './pages/components/Input/Page'
>>>>>>>
import TextareaPage from './pages/components/Textarea/Page'
import InputPage from './pages/components/Input/Page'
import Modal from './pages/components/Modal/Page'
<<<<<<<
<Route path='modal' title='Modal' component={Modal} />
</Route>
<Redirect from="components" to="/components/progress-bar" />
<Route path="components" title="Components">
<Route path="progress-bar" title="Progress Bar" component={ProgressBarPage} />
<Route path="icons" title="Icons" component={IconsPage} />
<Route path="buttons" title="Buttons" component={ButtonsPage} />
<Route path="checkbox" title="Checkbox" component={CheckboxPage} />
<Route path="radio" title="Radio" component={RadioPage} />
<Route path="radio-group" title="Radio Group" component={RadioGroupPage} />
=======
<Route path='textarea' title='Textarea' component={TextareaPage} />
<Route path='input' title='Input' component={InputPage} />
>>>>>>>
<Route path='textarea' title='Textarea' component={TextareaPage} />
<Route path='input' title='Input' component={InputPage} />
<Route path='modal' title='Modal' component={Modal} /> |
<<<<<<<
categoryActivityPopupWidth: 0,
budgetRowsHeight: 0,
moveMoneyDialog: false,
moveMoneyAutocomplete: true,
toggleSplits: false
=======
categoryPopupWidth: 0,
accountsSelectedTotal: false
>>>>>>>
categoryActivityPopupWidth: 0,
budgetRowsHeight: 0,
moveMoneyDialog: false,
moveMoneyAutocomplete: true,
toggleSplits: false,
accountsSelectedTotal: false |
<<<<<<<
saveCheckboxOption('resizeInspector');
=======
saveCheckboxOption('importNotification');
saveCheckboxOption('swapClearedFlagged');
>>>>>>>
saveCheckboxOption('resizeInspector');
saveCheckboxOption('importNotification');
saveCheckboxOption('swapClearedFlagged');
<<<<<<<
restoreCheckboxOption('resizeInspector');
=======
restoreCheckboxOption('importNotification');
restoreCheckboxOption('swapClearedFlagged');
>>>>>>>
restoreCheckboxOption('resizeInspector');
restoreCheckboxOption('importNotification');
restoreCheckboxOption('swapClearedFlagged'); |
<<<<<<<
var categoryPopupWidthSelect = document.getElementById('categoryPopupWidth');
categoryPopupWidth = categoryPopupWidthSelect.options[categoryPopupWidthSelect.selectedIndex].value;
var reconciledTextColorSelect = document.getElementById('reconciledTextColor');
reconciledTextColor = reconciledTextColorSelect.options[reconciledTextColorSelect.selectedIndex].value;
=======
var categoryActivityPopupWidthSelect = document.getElementById('categoryActivityPopupWidth');
categoryActivityPopupWidth = categoryActivityPopupWidthSelect.options[categoryActivityPopupWidthSelect.selectedIndex].value;
var moveMoneyDialog = false; // Kevin: Hidden until issue #18 is resolved document.getElementById('moveMoneyDialog').checked;
var moveMoneyAutocomplete = document.getElementById('moveMoneyAutocomplete').checked;
>>>>>>>
var reconciledTextColorSelect = document.getElementById('reconciledTextColor');
reconciledTextColor = reconciledTextColorSelect.options[reconciledTextColorSelect.selectedIndex].value;
var categoryActivityPopupWidthSelect = document.getElementById('categoryActivityPopupWidth');
categoryActivityPopupWidth = categoryActivityPopupWidthSelect.options[categoryActivityPopupWidthSelect.selectedIndex].value;
var moveMoneyDialog = false; // Kevin: Hidden until issue #18 is resolved document.getElementById('moveMoneyDialog').checked;
var moveMoneyAutocomplete = document.getElementById('moveMoneyAutocomplete').checked;
<<<<<<<
categoryPopupWidth: categoryPopupWidth,
reconciledTextColor: reconciledTextColor
=======
categoryActivityPopupWidth: categoryActivityPopupWidth,
moveMoneyDialog: moveMoneyDialog,
moveMoneyAutocomplete: moveMoneyAutocomplete
>>>>>>>
reconciledTextColor: reconciledTextColor
categoryActivityPopupWidth: categoryActivityPopupWidth,
moveMoneyDialog: moveMoneyDialog,
moveMoneyAutocomplete: moveMoneyAutocomplete
<<<<<<<
categoryPopupWidth: 0,
reconciledTextColor: 0
=======
moveMoneyAutocomplete: false
>>>>>>>
reconciledTextColor: 0
moveMoneyAutocomplete: false
<<<<<<<
var categoryPopupWidthSelect = document.getElementById('categoryPopupWidth');
categoryPopupWidthSelect.value = items.categoryPopupWidth;
var reconciledTextColorSelect = document.getElementById('reconciledTextColor');
reconciledTextColorSelect.value = items.reconciledTextColor;
=======
var categoryActivityPopupWidthSelect = document.getElementById('categoryActivityPopupWidth');
categoryActivityPopupWidthSelect.value = items.categoryActivityPopupWidth;
// Kevin: Hidden until issue #18 is resolved document.getElementById('moveMoneyDialog').checked = items.moveMoneyDialog;
document.getElementById('moveMoneyAutocomplete').checked = items.moveMoneyAutocomplete;
>>>>>>>
var reconciledTextColorSelect = document.getElementById('reconciledTextColor');
reconciledTextColorSelect.value = items.reconciledTextColor;
var categoryActivityPopupWidthSelect = document.getElementById('categoryActivityPopupWidth');
categoryActivityPopupWidthSelect.value = items.categoryActivityPopupWidth;
// Kevin: Hidden until issue #18 is resolved document.getElementById('moveMoneyDialog').checked = items.moveMoneyDialog;
document.getElementById('moveMoneyAutocomplete').checked = items.moveMoneyAutocomplete; |
<<<<<<<
=======
"no-bitwise": "off",
"no-caller": "error",
"no-catch-shadow": "error",
"no-confusing-arrow": "error",
"no-continue": "off",
"no-div-regex": "error",
"no-duplicate-imports": "error",
"no-else-return": "off",
"no-empty-function": "off",
"no-eq-null": "off",
"no-eval": "error",
"no-extend-native": "off",
"no-extra-bind": "error",
"no-extra-label": "error",
"no-extra-parens": "off",
"no-floating-decimal": "off",
"no-implicit-coercion": [
"error",
{
"boolean": false,
"number": false,
"string": false
}
],
"no-implicit-globals": "error",
"no-implied-eval": "error",
"no-inline-comments": "off",
"no-invalid-this": "off",
"no-iterator": "error",
"no-label-var": "error",
"no-labels": "error",
"no-lone-blocks": "error",
"no-lonely-if": "off",
"no-loop-func": "off",
"no-magic-numbers": "off",
"no-mixed-requires": "error",
"no-multi-spaces": "off",
"no-multi-str": "off",
"no-multiple-empty-lines": "off",
"no-native-reassign": "off",
"no-negated-condition": "off",
"no-nested-ternary": "off",
"no-new": "error",
"no-new-func": "off",
"no-new-object": "error",
"no-new-require": "error",
"no-new-wrappers": "error",
"no-octal-escape": "error",
>>>>>>>
"no-extend-native": "off", |
<<<<<<<
invoke() {
},
observe(changedNodes) {
// limit to accounts view
if (/accounts/.test(window.location.href)) {
if (changedNodes.has('modal-list')) {
if ($('.ynab-grid-cell-subCategoryName input.accounts-text-field').val() === 'split') {
$('button.modal-account-categories-split-transaction').mousedown();
}
=======
observe: function (changedNodes) {
if (/accounts/.test(window.location.href)) {
if (changedNodes.regex(/^(?=.*\smodal-account-categories\s)(?=.*?\sactive)((?!closing).)*$/gm)) {
var splitButton = $(".button.button-primary.modal-account-categories-split-transaction");
// return if we are already inside a split subtransaction
if (splitButton.length < 1) return false;
var splitIcon = splitButton.html();
var categoryList = $(".modal-account-categories .modal-list");
var liElement = categoryList.find("li.user-data").last().clone();
liElement.find(".modal-account-categories-category").attr("title", "Split Transaction");
liElement.find(".modal-account-categories-category-name").html(splitIcon);
liElement.find(".user-data.currency").remove();
categoryList.append("<li class='user-data'><strong class='modal-account-categories-section-item'>Actions:</strong></li>");
categoryList.append(liElement);
$(".ynab-grid-cell-subCategoryName input").on("keydown", function(e) {
if (e.which == 13 || e.which == 9) {
// Enter or Tab
if (liElement.find(".button-list").hasClass("is-highlighted")) {
e.preventDefault();
splitButton.mousedown();
}
}
}).on("keyup", function() {
const categoryInputString = new RegExp("^" + $(this).val());
if (categoryInputString.test("split") && categoryList.find(".no-button").length == 1) {
// highlight new split button if input contains part of
// 'split' and there are no other categories available
liElement.find(".button-list").addClass("is-highlighted");
} else {
liElement.find(".button-list").removeClass("is-highlighted");
}
});
liElement.on("mousedown", function() {
splitButton.mousedown();
});
>>>>>>>
invoke() {
},
observe(changedNodes) {
if (/accounts/.test(window.location.href)) {
if (changedNodes.regex(/^(?=.*\smodal-account-categories\s)(?=.*?\sactive)((?!closing).)*$/gm)) {
var splitButton = $(".button.button-primary.modal-account-categories-split-transaction");
// return if we are already inside a split subtransaction
if (splitButton.length < 1) return false;
var splitIcon = splitButton.html();
var categoryList = $(".modal-account-categories .modal-list");
var liElement = categoryList.find("li.user-data").last().clone();
liElement.find(".modal-account-categories-category").attr("title", "Split Transaction");
liElement.find(".modal-account-categories-category-name").html(splitIcon);
liElement.find(".user-data.currency").remove();
categoryList.append("<li class='user-data'><strong class='modal-account-categories-section-item'>Actions:</strong></li>");
categoryList.append(liElement);
$(".ynab-grid-cell-subCategoryName input").on("keydown", function(e) {
if (e.which == 13 || e.which == 9) {
// Enter or Tab
if (liElement.find(".button-list").hasClass("is-highlighted")) {
e.preventDefault();
splitButton.mousedown();
}
}
}).on("keyup", function() {
const categoryInputString = new RegExp("^" + $(this).val());
if (categoryInputString.test("split") && categoryList.find(".no-button").length == 1) {
// highlight new split button if input contains part of
// 'split' and there are no other categories available
liElement.find(".button-list").addClass("is-highlighted");
} else {
liElement.find(".button-list").removeClass("is-highlighted");
}
});
liElement.on("mousedown", function() {
splitButton.mousedown();
}); |
<<<<<<<
budgetRowsHeight = budgetRowsHeightSelect.options[budgetRowsHeightSelect.selectedIndex].value;
var categoryActivityPopupWidthSelect = document.getElementById('categoryActivityPopupWidth');
categoryActivityPopupWidth = categoryActivityPopupWidthSelect.options[categoryActivityPopupWidthSelect.selectedIndex].value;
var moveMoneyDialog = document.getElementById('moveMoneyDialog').checked;
=======
var budgetRowsHeight = budgetRowsHeightSelect.options[budgetRowsHeightSelect.selectedIndex].value;
var categoryPopupWidthSelect = document.getElementById('categoryPopupWidth');
var categoryPopupWidth = categoryPopupWidthSelect.options[categoryPopupWidthSelect.selectedIndex].value;
var moveMoneyAutocomplete = document.getElementById('moveMoneyAutocomplete').checked;
>>>>>>>
budgetRowsHeight = budgetRowsHeightSelect.options[budgetRowsHeightSelect.selectedIndex].value;
var categoryActivityPopupWidthSelect = document.getElementById('categoryActivityPopupWidth');
categoryActivityPopupWidth = categoryActivityPopupWidthSelect.options[categoryActivityPopupWidthSelect.selectedIndex].value;
var moveMoneyDialog = document.getElementById('moveMoneyDialog').checked;
var moveMoneyAutocomplete = document.getElementById('moveMoneyAutocomplete').checked;
<<<<<<<
categoryActivityPopupWidth: categoryActivityPopupWidth,
moveMoneyDialog: moveMoneyDialog
=======
categoryPopupWidth: categoryPopupWidth,
moveMoneyAutocomplete: moveMoneyAutocomplete
>>>>>>>
categoryActivityPopupWidth: categoryActivityPopupWidth,
moveMoneyDialog: moveMoneyDialog,
moveMoneyAutocomplete: moveMoneyAutocomplete
<<<<<<<
categoryActivityPopupWidth: 0,
budgetRowsHeight: 0
=======
categoryPopupWidth: 0,
moveMoneyAutocomplete: false
>>>>>>>
categoryActivityPopupWidth: 0,
budgetRowsHeight: 0,
moveMoneyAutocomplete: false
<<<<<<<
var categoryActivityPopupWidthSelect = document.getElementById('categoryActivityPopupWidth');
categoryActivityPopupWidthSelect.value = items.categoryActivityPopupWidth;
document.getElementById('moveMoneyDialog').checked = items.moveMoneyDialog;
=======
var categoryPopupWidthSelect = document.getElementById('categoryPopupWidth');
categoryPopupWidthSelect.value = items.categoryPopupWidth;
document.getElementById('moveMoneyAutocomplete').checked = items.moveMoneyAutocomplete;
>>>>>>>
var categoryActivityPopupWidthSelect = document.getElementById('categoryActivityPopupWidth');
categoryActivityPopupWidthSelect.value = items.categoryActivityPopupWidth;
document.getElementById('moveMoneyDialog').checked = items.moveMoneyDialog;
document.getElementById('moveMoneyAutocomplete').checked = items.moveMoneyAutocomplete; |
<<<<<<<
var NOW = new Date();
var MS_PER_DAY = 86400000;
=======
var closedCookie = '_DIGITAL_CLIMATE_STRIKE_WIDGET_CLOSED_';
>>>>>>>
var closedCookie = '_DIGITAL_CLIMATE_STRIKE_WIDGET_CLOSED_';
var NOW = new Date();
var MS_PER_DAY = 86400000;
<<<<<<<
var footerDate = window.FOOTER_DISPLAY_START_DATE || new Date(2019, 8, 1); // September 1st, 2019
var fullscreenDate = window.FULL_PAGE_DISPLAY_DATE || new Date(2019, 8, 20); // September 20th, 2019
var iframeHost = options.iframeHost !== undefined ? options.iframeHost : 'https://globalclimatestrike.net';
=======
var iframeHost = options.iframeHost !== undefined ? options.iframeHost : 'https://assets.digitalclimatestrike.net';
>>>>>>>
var iframeHost = options.iframeHost !== undefined ? options.iframeHost : 'https://assets.digitalclimatestrike.net';
var footerDate = window.FOOTER_DISPLAY_START_DATE || new Date(2019, 8, 1); // September 1st, 2019
var fullscreenDate = window.FULL_PAGE_DISPLAY_DATE || new Date(2019, 8, 20); // September 20th, 2019
<<<<<<<
if (forceFullPageWidget || todayIs(fullscreenDate.getFullYear(), fullscreenDate.getMonth() + 1, fullscreenDate.getDate())) {
src += 'fullPage=true&';
=======
if (forceFullPageWidget) {
src += 'forceFullPageWidget=true&';
}
if (showCloseButtonOnFullPageWidget) {
src += 'showCloseButtonOnFullPageWidget=true&';
>>>>>>>
if (forceFullPageWidget || todayIs(fullscreenDate.getFullYear(), fullscreenDate.getMonth() + 1, fullscreenDate.getDate())) {
src += 'forceFullPageWidget=true&';
}
if (showCloseButtonOnFullPageWidget) {
src += 'showCloseButtonOnFullPageWidget=true&';
<<<<<<<
// If we haven't reached either display date, or we're past the day where we displayed the
// fullscreen widget, don't show the iframe
if ((footerDate > NOW && fullscreenDate > NOW) || new Date(fullscreenDate.getTime() + MS_PER_DAY) < NOW) {
return;
}
createIframe();
=======
>>>>>>>
// If we haven't reached either display date, or we're past the day where we displayed the
// fullscreen widget, don't show the iframe
if ((footerDate > NOW && fullscreenDate > NOW) || new Date(fullscreenDate.getTime() + MS_PER_DAY) < NOW) {
return;
} |
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
nodeClasses = new Set($node[0].className.split(' '));
ynabToolKit.digestClasses = new Set([...ynabToolKit.digestClasses, ...nodeClasses]);
>>>>>>>
nodeClasses = new Set($node[0].className.split(' '));
ynabToolKit.digestClasses = new Set([...ynabToolKit.digestClasses, ...nodeClasses]);
<<<<<<<
if ($(ynabToolKit.digest[i]).hasClass('navlink-budget') && $(ynabToolKit.digest[i]).hasClass('active')) {
=======
if (ynabToolKit.digestClasses.has('budget-inspector')) {
>>>>>>>
if (ynabToolKit.digestClasses.has('navlink-budget') && ynabToolKit.digestClasses.has('active')) {
<<<<<<<
if ( ynabToolKit.options.warnOnQuickBudget ){
ynabToolKit.warnOnQuickBudget();
}
break;
}
}
for (var i = 0; i < ynabToolKit.digest.length; i++) {
=======
}
>>>>>>>
if ( ynabToolKit.options.warnOnQuickBudget ){
ynabToolKit.warnOnQuickBudget();
}
}
for (var i = 0; i < ynabToolKit.digest.length; i++) {
<<<<<<<
}
<<<<<<< HEAD
=======
for (var i = 0; i < ynabToolKit.digest.length; i++) {
=======
>>>>>>>
<<<<<<<
}
for (var i = 0; i < ynabToolKit.digest.length; i++) {
// The user has changed their budget row selection
if ($(ynabToolKit.digest[i]).hasClass('budget-inspector')) {
if ( ynabToolKit.options.warnOnQuickBudget ){
ynabToolKit.warnOnQuickBudget();
}
break;
}
}
>>>>>>> warn-on-quick-budget
=======
>>>>>>>
// The user has changed their budget row selection
if (ynabToolKit.digestClasses.has('budget-inspector')) {
if ( ynabToolKit.options.warnOnQuickBudget ){
ynabToolKit.warnOnQuickBudget();
}
} |
<<<<<<<
// Supporting functions,
// or variables, etc
var buttonText = (ynabToolKit.l10nData && ynabToolKit.l10nData["toolkit.collapse"]) || 'Collapse';
this.collapseBtn = '<li> \
<li class="ember-view navlink-collapse"> \
<a href="#"> \
<span class="ember-view flaticon stroke left-circle-4"> \
</span>' + buttonText + ' \
</a> \
</li> \
</li>';
=======
ynabToolKit.collapseSideMenu = new function() { // jshint ignore:line
this.collapseBtn =
$('<li>', { class: 'ember-view navlink-collapse' }).append(
$('<a>', { href: '#' }).append(
$('<span>', { class: 'ember-view flaticon stroke left-circle-4' })
).append(
(ynabToolKit.l10nData && ynabToolKit.l10nData["toolkit.collapse"]) || 'Collapse'
)
);
>>>>>>>
// Supporting functions,
// or variables, etc
<<<<<<<
return collapsedBtnContainer;
},
// Handle clicking expand button. Puts things back to original sizes
expandMenu: function(originalSizes) {
$('.collapsed-buttons').hide();
$('.sidebar > .ember-view').fadeIn();
$('.sidebar').animate({width: originalSizes.sidebarWidth});
$('.content').animate({left: originalSizes.contentLeft});
$('.budget-header').animate({left: originalSizes.headerLeft});
$('.budget-content').animate({width: originalSizes.contentWidth}, 400, 'swing', function() {
// Need to remove width after animation completion
$('.budget-content').removeAttr('style');
});
$('.budget-inspector').animate({width: originalSizes.inspectorWidth});
},
// Handle clicking the collapse button
collapseMenu: function() {
ynabToolKit.collapseSideMenu.setActiveButton();
$('.sidebar > .ember-view').hide();
$('.collapsed-buttons').fadeIn();
ynabToolKit.collapseSideMenu.setCollapsedSizes();
},
// Set collapsed sizes
setCollapsedSizes: function() {
$('.sidebar').animate({width: '40px'});
$('.content').animate({left: '40px'}, 400, 'swing', function() {
// Need to remove width after animation completion
$('.ynab-grid-header').removeAttr('style');
});
=======
ynabToolKit.collapseSideMenu.originalButtons[linkClasses.replace(' active', '')] = $(child).find('a');
// Set proper class so the active styling can be applied
if (btnClasses.indexOf('mail-1') > -1) {
button.addClass('collapsed-budget');
} else if (btnClasses.indexOf('government-1') > -1) {
button.addClass('collapsed-account');
} else {
// Fallback if we don't know what the button is.
button.addClass('collapsed');
}
collapsedBtnContainer.append(link);
}
// Add uncollapse button
var collapseBtn = $('<button>');
collapseBtn.addClass('button button-prefs flaticon stroke \
right-circle-4 navbar-expand');
collapsedBtnContainer.append(collapseBtn);
$('body').on('click', '.navbar-expand', function() {
ynabToolKit.collapseSideMenu.expandMenu(ynabToolKit.collapseSideMenu.originalSizes);
});
return collapsedBtnContainer;
};
// Handle clicking expand button. Puts things back to original sizes
this.expandMenu = function(originalSizes) {
$('.collapsed-buttons').hide();
$('.sidebar > .ember-view').fadeIn();
$('.navlink-collapse').show();
$('.sidebar').animate({width: originalSizes.sidebarWidth});
$('.content').animate({left: originalSizes.contentLeft});
$('.budget-header').animate({left: originalSizes.headerLeft});
$('.budget-content').animate({width: originalSizes.contentWidth}, 400, 'swing', function() {
// Need to remove width after animation completion
$('.budget-content').removeAttr('style');
});
$('.budget-inspector').animate({width: originalSizes.inspectorWidth});
};
// Handle clicking the collapse button
this.collapseMenu = function() {
ynabToolKit.collapseSideMenu.setActiveButton();
$('.navlink-collapse').hide();
$('.sidebar > .ember-view').hide();
$('.collapsed-buttons').fadeIn();
ynabToolKit.collapseSideMenu.setCollapsedSizes();
};
>>>>>>>
return collapsedBtnContainer;
},
// Handle clicking expand button. Puts things back to original sizes
expandMenu: function(originalSizes) {
$('.collapsed-buttons').hide();
$('.sidebar > .ember-view').fadeIn();
$('.navlink-collapse').show();
$('.sidebar').animate({width: originalSizes.sidebarWidth});
$('.content').animate({left: originalSizes.contentLeft});
$('.budget-header').animate({left: originalSizes.headerLeft});
$('.budget-content').animate({width: originalSizes.contentWidth}, 400, 'swing', function() {
// Need to remove width after animation completion
$('.budget-content').removeAttr('style');
});
$('.budget-inspector').animate({width: originalSizes.inspectorWidth});
},
// Handle clicking the collapse button
collapseMenu: function() {
ynabToolKit.collapseSideMenu.setActiveButton();
$('.navlink-collapse').hide();
$('.sidebar > .ember-view').hide();
$('.collapsed-buttons').fadeIn();
ynabToolKit.collapseSideMenu.setCollapsedSizes();
},
// Set collapsed sizes
setCollapsedSizes: function() {
$('.sidebar').animate({width: '40px'});
$('.content').animate({left: '40px'}, 400, 'swing', function() {
// Need to remove width after animation completion
$('.ynab-grid-header').removeAttr('style');
}); |
<<<<<<<
// //= [f(1, 'a'), f(1, 'b'), f(2, 'a'), f(2, 'b')];
R.xprodWith = curry3(function (fn, a, b) {
=======
// // => [f(1, 'a'), f(1, 'b'), f(2, 'a'), f(2, 'b')];
R.xprodWith = curry3(function _xprodWith(fn, a, b) {
>>>>>>>
// //= [f(1, 'a'), f(1, 'b'), f(2, 'a'), f(2, 'b')];
R.xprodWith = curry3(function _xprodWith(fn, a, b) {
<<<<<<<
// xProd([1, 2], ['a', 'b']);
// //= [[1, 'a'], [1, 'b'], [2, 'a'], [2, 'b']]
R.xprod = curry2(function (a, b) {
=======
// xProd([1, 2], ['a', 'b'])
// // => [[1, 'a'], [1, 'b')], [2, 'a'], [2, 'b']];
R.xprod = curry2(function _xprod(a, b) { // = xprodWith(prepend); (takes about 3 times as long...)
>>>>>>>
// xProd([1, 2], ['a', 'b']);
// //= [[1, 'a'], [1, 'b'], [2, 'a'], [2, 'b']]
R.xprod = curry2(function _xprod(a, b) { // = xprodWith(prepend); (takes about 3 times as long...)
<<<<<<<
// Returns a new list with the same elements as the original list, just
// in the reverse order.
R.reverse = function (list) {
=======
// Returns a new list with the same elements as the original list, just in the reverse order.
R.reverse = function _reverse(list) {
>>>>>>>
// Returns a new list with the same elements as the original list, just
// in the reverse order.
R.reverse = function _reverse(list) {
<<<<<<<
// var increment = add(1);
// increment(10); //= 11
// add(2, 3); //= 5
// add(7)(10); //= 17
var add = R.add = function(a, b) {
=======
// var add7 = add(7);
// add7(10); // => 17
var add = R.add = function _add(a, b) {
>>>>>>>
// var increment = add(1);
// increment(10); //= 11
// add(2, 3); //= 5
// add(7)(10); //= 17
var add = R.add = function _add(a, b) {
<<<<<<<
// var double = multiply(2);
// var triple = multiply(3);
// double(3); //= 6
// triple(4); //= 12
// multiply(2, 5); //= 10
var multiply = R.multiply = function(a, b) {
=======
// var mult3 = multiply(3);
// mult3(7); // => 21
var multiply = R.multiply = function _multiply(a, b) {
>>>>>>>
// var double = multiply(2);
// var triple = multiply(3);
// double(3); //= 6
// triple(4); //= 12
// multiply(2, 5); //= 10
var multiply = R.multiply = function _multiply(a, b) {
<<<<<<<
// complementaryAngle(30); //= 60
var subtract = R.subtract = function(a, b) {
=======
// complementaryAngle(30) ; // => 60
var subtract = R.subtract = function _subtract(a, b) {
>>>>>>>
// complementaryAngle(30); //= 60
var subtract = R.subtract = function _subtract(a, b) {
<<<<<<<
// var abby = {name: 'Abby', age: 7, hair: 'blond'};
// var fred = {name: 'Fred', age: 12, hair: 'brown'};
// var rusty = {name: 'Rusty', age: 10, hair: 'brown'};
// var alois = {name: 'Alois', age: 15, disposition: 'surly'};
// var kids = [abby, fred, rusty, alois];
// var hasBrownHair = propEq("hair", "brown");
// filter(hasBrownHair, kids); //= [fred, rusty]
R.propEq = function (name, val, obj) {
var f1 = function propEqCurried1(val, obj) {
var f2 = function propEqCurried2(obj) {
return obj[name] === val;
};
return arguments.length < 2 ? f2 : f2(obj);
};
return arguments.length < 2 ? f1 :
arguments.length < 3 ? f1(val) :
f1(val, obj);
};
=======
// var kids = [
// {name: 'Abby', age: 7, hair: 'blond'},
// {name: 'Fred', age: 12, hair: 'brown'},
// {name: 'Rusty', age: 10, hair: 'brown'},
// {name: 'Alois', age: 15, disposition: 'surly'}
// ];
// filter(propEq("hair", "brown"), kids);
// //=> Fred and Rusty
R.propEq = curry3(function propEq(name, val, obj) {
return obj[name] === val;
});
>>>>>>>
// var abby = {name: 'Abby', age: 7, hair: 'blond'};
// var fred = {name: 'Fred', age: 12, hair: 'brown'};
// var rusty = {name: 'Rusty', age: 10, hair: 'brown'};
// var alois = {name: 'Alois', age: 15, disposition: 'surly'};
// var kids = [abby, fred, rusty, alois];
// var hasBrownHair = propEq("hair", "brown");
// filter(hasBrownHair, kids); //= [fred, rusty]
R.propEq = curry3(function propEq(name, val, obj) {
return obj[name] === val;
});
<<<<<<<
// Creates a new list whose elements each have two properties: `val` is
// the value of the corresponding item in the list supplied, and `key`
// is the result of applying the supplied function to that item.
var keyValue = function(fn, list) { // TODO: Should this be made public?
function _keyValue(list) {
return map(function(item) {return {key: fn(item), val: item};}, list);
}
return arguments.length < 2 ? _keyValue : _keyValue(list);
};
=======
// Creates a new list whose elements each have two properties: `val` is the value of the corresponding
// item in the list supplied, and `key` is the result of applying the supplied function to that item.
function keyValue(fn, list) { // TODO: Should this be made public?
return map(function(item) {return {key: fn(item), val: item};}, list);
}
>>>>>>>
// Creates a new list whose elements each have two properties: `val` is
// the value of the corresponding item in the list supplied, and `key`
// is the result of applying the supplied function to that item.
function keyValue(fn, list) { // TODO: Should this be made public?
return map(function(item) {return {key: fn(item), val: item};}, list);
}
<<<<<<<
// Counts the elements of a list according to how many match each value
// of a key generated by the supplied function.
R.countBy = function(fn, list) {
function _countBy(list) {
return foldl(function(counts, obj) {
counts[obj.key] = (counts[obj.key] || 0) + 1;
return counts;
}, {}, keyValue(fn, list));
}
return arguments.length < 2 ? _countBy : _countBy(list);
};
=======
// Counts the elements of a list according to how many match each value of a key generated by the supplied function.
R.countBy = curry2(function countBy(fn, list) {
return foldl(function(counts, obj) {
counts[obj.key] = (counts[obj.key] || 0) + 1;
return counts;
}, {}, keyValue(fn, list));
});
>>>>>>>
// Counts the elements of a list according to how many match each value
// of a key generated by the supplied function.
R.countBy = curry2(function countBy(fn, list) {
return foldl(function(counts, obj) {
counts[obj.key] = (counts[obj.key] || 0) + 1;
return counts;
}, {}, keyValue(fn, list));
}); |
<<<<<<<
import ModalCryptoController from './components/modals/modal-crypto.controller';
=======
//auth modals
import MyVolumioTermsModalController from './components/myvolumio/modals/myvolumio-terms-modal/myvolumio-terms-modal.controller';
import MyVolumioPayingModalController from './components/myvolumio/modals/myvolumio-paying-modal/myvolumio-paying-modal.controller';
>>>>>>>
import ModalCryptoController from './components/modals/modal-crypto.controller';
import MyVolumioTermsModalController from './components/myvolumio/modals/myvolumio-terms-modal/myvolumio-terms-modal.controller';
import MyVolumioPayingModalController from './components/myvolumio/modals/myvolumio-paying-modal/myvolumio-paying-modal.controller'; |
<<<<<<<
import FirmwareUploadPluginController from './plugin/core-plugin/firmware-upload-plugin.controller';
=======
import UiSettingsPluginController from './plugin/core-plugin/ui-settings-plugin.controller';
>>>>>>>
import FirmwareUploadPluginController from './plugin/core-plugin/firmware-upload-plugin.controller';
import UiSettingsPluginController from './plugin/core-plugin/ui-settings-plugin.controller';
<<<<<<<
'ngFileUpload',
=======
'ngFileUpload',
'pascalprecht.translate',
'LocalStorageModule',
>>>>>>>
'ngFileUpload',
'pascalprecht.translate',
'LocalStorageModule',
<<<<<<<
.controller('FirmwareUploadPluginController', FirmwareUploadPluginController)
=======
.controller('UiSettingsPluginController', UiSettingsPluginController)
>>>>>>>
.controller('FirmwareUploadPluginController', FirmwareUploadPluginController)
.controller('UiSettingsPluginController', UiSettingsPluginController) |
<<<<<<<
=======
.registerAvailableLanguageKeys(['ca', 'en', 'da', 'de', 'es', 'fi', 'fr', 'gr', 'hu', 'it', 'ja', 'ko', 'nl', 'no', 'pl', 'pt', 'ru', 'sv', 'ua', 'zh','zh-TW'], {
'ca': 'ca',
'en': 'en',
'da': 'da',
'de': 'de',
'es': 'es',
'fi': 'fi',
'fr': 'fr',
'gr': 'gr',
'hu': 'hu',
'it': 'it',
'ja': 'ja',
'ko': 'ko',
'nl': 'nl',
'no': 'no',
'pl': 'pl',
'pt': 'pt',
'ru': 'ru',
'sv': 'sv',
'ua': 'ua',
'zh': 'zh',
'zh-TW':'zh_TW'
})
//Back end send default language, this improve translation consistency
// .determinePreferredLanguage()
// .preferredLanguage('en')
>>>>>>>
//Back end send default language, this improve translation consistency
// .determinePreferredLanguage()
// .preferredLanguage('en') |
<<<<<<<
const workspace = yield loadWorkspace(filename, 'sallar');
console.log('LOADED!', workspace);
yield put(addRecent(filename[0]));
=======
yield put(addRecent(filename));
>>>>>>>
const workspace = yield loadWorkspace(filename, 'sallar');
console.log('LOADED!', workspace);
yield put(addRecent(filename)); |
<<<<<<<
var pkg = grunt.file.readJSON('package.json'),
globalConfig = {
dist: {
electron_pkgr: "./node_modules/electron-packager/cli.js",
electron_ver: "0.36.1",
ignoreRexp: "(node_modules/(grunt|jspm|foundation|electron|load)|" +
=======
var makedeb = require("makedeb"),
path = require("path"),
fs = require("fs");
function createDebFiles() {
return [
{
arch: "ia32"
},
{
arch: "x64"
}
].reduce(function(prom, build) {
return prom.then(function() {
console.log("Creating deb for architecture: " + build.arch);
return makedeb({
packageName: globalConfig.dist.name,
version: globalConfig.package.version,
buildDir: "./dist/Buttercup-linux-" + build.arch,
outDir: "./dist/",
installPath: "/usr/share/applications/buttercup",
overwrite: true,
// --
maintainer: "[email protected]",
section: "main", // taken from: https://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections
priority: "optional",
architecture: "all",
essential: "no",
packageDescription: "Buttercup password and credentials archive manager."
}).then(function(filePath) {
var dir = path.dirname(filePath);
fs.renameSync(
filePath,
path.join(dir, "buttercup-" + globalConfig.package.version + "-" + build.arch + ".deb")
);
console.log("Finished deb for: " + build.arch);
});
});
}, Promise.resolve());
}
var globalConfig = {
dist: {
electron_pkgr: "./node_modules/electron-packager/cli.js",
electron_ver: "0.36.1",
ignoreRexp: "(node_modules/(grunt|jspm|foundation|electron|load)|" +
>>>>>>>
var makedeb = require("makedeb"),
path = require("path"),
fs = require("fs");
function createDebFiles() {
return [
{
arch: "ia32"
},
{
arch: "x64"
}
].reduce(function(prom, build) {
return prom.then(function() {
console.log("Creating deb for architecture: " + build.arch);
return makedeb({
packageName: globalConfig.dist.name,
version: globalConfig.package.version,
buildDir: "./dist/Buttercup-linux-" + build.arch,
outDir: "./dist/",
installPath: "/usr/share/applications/buttercup",
overwrite: true,
// --
maintainer: "[email protected]",
section: "main", // taken from: https://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections
priority: "optional",
architecture: "all",
essential: "no",
packageDescription: "Buttercup password and credentials archive manager."
}).then(function(filePath) {
var dir = path.dirname(filePath);
fs.renameSync(
filePath,
path.join(dir, "buttercup-" + globalConfig.package.version + "-" + build.arch + ".deb")
);
console.log("Finished deb for: " + build.arch);
});
});
}, Promise.resolve());
}
var globalConfig = {
dist: {
electron_pkgr: "./node_modules/electron-packager/cli.js",
electron_ver: "0.36.1",
ignoreRexp: "(node_modules/(grunt|jspm|foundation|electron|load)|" +
<<<<<<<
name: "Buttercup"
},
package: false
};
=======
name: "Buttercup"
},
isPackage: false,
package: require("./package.json")
};
>>>>>>>
name: "Buttercup"
},
isPackage: false,
package: require("./package.json")
};
<<<<<<<
pkg: pkg,
=======
bump: {
options: {
files: [
'package.json',
'installers.config.json',
'source/resources/buttercup.desktop'
],
updateConfigs: [],
commit: true,
commitMessage: 'Build version: v%VERSION%',
commitFiles: [
'package.json',
'installers.config.json',
'source/resources/buttercup.desktop'
],
createTag: false,
tagName: 'v%VERSION%',
tagMessage: 'Version %VERSION%',
push: false,
pushTo: 'upstream',
gitDescribeOptions: '--tags --always --abbrev=1 --dirty=-d',
globalReplace: false,
prereleaseName: false,
metadata: '',
regExp: /("?version"? ?[:=] ?"?)(\d+\.\d+\.\d+(-\.\d+)?(-\d+)?)("?)/i
}
},
>>>>>>>
bump: {
options: {
files: [
'package.json',
'installers.config.json',
'source/resources/buttercup.desktop'
],
updateConfigs: [],
commit: true,
commitMessage: 'Build version: v%VERSION%',
commitFiles: [
'package.json',
'installers.config.json',
'source/resources/buttercup.desktop'
],
createTag: false,
tagName: 'v%VERSION%',
tagMessage: 'Version %VERSION%',
push: false,
pushTo: 'upstream',
gitDescribeOptions: '--tags --always --abbrev=1 --dirty=-d',
globalReplace: false,
prereleaseName: false,
metadata: '',
regExp: /("?version"? ?[:=] ?"?)(\d+\.\d+\.\d+(-\.\d+)?(-\d+)?)("?)/i
}
},
<<<<<<<
package: '<%= globalConfig.package %>',
version: '<%= pkg.version %>'
=======
package: '<%= globalConfig.isPackage %>'
>>>>>>>
package: '<%= globalConfig.isPackage %>',
version: '<%= pkg.version %>' |
<<<<<<<
import {
getCurrentArchiveId,
getCurrentEntry,
getSetting
} from '../../shared/selectors';
import { copyToClipboard, readClipboard } from './utils';
=======
import { getCurrentArchiveId, getCurrentEntry } from '../../shared/selectors';
import { copyToClipboard } from './utils';
>>>>>>>
import {
getCurrentArchiveId,
getCurrentEntry,
getSetting
} from '../../shared/selectors';
import { copyToClipboard, readClipboard } from './utils';
<<<<<<<
import { getShortcutByKey } from '../../shared/utils/global-shortcuts';
const __cache = {
timer: null,
shortcuts: []
};
/**
* Transform shortcuts to valid mousetrap shortcuts
* @param {string} shortcut
*/
const transformToMousetrapShortcut = shortcut => {
const replacements = [
{
search: 'CmdOrCtrl',
replaceWith: 'mod'
}
];
let replacedShortcut = shortcut;
replacements.forEach(({ search, replaceWith }) => {
replacedShortcut = replacedShortcut.replace(search, replaceWith);
});
return replacedShortcut.toLowerCase();
};
=======
>>>>>>>
import { getShortcutByKey } from '../../shared/utils/global-shortcuts';
const __cache = {
timer: null,
shortcuts: []
};
/**
* Transform shortcuts to valid mousetrap shortcuts
* @param {string} shortcut
*/
const transformToMousetrapShortcut = shortcut => {
const replacements = [
{
search: 'CmdOrCtrl',
replaceWith: 'mod'
}
];
let replacedShortcut = shortcut;
replacements.forEach(({ search, replaceWith }) => {
replacedShortcut = replacedShortcut.replace(search, replaceWith);
});
return replacedShortcut.toLowerCase();
};
<<<<<<<
Mousetrap.bind(__cache.shortcuts.password, () => {
if (__cache.timer) {
clearTimeout(__cache.timer);
}
const state = store.getState();
=======
Mousetrap.bind('mod+c', () => {
>>>>>>>
Mousetrap.bind(__cache.shortcuts.password, () => {
if (__cache.timer) {
clearTimeout(__cache.timer);
}
const state = store.getState();
<<<<<<<
copyToClipboard(password);
if (state.settings.secondsUntilClearClipboard !== '0') {
// Clean the clipboard after n seconds
__cache.timer = setTimeout(function clipboardPurgerClosure() {
if (readClipboard() === password) {
copyToClipboard('');
}
}, ms((state.settings.secondsUntilClearClipboard || '15') + 's'));
}
=======
copyToClipboard(password, true);
>>>>>>>
copyToClipboard(
password,
true,
state.settings.secondsUntilClearClipboard
); |
<<<<<<<
const gateio = require("./exchanges/gateio-client");
=======
const ethfinex = require("./exchanges/ethfinex-client");
>>>>>>>
const ethfinex = require("./exchanges/ethfinex-client");
const gateio = require("./exchanges/gateio-client");
<<<<<<<
Gateio: gateio,
=======
Ethfinex: ethfinex,
>>>>>>>
Ethfinex: ethfinex,
Gateio: gateio,
<<<<<<<
gateio,
=======
ethfinex,
>>>>>>>
ethfinex,
gateio, |
<<<<<<<
if (this.read_)
throw 'Config already read';
this.read_ = true;
=======
if (this.__read)
throw "Config already read";
this.__read = true;
>>>>>>>
if (this.__read)
throw 'Config already read';
this.__read = true;
<<<<<<<
// convert structured configuration into a plain object
// by calling the .write() methods of structured classes
// properties ending in _ are considered private
// NB may be less convoluted just to make these explicit
function extractObj(obj, host) {
var out = {};
for (var p in obj) {
if (!obj.hasOwnProperty(p))
continue;
if (p.substr(p.length - 1, 1) === '_')
continue;
var val = obj[p];
if (typeof val === 'string')
out[p] = val;
else if (typeof val === 'object') {
if (typeof val.write === 'function')
out[p] = val.write();
else if (val instanceof Array)
out[p] = val;
else
out[p] = extractObj(val, {});
}
}
for (var h in host)
if (host.hasOwnProperty(h) && !(h in out))
out[h] = host[h];
return out;
}
=======
>>>>>>>
<<<<<<<
var cfg = extractObj(this, this.originalConfig_),
cfgEndpoints, cfgMap, cfgVersions;
=======
var cfg = extractObj(this, this.__originalConfig);
>>>>>>>
var cfg = extractObj(this, this.__originalConfig),
cfgEndpoints, cfgMap, cfgVersions;
<<<<<<<
return asp(fs.writeFile)(this.fileName_, configContent);
};
=======
return asp(fs.writeFile)(this.__fileName, configContent);
}
>>>>>>>
return asp(fs.writeFile)(this.__fileName, configContent);
}; |
<<<<<<<
if (this.read_)
throw 'Package.json file already read';
=======
if (this.__read)
throw "Package.json file already read";
>>>>>>>
if (this.__read)
throw 'Package.json file already read';
<<<<<<<
pjson.dependencies[dkey] = depValue;
=======
pjson.dependencies[d] = depValue;
>>>>>>>
pjson.dependencies[dkey] = depValue; |
<<<<<<<
$(function () {
=======
(function () {
var pi = Math.PI;
>>>>>>>
$(function () {
var pi = Math.PI; |
<<<<<<<
=======
>>>>>>>
<<<<<<<
const username = req.body.username;
const password = req.body.password;
const newsletterSignup = req.body.newsletter;
=======
const { username } = req.body;
const { password } = req.body;
>>>>>>>
const { username } = req.body;
const { password } = req.body;
const newsletterSignup = req.body.newsletter;
<<<<<<<
// Sign up user for mailchimp list (if checked)
console.log(`newsletter status:${newsletterSignup}`);
if (newsletterSignup) {
const postData = JSON.stringify({ status: 'subscribed', email_address: email });
// Build route because it varies based on API key
const hostname = `${config.mailchimp.mailchimpKey.split('-')[1]}.api.mailchimp.com`;
// Build POST options
const options = {
hostname,
path: `/3.0/lists/${config.mailchimp.mailchimpList}/members`,
method: 'POST',
headers: {
'Content-Type': 'application/json',
Authorization: `apikey ${config.mailchimp.mailchimpKey}`,
'Content-Length': Buffer.byteLength(postData)
}
};
const mailchimpReq = http.request(options, (mailchimpRes) => {
mailchimpRes.setEncoding('utf8');
mailchimpRes.on('data', (body) => {
console.log(`Body: ${body}`);
});
});
mailchimpReq.on('error', (e) => {
console.log(`mailchump error: ${e}`);
const error = new APIError('Mailchimp error', httpStatus.UNAUTHORIZED, true);
return next(error);
});
mailchimpReq.write(postData);
mailchimpReq.end();
}
User
.findOne(userQuery).exec()
=======
User.findOne(userQuery)
.exec()
>>>>>>>
// Sign up user for mailchimp list (if checked)
console.log(`newsletter status:${newsletterSignup}`);
if (newsletterSignup) {
const postData = JSON.stringify({ status: 'subscribed', email_address: email });
// Build route because it varies based on API key
const hostname = `${config.mailchimp.mailchimpKey.split('-')[1]}.api.mailchimp.com`;
// Build POST options
const options = {
hostname,
path: `/3.0/lists/${config.mailchimp.mailchimpList}/members`,
method: 'POST',
headers: {
'Content-Type': 'application/json',
Authorization: `apikey ${config.mailchimp.mailchimpKey}`,
'Content-Length': Buffer.byteLength(postData)
}
};
const mailchimpReq = http.request(options, (mailchimpRes) => {
mailchimpRes.setEncoding('utf8');
mailchimpRes.on('data', (body) => {
console.log(`Body: ${body}`);
});
});
mailchimpReq.on('error', (e) => {
console.log(`mailchump error: ${e}`);
const error = new APIError('Mailchimp error', httpStatus.UNAUTHORIZED, true);
return next(error);
});
mailchimpReq.write(postData);
mailchimpReq.end();
}
User.findOne(userQuery)
.exec() |
<<<<<<<
"unfreeze_energy":"解冻能量账户来获取TRX",
"hide_small_currency":"隐藏小额币种",
"tokens_less_than_10":"通证数量小于10的币种",
"only_TRX_transfers":"只显示TRX转账",
"no_transfers_found":"未查询到转账",
=======
"unfreeze_energy":"解冻能量账户来获取TRX",
/*
##################################################################################
# #
# exchange #
# #
##################################################################################
*/
>>>>>>>
"unfreeze_energy":"解冻能量账户来获取TRX",
"hide_small_currency":"隐藏小额币种",
"tokens_less_than_10":"通证数量小于10的币种",
"only_TRX_transfers":"只显示TRX转账",
"no_transfers_found":"未查询到转账",
/*
##################################################################################
# #
# exchange #
# #
##################################################################################
*/ |
<<<<<<<
try {
debug('Extension:', type, message.toString('utf8'))
var data = JSON.parse(message.toString('utf8'))
switch(type) {
case MANIFEST:
self._remoteOffer = uniq(self._remoteOffer.concat(data.keys))
self.emit('manifest', data, self.requestFeeds.bind(self))
break
case REQUEST_FEEDS:
self._requestHandler(data)
break
case REPLICATE_FEEDS:
self._onRemoteReplicate(data)
break
}
} catch (err) {
// Catch JSON parse errors and any other errors that occur
// during replication and destroy this remote connection
debug('Error during recieve data handler', err)
self._finalize(err)
=======
debug(self._id + ' Recv\'d extension:', type, message.toString('utf8'))
switch(type) {
case MANIFEST:
var rm = JSON.parse(message.toString('utf8'))
self._remoteHas = rm.keys
self.emit('manifest', rm)
break
case REQUEST_FEEDS:
self._remoteWants = JSON.parse(message.toString('utf8'))
self._initRepl()
break
>>>>>>>
try {
debug(self._id + 'Extension:', type, message.toString('utf8'))
var data = JSON.parse(message.toString('utf8'))
switch(type) {
case MANIFEST:
self._remoteOffer = uniq(self._remoteOffer.concat(data.keys))
self.emit('manifest', data, self.requestFeeds.bind(self))
break
case REQUEST_FEEDS:
self._requestHandler(data)
break
case REPLICATE_FEEDS:
self._onRemoteReplicate(data)
break
}
} catch (err) {
// Catch JSON parse errors and any other errors that occur
// during replication and destroy this remote connection
debug('Error during recieve data handler', err)
self._finalize(err)
<<<<<<<
debug('[REPLICATON] sending manifest: ', manifest)
this._localOffer = this._localOffer.concat(manifest.keys)
=======
debug(this._id + ' [REPLICATON] sending manifest:', manifest)
this._localHave = manifest.keys
>>>>>>>
debug(this._id + ' [REPLICATON] sending manifest:', manifest)
this._localOffer = this._localOffer.concat(manifest.keys)
<<<<<<<
this._requestedFeeds = this._requestedFeeds.concat(keys)
debug('[REPLICATION] Sending feeds request', keys)
=======
debug(this._id + ' [REPLICATION] Sending feeds request', keys)
>>>>>>>
this._requestedFeeds = this._requestedFeeds.concat(keys)
debug(this._id + ' [REPLICATION] Sending feeds request', keys)
<<<<<<<
Multiplexer.prototype._requestHandler = function (keys) {
=======
// this method is expected to be called twice, and will trigger the 'replicate'
// event when both local and remote 'wants' are available. calculating a sorted
// common denominator between both wants and availablility which should result
// in two identical arrays being built on both ends using algorithm:
//
// formula: feedsToReplicate = (lWant - (lWant - rHave)) + (rWant - (rWant - lHave ))
//
// The result honors that each node only shares what it offers and does not
// receive feeds that it didn't ask for.
Multiplexer.prototype._initRepl = function() {
>>>>>>>
Multiplexer.prototype._requestHandler = function (keys) {
<<<<<<<
// Start replicating as requested.
this._replicateFeeds(filtered)
}
=======
debug(this._id + ' [REPLICATION] _initRepl', keys.length, keys)
>>>>>>>
// Start replicating as requested.
this._replicateFeeds(filtered)
}
<<<<<<<
feed.ready(function() { // wait for each feed to be ready before replicating.
var hexKey = feed.key.toString('hex');
// prevent a feed from being folded into the main stream twice.
if (typeof self._activeFeedStreams[hexKey] !== 'undefined') {
debug('[REPLICATION] warning! Prevented duplicate replication of: ', hexKey)
// decrease the expectedFeeds that was unconditionally increased
self.stream.expectedFeeds.length--
return
}
debug('[REPLICATION] replicating feed:', hexKey)
var fStream = feed.replicate(Object.assign({}, {
=======
feed.ready(function() { // wait for each to be ready before replicating.
debug(self._id + ' [REPLICATION] replicating feed:', feed.key.toString('hex'))
feed.replicate(Object.assign({}, {
>>>>>>>
feed.ready(function() { // wait for each feed to be ready before replicating.
var hexKey = feed.key.toString('hex');
// prevent a feed from being folded into the main stream twice.
if (typeof self._activeFeedStreams[hexKey] !== 'undefined') {
debug(self._id + '[REPLICATION] warning! Prevented duplicate replication of: ', hexKey)
// decrease the expectedFeeds that was unconditionally increased
self.stream.expectedFeeds.length--
return
}
debug(self._id + '[REPLICATION] replicating feed:', hexKey)
var fStream = feed.replicate(Object.assign({}, { |
<<<<<<<
it('should not generate children for br tags', function() {
var htmlInput = '<br/>';
var reactComponent = parser.parse(htmlInput);
assert.strictEqual((reactComponent.props.children || []).length, 0);
});
it('should parse src elements with all attributes but without warnings', function() {
var htmlInput = '<p><img src="www.google.ca/logo.png"/></p>';
var reactComponent = parser.parse(htmlInput);
var reactHtml = ReactDOMServer.renderToStaticMarkup(reactComponent);
assert.equal(reactHtml, htmlInput);
});
=======
it('should decode character entities in text nodes', function () {
var htmlInput = '<div>1 < 2</div>';
var reactComponent = parser.parse(htmlInput);
var reactHtml = ReactDOMServer.renderToStaticMarkup(reactComponent);
assert.equal(reactHtml, htmlInput);
})
>>>>>>>
it('should not generate children for br tags', function() {
var htmlInput = '<br/>';
var reactComponent = parser.parse(htmlInput);
assert.strictEqual((reactComponent.props.children || []).length, 0);
});
it('should parse src elements with all attributes but without warnings', function() {
var htmlInput = '<p><img src="www.google.ca/logo.png"/></p>';
var reactComponent = parser.parse(htmlInput);
var reactHtml = ReactDOMServer.renderToStaticMarkup(reactComponent);
assert.equal(reactHtml, htmlInput);
});
it('should decode character entities in text nodes', function () {
var htmlInput = '<div>1 < 2</div>';
var reactComponent = parser.parse(htmlInput);
var reactHtml = ReactDOMServer.renderToStaticMarkup(reactComponent);
assert.equal(reactHtml, htmlInput);
}); |
<<<<<<<
}) => (
<div
style={Object.assign(style, {
fontFamily,
background: Color(colors.black).darken(0.2).hslString()
})}
>
{plugins.map((item) => {
const Plugin = item.componentFactory(React, colors)
return <Plugin style={{
marginRight: '7px',
color: item.color
}} />
})}
</div>
)
=======
}) => {
return (
<div
style={Object.assign(style, {
fontFamily,
background: Color(colors.black).darken(0.2).hslString()
})}
>
{plugins.map((item) => {
const Plugin = item.componentFactory(React, colors)
return <Plugin style={{
display: 'flex',
alignItems: 'center',
color: item.color,
paddingLeft: '7px',
paddingRight: '7px',
borderLeft: '1px',
borderTop: '0px',
borderRight: '0px',
borderBottom: '0px',
borderStyle: 'solid',
borderColor: 'rgba(255, 255, 255, .2)',
}} />
})}
</div>
)
}
>>>>>>>
}) => (
<div
style={Object.assign(style, {
fontFamily,
background: Color(colors.black).darken(0.2).hslString()
})}
>
{plugins.map((item) => {
const Plugin = item.componentFactory(React, colors)
return <Plugin style={{
display: 'flex',
alignItems: 'center',
color: item.color,
paddingLeft: '7px',
paddingRight: '7px',
borderLeft: '1px',
borderTop: '0px',
borderRight: '0px',
borderBottom: '0px',
borderStyle: 'solid',
borderColor: 'rgba(255, 255, 255, .2)',
}} />
})}
</div>
) |
<<<<<<<
"transaction_rewards_distribution_ratio":"投票者シェア",
"transaction_energy_cap":"エネルギーの上限",
"transaction_enrgy_cap_tip":"契約デプロイヤが提供する最大エネルギー値",
"signature_list":"署名リスト",
// 2019-12-25 xyy
"transaction_hash":"ハッシュ値",
"transaction_status_tip":'19以上のSRによって確認されたトランザクションは、「確認済み」とマークされます。',
"transaction_type": "取引タイプ",
"transaction_owner_address":"発信アドレス",
"transaction_receiver_address":"リソース受信アドレス",
"transaction_freeze_num":"冷凍量",
"transaction_get_resourse":"受け取ったリソース",
"transaction_recycling_address":"資源循環アドレス",
"transaction_unfreeze_num":"凍結されていない量",
"transaction_fee":"費用",
"transaction_consumed_bandwidth_cap_per":"個人が消費する帯域幅の上限",
"transaction_consumed_bandwidth_cap_all":"すべてが消費する帯域幅の上限",
"transaction_frozen_day":"ロックアップの日",
"transaction_frozen_number":"ロックアップ量",
"transaction_unfreeze_time":"凍結を解除できる時間",
"transaction_consumed_bandwidth_cap_per_tip":"TRC10転送が発生したときに、1人のユーザーのトークンホルダーが消費する最大帯域幅",
"transaction_consumed_bandwidth_cap_all_tip":"TRC10転送が発生したときにトークンホルダーを使用するすべてのユーザーの帯域幅の上限",
"transaction_activate_account":"アクティブアドレス",
"transaction_TRANSFERCONTRACT":"TRX転送",
"transaction_FREEZEBALANCECONTRACT":"TRXフリーズ",
"transaction_UNFREEZEBALANCECONTRACT":"TRX凍結解除",
"transaction_TRANSFERASSETCONTRACT":"TRC10転送",
"transaction_ASSETISSUECONTRACT":"TRC10の問題",
"transaction_PARTICIPATEASSETISSUECONTRACT":"TRC10発行参加",
"transaction_UNFREEZEASSETCONTRACT":"TRC10凍結解除",
"transaction_UPDATEASSETCONTRACT":"TRC10パラメーターの更新",
"transaction_ACCOUNTCREATECONTRACT":"アカウント作成",
"transaction_WITHDRAWBALANCECONTRACT":"報酬の引き出し",
"transaction_TRIGGERSMARTCONTRACT":"スマートコントラクトトリガー",
"transaction_VOTEWITNESSCONTRACT":"投票",
"transaction_WITNESSCREATECONTRACT":"代表者作成",
"transaction_WITNESSUPDATECONTRACT":"担当者情報の更新",
"transaction_ACCOUNTUPDATECONTRACT":"アカウント名の更新",
"transaction_PROPOSALCREATECONTRACT":"プロポーザル作成",
"transaction_PROPOSALAPPROVECONTRACT":"提案の承認",
"transaction_PROPOSALDELETECONTRACT":"プロポーザルのキャンセル",
"transaction_SETACCOUNTIDCONTRACT":"アカウントIDを設定",
"transaction_CREATESMARTCONTRACT":"スマートコントラクト作成",
"transaction_UPDATESETTINGCONTRACT":"契約設定の更新",
"transaction_EXCHANGECREATECONTRACT":"Bancor取引の作成",
"transaction_EXCHANGEINJECTCONTRACT":"Bancor取引を注入する",
"transaction_EXCHANGEWITHDRAWCONTRACT":"Bancor取引の撤退",
"transaction_EXCHANGETRANSACTIONCONTRACT":"Bancorのトランザクション",
"transaction_ACCOUNTPERMISSIONUPDATECONTRACT":"アカウント権限の更新",
"transaction_UPDATEENERGYLIMITCONTRACT":"契約エネルギー制限の更新",
"transaction_UPDATEBROKERAGECONTRACT":"代表ブローカーの更新",
"transaction_CLEARABICONTRACT":"契約ABIクリア",
"transaction_token_holder_address":"トークン保有者の住所",
"transaction_issue_address":"発行者の住所",
"only_show_sinatures":"署名を残すアドレスのみを表示する",
=======
/*
##################################################################################
# #
# 191230 page index optimization #
# #
##################################################################################
*/
"index_page_menu_more_dev_resources":"開発資源",
"index_page_search_placeholder":"アドレス/ハッシュ/トークン/ブロックする",
"index_page_footer_team_info":"グループ紹介",
"index_page_footer_feedback":"フィードバック",
"index_page_footer_expand":"展開",
"index_page_footer_donate_address":"このアドレスはTRONによって保持されており、寄付はTRONがより良いエコロジーを構築するのに役立ちます。",
"index_page_confirmed_blocks":"確認済みブロック",
"index_page_confirmed_blocks_tips":"19以上のスーパーノードによって確認されたブロック",
"index_page_switch_tokens":"トークンスイッチ",
"index_page_tronscan_info":"TRONSCANはTRONに最適なブロックチェーンブラウザーです",
"index_page_down_excel_tips":"Excelを使用してダウンロードしたドキュメントを開く場合、セルの小数点以下の桁数を手動で調整する必要があります。",
"index_page_pane_current":"現在のTPS",
"index_page_pane_MaxTPS":"ピークTPS",
"index_page_idebar_expand":"展開",
>>>>>>>
"transaction_rewards_distribution_ratio":"投票者シェア",
"transaction_energy_cap":"エネルギーの上限",
"transaction_enrgy_cap_tip":"契約デプロイヤが提供する最大エネルギー値",
"signature_list":"署名リスト",
// 2019-12-25 xyy
"transaction_hash":"ハッシュ値",
"transaction_status_tip":'19以上のSRによって確認されたトランザクションは、「確認済み」とマークされます。',
"transaction_type": "取引タイプ",
"transaction_owner_address":"発信アドレス",
"transaction_receiver_address":"リソース受信アドレス",
"transaction_freeze_num":"冷凍量",
"transaction_get_resourse":"受け取ったリソース",
"transaction_recycling_address":"資源循環アドレス",
"transaction_unfreeze_num":"凍結されていない量",
"transaction_fee":"費用",
"transaction_consumed_bandwidth_cap_per":"個人が消費する帯域幅の上限",
"transaction_consumed_bandwidth_cap_all":"すべてが消費する帯域幅の上限",
"transaction_frozen_day":"ロックアップの日",
"transaction_frozen_number":"ロックアップ量",
"transaction_unfreeze_time":"凍結を解除できる時間",
"transaction_consumed_bandwidth_cap_per_tip":"TRC10転送が発生したときに、1人のユーザーのトークンホルダーが消費する最大帯域幅",
"transaction_consumed_bandwidth_cap_all_tip":"TRC10転送が発生したときにトークンホルダーを使用するすべてのユーザーの帯域幅の上限",
"transaction_activate_account":"アクティブアドレス",
"transaction_TRANSFERCONTRACT":"TRX転送",
"transaction_FREEZEBALANCECONTRACT":"TRXフリーズ",
"transaction_UNFREEZEBALANCECONTRACT":"TRX凍結解除",
"transaction_TRANSFERASSETCONTRACT":"TRC10転送",
"transaction_ASSETISSUECONTRACT":"TRC10の問題",
"transaction_PARTICIPATEASSETISSUECONTRACT":"TRC10発行参加",
"transaction_UNFREEZEASSETCONTRACT":"TRC10凍結解除",
"transaction_UPDATEASSETCONTRACT":"TRC10パラメーターの更新",
"transaction_ACCOUNTCREATECONTRACT":"アカウント作成",
"transaction_WITHDRAWBALANCECONTRACT":"報酬の引き出し",
"transaction_TRIGGERSMARTCONTRACT":"スマートコントラクトトリガー",
"transaction_VOTEWITNESSCONTRACT":"投票",
"transaction_WITNESSCREATECONTRACT":"代表者作成",
"transaction_WITNESSUPDATECONTRACT":"担当者情報の更新",
"transaction_ACCOUNTUPDATECONTRACT":"アカウント名の更新",
"transaction_PROPOSALCREATECONTRACT":"プロポーザル作成",
"transaction_PROPOSALAPPROVECONTRACT":"提案の承認",
"transaction_PROPOSALDELETECONTRACT":"プロポーザルのキャンセル",
"transaction_SETACCOUNTIDCONTRACT":"アカウントIDを設定",
"transaction_CREATESMARTCONTRACT":"スマートコントラクト作成",
"transaction_UPDATESETTINGCONTRACT":"契約設定の更新",
"transaction_EXCHANGECREATECONTRACT":"Bancor取引の作成",
"transaction_EXCHANGEINJECTCONTRACT":"Bancor取引を注入する",
"transaction_EXCHANGEWITHDRAWCONTRACT":"Bancor取引の撤退",
"transaction_EXCHANGETRANSACTIONCONTRACT":"Bancorのトランザクション",
"transaction_ACCOUNTPERMISSIONUPDATECONTRACT":"アカウント権限の更新",
"transaction_UPDATEENERGYLIMITCONTRACT":"契約エネルギー制限の更新",
"transaction_UPDATEBROKERAGECONTRACT":"代表ブローカーの更新",
"transaction_CLEARABICONTRACT":"契約ABIクリア",
"transaction_token_holder_address":"トークン保有者の住所",
"transaction_issue_address":"発行者の住所",
"only_show_sinatures":"署名を残すアドレスのみを表示する",
/*
##################################################################################
# #
# 191230 page index optimization #
# #
##################################################################################
*/
"index_page_menu_more_dev_resources":"開発資源",
"index_page_search_placeholder":"アドレス/ハッシュ/トークン/ブロックする",
"index_page_footer_team_info":"グループ紹介",
"index_page_footer_feedback":"フィードバック",
"index_page_footer_expand":"展開",
"index_page_footer_donate_address":"このアドレスはTRONによって保持されており、寄付はTRONがより良いエコロジーを構築するのに役立ちます。",
"index_page_confirmed_blocks":"確認済みブロック",
"index_page_confirmed_blocks_tips":"19以上のスーパーノードによって確認されたブロック",
"index_page_switch_tokens":"トークンスイッチ",
"index_page_tronscan_info":"TRONSCANはTRONに最適なブロックチェーンブラウザーです",
"index_page_down_excel_tips":"Excelを使用してダウンロードしたドキュメントを開く場合、セルの小数点以下の桁数を手動で調整する必要があります。",
"index_page_pane_current":"現在のTPS",
"index_page_pane_MaxTPS":"ピークTPS",
"index_page_idebar_expand":"展開", |
<<<<<<<
{name: "header", kind: "moon.Item", onSpotlightFocus: "headerFocus", ontap: "expandContract", classes: "moon-expandable-list-item-header"},
{name: "drawer", kind: "enyo.Drawer", resizeContainer:false, classes: "moon-expandable-list-item-client", components: [
=======
// headerContainer required to avoid bad scrollWidth returned in RTL for certain text widths (webkit bug)
{name: "headerContainer", classes: "moon-expandable-picker-header", components: [
{name: "header", kind: "moon.Item", onSpotlightFocus: "headerFocus", ontap: "expandContract"}
]},
{name: "drawer", kind: "enyo.Drawer", classes: "moon-expandable-list-item-client", components: [
>>>>>>>
// headerContainer required to avoid bad scrollWidth returned in RTL for certain text widths (webkit bug)
{name: "headerContainer", classes: "moon-expandable-picker-header", components: [
{name: "header", kind: "moon.Item", onSpotlightFocus: "headerFocus", ontap: "expandContract"}
]},
{name: "drawer", kind: "enyo.Drawer", resizeContainer:false, classes: "moon-expandable-list-item-client", components: [ |
<<<<<<<
'AudioPlayback.js',
'LightPanel.js',
'LightPanels.js'
=======
'AudioPlayback.js',
'Scrollable.js',
'NewDataList.js',
'NewPagingControl.js',
'ScrollControls.js'
>>>>>>>
'AudioPlayback.js',
'LightPanel.js',
'LightPanels.js'
'Scrollable.js',
'NewDataList.js',
'NewPagingControl.js',
'ScrollControls.js' |
<<<<<<<
this.$.hourWrapper.createComponent({ kind:"enyo.Control", name: "hourLabel", content : this.hourText ? this.hourText : "hour", classes: "moon-date-picker-label"}, {owner: this});
this.$.minuteWrapper.createComponent({ kind:"enyo.Control", name: "minuteLabel", content : this.minuteText ? this.minuteText : "min", style: "display:block;", classes: "moon-date-picker-label"}, {owner: this});
this.$.meridianWrapper.createComponent({ kind:"enyo.Control", name: "meridianLabel", content : this.meridianText ? this.meridianText : "meridian", style: "display:block;", classes: "moon-date-picker-label"}, {owner: this});
this.pickersAreSetUp = true;
=======
this.inherited(arguments);
>>>>>>>
this.$.hourWrapper.createComponent({ kind:"enyo.Control", name: "hourLabel", content : this.hourText ? this.hourText : "hour", classes: "moon-date-picker-label"}, {owner: this});
this.$.minuteWrapper.createComponent({ kind:"enyo.Control", name: "minuteLabel", content : this.minuteText ? this.minuteText : "min", style: "display:block;", classes: "moon-date-picker-label"}, {owner: this});
this.$.meridianWrapper.createComponent({ kind:"enyo.Control", name: "meridianLabel", content : this.meridianText ? this.meridianText : "meridian", style: "display:block;", classes: "moon-date-picker-label"}, {owner: this});
this.inherited(arguments);
<<<<<<<
},
//* If no item is selected, uses _this.noneText_ as current value.
noneTextChanged: function() {
if(this.value == null) {
this.$.currentValue.setContent(this.getNoneText());
} else {
this.$.currentValue.setContent(this.parseTime());
}
},
//* When _this.open_ changes, shows or hides _this.$.currentValue_.
openChanged: function() {
this.inherited(arguments);
var open = this.$.drawer.get("open");
this.$.currentValue.setShowing(!open);
if (this.pickersAreSetUp) {
//Force the pickers to update their scroll positions (they don't update while the drawer is closed)
if (open) {
this.$.hour.refreshScrollState();
this.$.minute.refreshScrollState();
if (this.$.meridiem) {
this.$.meridiem.refreshScrollState();
}
} else {
// If one of the pickers is animating when the drawer closes, it won't display properly
// when the drawer reopens, unless we stabilize here
this.$.hour.stabilize();
this.$.minute.stabilize();
if (this.$.meridiem) {
this.$.meridiem.stabilize();
}
}
}
},
toggleActive: function() {
if (this.getOpen()) {
this.setActive(false);
enyo.Spotlight.spot(this.$.headerWrapper);
} else {
this.setActive(true);
}
},
closePicker: function(inSender, inEvent) {
//* If select/enter is pressed on any date picker item or the left key is pressed on the first item, close the drawer
if (inEvent.type == "onSpotlightSelect" ||
this.$.client.children[0].id == inEvent.originator.id) {
this.updateTime();
this.expandContract();
this.noneTextChanged();
return true;
}
},
localeChanged: function() {
this.refresh();
},
refresh: function(){
this.destroyClientControls();
this.initDefaults(new ilib.TimeZone({locale: this.locale}));
this.render();
},
hourTextChanged: function (inOldvalue, inNewValue) {
this.$.hourLabel.setContent(inNewValue);
},
minuteTextChanged: function (inOldvalue, inNewValue) {
this.$.minuteLabel.setContent(inNewValue);
},
meridianTextChanged: function (inOldvalue, inNewValue) {
this.$.meridianLabel.setContent(inNewValue);
=======
>>>>>>>
},
hourTextChanged: function (inOldvalue, inNewValue) {
this.$.hourLabel.setContent(inNewValue);
},
minuteTextChanged: function (inOldvalue, inNewValue) {
this.$.minuteLabel.setContent(inNewValue);
},
meridianTextChanged: function (inOldvalue, inNewValue) {
this.$.meridianLabel.setContent(inNewValue); |
<<<<<<<
data_resource_table_title: "Peak Energy Consumption",
data_resource_table_rank: "Rank",
data_resource_table_account: "Account",
data_resource_table_freezingTRX_energy: "Energy from Freezing TRX",
data_resource_table_burningTRX_energy: "Energy from Burning TRX",
data_resource_table_energy_consumed: "Total Energy Consumed",
data_resource_table_percentage: "Percentage",
data_resource_table_percentage_tips: "Energy consumed by the user/Energy consumed by all users",
data_resource_table_bandwidth_title: "Peak Bandwidth Consumption",
data_resource_table_total: "Total",
}
=======
data_title: "Top Statistics",
data_overview: "Overview",
data_account: "Accounts",
data_token: "La cuenta",
data_contract: "Contracts",
data_recourse: "Resources",
data_time1: "1 Hour",
data_time2: "1 Day",
data_time3: "1 Week",
data_account_top: "最佳账户",
data_account_send_Trx: "Top Accounts--Total TRX Sent",
data_account_send_Trx_items: "Top Accounts--Txn Count Sent",
data_account_receive_Trx: "Top Accounts--Total TRX Received",
data_account_receive_Trx_items: "Top Accounts--Txn Count Received",
data_account_freeze: "Top Accounts--TRX Frozen",
data_account_vote: "Top Accounts--Votes",
data_range: "Rank",
data_number: "Amount(TRX)",
data_per: "Percentage",
data_total: "Total",
data_items: "Txn Count",
data_unit_bi: "笔",
data_piao: "Votes",
data_token_top: "最佳通证",
data_token_holders: "Top Tokens--Holders",
data_token_holder: "Holders",
data_token_transcation_account: "Txn Accounts",
data_token_transcation_accounts: "Top Tokens--Txn Accounts",
data_token_transcation_items: "交易笔数",
data_token_transcation_items_total: "Top Tokens--Txn Counts",
data_token_transcation_numbers: "Top Tokens--Txn Amount",
data_token_circle_per: "Changed by",
data_contract_top: "最佳合约",
data_contract_trx_number: "Top Contracts--TRX Balance",
data_contract_accounts: "Top Contracts--Calling Accounts",
data_contract_numbers: "Balance (TRX)",
data_contract_times: "Top Contracts--Number of Calls",
data_real_time: "Real-time",
data_resource_table_title: "Peak Energy Consumption",
data_resource_table_rank: "排序",
data_resource_table_account: "账户",
data_resource_table_freezingTRX_energy: "Energy from Freezing TRX",
data_resource_table_burningTRX_energy: "Energy from Burning TRX"
};
>>>>>>>
data_title: "Top Statistics",
data_overview: "Overview",
data_account: "Accounts",
data_token: "La cuenta",
data_contract: "Contracts",
data_recourse: "Resources",
data_time1: "1 Hour",
data_time2: "1 Day",
data_time3: "1 Week",
data_account_top: "最佳账户",
data_account_send_Trx: "Top Accounts--Total TRX Sent",
data_account_send_Trx_items: "Top Accounts--Txn Count Sent",
data_account_receive_Trx: "Top Accounts--Total TRX Received",
data_account_receive_Trx_items: "Top Accounts--Txn Count Received",
data_account_freeze: "Top Accounts--TRX Frozen",
data_account_vote: "Top Accounts--Votes",
data_range: "Rank",
data_number: "Amount(TRX)",
data_per: "Percentage",
data_total: "Total",
data_items: "Txn Count",
data_unit_bi: "笔",
data_piao: "Votes",
data_token_top: "最佳通证",
data_token_holders: "Top Tokens--Holders",
data_token_holder: "Holders",
data_token_transcation_account: "Txn Accounts",
data_token_transcation_accounts: "Top Tokens--Txn Accounts",
data_token_transcation_items: "交易笔数",
data_token_transcation_items_total: "Top Tokens--Txn Counts",
data_token_transcation_numbers: "Top Tokens--Txn Amount",
data_token_circle_per: "Changed by",
data_contract_top: "最佳合约",
data_contract_trx_number: "Top Contracts--TRX Balance",
data_contract_accounts: "Top Contracts--Calling Accounts",
data_contract_numbers: "Balance (TRX)",
data_contract_times: "Top Contracts--Number of Calls",
data_real_time: "Real-time",
data_resource_table_title: "Peak Energy Consumption",
data_resource_table_rank: "Rank",
data_resource_table_account: "Account",
data_resource_table_freezingTRX_energy: "Energy from Freezing TRX",
data_resource_table_burningTRX_energy: "Energy from Burning TRX",
data_resource_table_energy_consumed: "Total Energy Consumed",
data_resource_table_percentage: "Percentage",
data_resource_table_percentage_tips: "Energy consumed by the user/Energy consumed by all users",
data_resource_table_bandwidth_title: "Peak Bandwidth Consumption",
data_resource_table_total: "Total",
}; |
<<<<<<<
//* @protected
/**
_moon.DataListSpotlightSupport_ a mixin that provides spotlight handling code for use by
_moon.DataList_ and _moon.DataGridList_. Since those each extend from their respective
enyo counterparts, this mixin provides common add-on code needed for proper spotlight handling.
*/
moon.DataListSpotlightSupport = {
published: {
initialFocusIndex: -1
},
handlers: {
onSpotlightUp : "selectPrev",
onSpotlightLeft : "selectPrev",
onSpotlightDown : "selectNext",
onSpotlightRight : "selectNext"
},
focusOnIndex: function(inIndex, inSubChild) {
var c = this.collection,
child,
subChild;
if (c && c.length && this.hasRendered) { // Give focus if list is rendered
inIndex = inIndex < 0 ? 0 : (inIndex >= c.length ? c.length - 1 : inIndex);
child = this.childForIndex(inIndex);
if (!child) {
this.scrollToIndex(inIndex);
=======
(function (enyo, scope) {
/**
* moon.DataListSpotlightSupport_ a mixin that provides spotlight handling code for use by
* {@link moon.DataList} and {@link moon.DataGridList}. Since those each extend from their respective
* enyo counterparts, this mixin provides common add-on code needed for proper spotlight handling.
*
* @mixin moon.DataListSpotlightSupport
* @private
*/
moon.DataListSpotlightSupport = {
/**
* @private
*/
published: {
initialFocusIndex: -1
},
/**
* @private
*/
handlers: {
onSpotlightUp : 'selectPrev',
onSpotlightLeft : 'selectPrev',
onSpotlightDown : 'selectNext',
onSpotlightRight : 'selectNext'
},
/**
* @private
*/
focusOnIndex: function (inIndex, inSubChild) {
var c = this.collection,
child,
subChild;
if (c && c.length && this.hasRendered) { // Give focus if list is rendered
inIndex = inIndex < 0 ? 0 : (inIndex >= c.length ? c.length - 1 : inIndex);
>>>>>>>
(function (enyo, scope) {
/**
* moon.DataListSpotlightSupport_ a mixin that provides spotlight handling code for use by
* {@link moon.DataList} and {@link moon.DataGridList}. Since those each extend from their respective
* enyo counterparts, this mixin provides common add-on code needed for proper spotlight handling.
*
* @mixin moon.DataListSpotlightSupport
* @private
*/
moon.DataListSpotlightSupport = {
/**
* @private
*/
published: {
initialFocusIndex: -1
},
/**
* @private
*/
handlers: {
onSpotlightUp : 'selectPrev',
onSpotlightLeft : 'selectPrev',
onSpotlightDown : 'selectNext',
onSpotlightRight : 'selectNext'
},
/**
* @private
*/
focusOnIndex: function (inIndex, inSubChild) {
var c = this.collection,
child,
subChild;
if (c && c.length && this.hasRendered) { // Give focus if list is rendered
inIndex = inIndex < 0 ? 0 : (inIndex >= c.length ? c.length - 1 : inIndex);
<<<<<<<
subChild = inSubChild ? enyo.Spotlight.getChildren(child)[inSubChild] : child;
enyo.Spotlight.spot(subChild);
} else {
this._indexToFocus = inIndex;
this._subChildToFocus = inSubChild;
}
},
getFocusedIndex: function() {
var focusedChild = this.getFocusedChild();
return focusedChild ? this.getIndexFromChild(focusedChild) : -1;
},
getFocusedChild: function() {
var current = enyo.Spotlight.getCurrent();
return (current && current.isDescendantOf(this.$.active)) ? current : null;
},
_indexToFocus: -1,
_subChildToFocus: null,
didRender: function () {
// Lists are set to spotlight:true by default, which allows them to receive focus before
// children are rendered; once rendred, it becomes spotlight:false, and the code below
// ensures spotlight is transferred inside the list once rendering is complete
this.spotlight = false;
// If there is a queued index to focus (or an initialFocusIndex), focus that item now that
// the list is rendered
var index = (this._indexToFocus > -1) ? this._indexToFocus : this.initialFocusIndex;
if (index > -1) {
this.focusOnIndex(index);
this._indexToFocus = -1;
} else {
// Otherwise, check if the list was focused and if so, transfer focus to the first
// spottable child inside
if (enyo.Spotlight.getCurrent() == this) {
enyo.Spotlight.spot(this);
}
}
},
didScroll: enyo.inherit(function (sup) {
return function () {
// When scrolling in pointer mode, we unspot the last focused child, to prevent it from
// looping as new pages come up
var spot;
if (enyo.Spotlight.getPointerMode() &&
((spot = enyo.Spotlight.getCurrent()) && (spot === this || spot.isDescendantOf(this.$.active)))) {
enyo.Spotlight.unspot();
this._unspotSinceSpot = true;
=======
},
/**
* @private
*/
getFocusedIndex: function () {
var focusedChild = this.getFocusedChild();
return focusedChild ? this.getIndexFromChild(focusedChild) : -1;
},
/**
* @private
*/
getFocusedChild: function () {
var current = enyo.Spotlight.getCurrent();
return (current && current.isDescendantOf(this.$.active)) ? current : null;
},
/**
* @private
*/
_indexToFocus: -1,
/**
* @private
*/
_subChildToFocus: null,
/**
* @private
*/
didRender: function () {
// Lists are set to spotlight:true by default, which allows them to receive focus before
// children are rendered; once rendred, it becomes spotlight:false, and the code below
// ensures spotlight is transferred inside the list once rendering is complete
this.spotlight = false;
// If there is a queued index to focus (or an initialFocusIndex), focus that item now that
// the list is rendered
var index = (this._indexToFocus > -1) ? this._indexToFocus : this.initialFocusIndex;
if (index > -1) {
this.focusOnIndex(index);
this._indexToFocus = -1;
} else {
// Otherwise, check if the list was focused and if so, transfer focus to the first
// spottable child inside
if (enyo.Spotlight.getCurrent() == this) {
enyo.Spotlight.spot(this);
}
>>>>>>>
},
/**
* @private
*/
getFocusedIndex: function () {
var focusedChild = this.getFocusedChild();
return focusedChild ? this.getIndexFromChild(focusedChild) : -1;
},
/**
* @private
*/
getFocusedChild: function () {
var current = enyo.Spotlight.getCurrent();
return (current && current.isDescendantOf(this.$.active)) ? current : null;
},
/**
* @private
*/
_indexToFocus: -1,
/**
* @private
*/
_subChildToFocus: null,
/**
* @private
*/
didRender: function () {
// Lists are set to spotlight:true by default, which allows them to receive focus before
// children are rendered; once rendred, it becomes spotlight:false, and the code below
// ensures spotlight is transferred inside the list once rendering is complete
this.spotlight = false;
// If there is a queued index to focus (or an initialFocusIndex), focus that item now that
// the list is rendered
var index = (this._indexToFocus > -1) ? this._indexToFocus : this.initialFocusIndex;
if (index > -1) {
this.focusOnIndex(index);
this._indexToFocus = -1;
} else {
// Otherwise, check if the list was focused and if so, transfer focus to the first
// spottable child inside
if (enyo.Spotlight.getCurrent() == this) {
enyo.Spotlight.spot(this);
}
<<<<<<<
}
return control;
},
previewDomEvent: function(inEvent) {
// When spotlight is being applied back to the list after being unspotted, check that the child being
// focused is visible and if not, spot the first visible child that is
if ((inEvent.type == "onSpotlightFocus") && this._unspotSinceSpot) {
if (enyo.Spotlight.getPointerMode()) {
this._unspotSinceSpot = false;
} else {
var target = inEvent.originator;
if (target != this) {
// Calculate the target bounds, relative to the scrollBounds
var tb = target.getBounds();
var p = target.isDescendantOf(this.$.page1) ? this.$.page1 : this.$.page2;
var pb = p.getBounds();
// Need to add page offset to target bounds
tb.top += pb.top;
tb.left += pb.left;
var sb = this.$.scroller.getScrollBounds();
// Check if target is inside the current scrollBounds
if ((tb.top < sb.top) ||
(tb.left < sb.left) ||
((tb.top + tb.height) > (sb.top + sb.clientHeight)) ||
((tb.left + tb.width) > (sb.left + sb.clientWidth))) {
// Not in view, so find and spot the first visible child
var vc = this.getFirstVisibleChild(sb);
if (vc) {
=======
return control;
},
/**
* @private
*/
previewDomEvent: function (inEvent) {
// When spotlight is being applied back to the list after being unspotted, check that the child being
// focused is visible and if not, spot the first visible child that is
if ((inEvent.type == 'onSpotlightFocus') && this._unspotSinceSpot) {
if (enyo.Spotlight.getPointerMode()) {
this._unspotSinceSpot = false;
} else {
var target = inEvent.originator;
if (target != this) {
// Calculate the target bounds, relative to the scrollBounds
var tb = target.getBounds();
var p = target.isDescendantOf(this.$.page1) ? this.$.page1 : this.$.page2;
var pb = p.getBounds();
// Need to add page offset to target bounds
tb.top += pb.top;
tb.left += pb.left;
var sb = this.$.scroller.getScrollBounds();
// Check if target is inside the current scrollBounds
if ((tb.top < sb.top) ||
(tb.left < sb.left) ||
((tb.top + tb.height) > (sb.top + sb.clientHeight)) ||
((tb.left + tb.width) > (sb.left + sb.clientWidth))) {
// Not in view, so find and spot the first visible child
var vc = this.getFirstVisibleChild(sb);
if (vc) {
this._unspotSinceSpot = false;
enyo.Spotlight.spot(vc);
}
return true;
} else {
>>>>>>>
return control;
},
/**
* @private
*/
previewDomEvent: function (inEvent) {
// When spotlight is being applied back to the list after being unspotted, check that the child being
// focused is visible and if not, spot the first visible child that is
if ((inEvent.type == 'onSpotlightFocus') && this._unspotSinceSpot) {
if (enyo.Spotlight.getPointerMode()) {
this._unspotSinceSpot = false;
} else {
var target = inEvent.originator;
if (target != this) {
// Calculate the target bounds, relative to the scrollBounds
var tb = target.getBounds();
var p = target.isDescendantOf(this.$.page1) ? this.$.page1 : this.$.page2;
var pb = p.getBounds();
// Need to add page offset to target bounds
tb.top += pb.top;
tb.left += pb.left;
var sb = this.$.scroller.getScrollBounds();
// Check if target is inside the current scrollBounds
if ((tb.top < sb.top) ||
(tb.left < sb.left) ||
((tb.top + tb.height) > (sb.top + sb.clientHeight)) ||
((tb.left + tb.width) > (sb.left + sb.clientWidth))) {
// Not in view, so find and spot the first visible child
var vc = this.getFirstVisibleChild(sb);
if (vc) {
this._unspotSinceSpot = false;
enyo.Spotlight.spot(vc);
}
return true;
} else {
<<<<<<<
}
},
getFirstVisibleChild: function(inScrollBounds) {
// Loop through the pages in top-down order
var pages = (this.$.page1.index < this.$.page2.index) ?
[this.$.page1, this.$.page2] :
[this.$.page2, this.$.page1],
pageIdx,
page,
pb,
i,
c,
cb;
for (pageIdx = 0; pageIdx < pages.length; pageIdx++) {
page = pages[pageIdx];
pb = page.getBounds();
// Loop through children in each page top-down
for (i=0; i<page.children.length; i++) {
c = page.children[i];
cb = c.getBounds();
// Need to add page offset to target bounds
cb.top += pb.top;
cb.left += pb.left;
// Return the first spottable child whose top/left are inside the viewport
if ((cb.top >= inScrollBounds.top) && ((this.rtl ? (inScrollBounds.width - (cb.left + cb.width)) : cb.left) >= inScrollBounds.left)) {
if (enyo.Spotlight.isSpottable(c)) {
return c;
}
c = enyo.Spotlight.getFirstChild(c);
if (c) {
return c;
}
}
}
}
return null;
},
// Retrieve the next/previous spottable child from the generated controls starting from the given index
getNextSpottableChild: function(inDirection, inFocusedIndex) {
var i,
page,
pageIndex,
control,
controlIndex,
focusedIndex = this.getFocusedIndex(),
pages = (inDirection === 1 && this.$.page1.index < this.$.page2.index || inDirection === -1 && this.$.page1.index > this.$.page2.index)
? [this.$.page1, this.$.page2] : [this.$.page2, this.$.page1];
// Explore the controls in the current pages
for (pageIndex = 0; pageIndex < pages.length; pageIndex++) {
page = pages[pageIndex];
if (inDirection === 1) {
=======
},
/**
* @private
*/
getFirstVisibleChild: function (inScrollBounds) {
// Loop through the pages in top-down order
var pages = (this.$.page1.index < this.$.page2.index) ?
[this.$.page1, this.$.page2] :
[this.$.page2, this.$.page1];
for (var p in pages) {
var page = pages[p];
var pb = page.getBounds();
>>>>>>>
},
/**
* @private
*/
getFirstVisibleChild: function (inScrollBounds) {
// Loop through the pages in top-down order
var pages = (this.$.page1.index < this.$.page2.index) ?
[this.$.page1, this.$.page2] :
[this.$.page2, this.$.page1],
pageIdx,
page,
pb,
i,
c,
cb;
for (pageIdx = 0; pageIdx < pages.length; pageIdx++) {
page = pages[pageIdx];
pb = page.getBounds(); |
<<<<<<<
...lang19Q4
=======
// 2019-12-18
"address_vote_reward_pending":"褒賞に投票",
"address_balance":"TRX余額",
"address_get_energe":"エネルギー取得するには",
"address_get_bandwith":"帯域幅を取得するには",
"address_freeze_owner":"自分に固定する",
"address_freeze_other":"他人に固定する",
>>>>>>>
// 2019-12-18
"address_vote_reward_pending":"褒賞に投票",
"address_balance":"TRX余額",
"address_get_energe":"エネルギー取得するには",
"address_get_bandwith":"帯域幅を取得するには",
"address_freeze_owner":"自分に固定する",
"address_freeze_other":"他人に固定する",
...lang19Q4 |
<<<<<<<
import SmartTable from "./common/SmartTable.js"
import {upperFirst} from "lodash";
import {TronLoader} from "./common/loaders";
=======
import xhr from "axios/index";
>>>>>>>
import SmartTable from "./common/SmartTable.js"
import {upperFirst} from "lodash";
import {TronLoader} from "./common/loaders";
import xhr from "axios/index";
<<<<<<<
let {accounts, total} = await Client.getAccounts({
sort: '-balance',
limit: pageSize,
start: (page - 1) * pageSize,
});
this.setState({
=======
// let {accounts, total} = await Client.getAccounts({
// sort: '-balance',
// limit: pageSize,
// start: (page-1) * pageSize,
// });
let accountData = await xhr.get("https://assistapi.tronscan.org/api/account?sort=-balance&limit="+ pageSize + "&start=" + (page - 1) * pageSize);
let accountsTotal = accountData.data.total;
let accounts = accountData.data.data;
this.setState({
>>>>>>>
// let {accounts, total} = await Client.getAccounts({
// sort: '-balance',
// limit: pageSize,
// start: (page-1) * pageSize,
// });
let accountData = await xhr.get("https://assistapi.tronscan.org/api/account?sort=-balance&limit="+ pageSize + "&start=" + (page - 1) * pageSize);
let accountsTotal = accountData.data.total;
let accounts = accountData.data.data;
this.setState({ |
<<<<<<<
var wizardModel = new enyo.Model({
title: "Wizard Title",
wizContainer: new enyo.Collection([
{
id: "01",
subtitle: "Step Title 1",
imgsrc: "../assets/album.PNG",
instruction: "INSTRUCTIONAL TEXT GOES HERE",
detail: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer sit amet ipsum tortor,a \
hendrerit urna. Integer eget faucibus purus. Nunc non arcu turpis, venenatis aliquam neque. In \
pulvinar lectus at orci fringilla eget consectetur arcu vulputate. Nullam sodales dui eu tellus\
interdum vel volutpat velit semper."
},
{
id: "02",
subtitle: "Step Title 2",
imgsrc: "",
instruction: "INSTRUCTIONAL TEXT GOES HERE 2",
detail: "INPUT FIELD DESCRIPTION GOES HERE 2"
},
{
id: "03",
subtitle: "Step Title 3",
imgsrc: "",
instruction: "INSTRUCTIONAL TEXT GOES HERE 3",
detail: "INPUT FIELD DESCRIPTION GOES HERE 3"
},
{
id: "04",
subtitle: "Step Title 4",
imgsrc: "",
instruction: "INSTRUCTIONAL TEXT GOES HERE 4",
detail: "INPUT FIELD DESCRIPTION GOES HERE 4"
},
{
id: "05",
subtitle: "Step Title 5",
imgsrc: "",
instruction: "INSTRUCTIONAL TEXT GOES HERE 5",
detail: "INPUT FIELD DESCRIPTION GOES HERE 5"
},
{
id: "06",
subtitle: "Step Title 6",
imgsrc: "",
instruction: "Confirm your selections before complete",
detail: ""
}
]),
wizResults: new enyo.Collection([
{step: "STEP TITLE 01 : ", result: " -- ", processed: "[FALSE]"},
{step: "STEP TITLE 02 : ", result: " -- ", processed: "[FALSE]"},
{step: "STEP TITLE 03 : ", result: " -- ", processed: "[FALSE]"},
{step: "STEP TITLE 04 : ", result: " -- ", processed: "[FALSE]"},
{step: "STEP TITLE 05 : ", result: " -- ", processed: "[FALSE]"},
{step: "STEP TITLE 06 : ", result: " -- ", processed: "[FALSE]"}
])
}
);
var app = new enyo.Application({
view: {
classes: "enyo-unselectable moon",
components: [
{
kind: "moon.sample.wizard.FullScreenSample",
controller: ".app.controllers.WizardController",
classes: "enyo-fit"
}
]
},
controllers: [
{
name: "WizardController",
kind: "enyo.ModelController",
model: wizardModel
}
]
});
=======
var wizardModel = new enyo.Model({
title: "Wizard Title",
wizContainer: new enyo.Collection([
{
id: "01",
subtitle: "Step Title 1",
imgsrc: "../assets/album.PNG",
instruction: "INSTRUCTIONAL TEXT GOES HERE",
detail: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer sit amet ipsum tortor,a " +
"hendrerit urna. Integer eget faucibus purus. Nunc non arcu turpis, venenatis aliquam neque. In " +
"pulvinar lectus at orci fringilla eget consectetur arcu vulputate. Nullam sodales dui eu tellus " +
"interdum vel volutpat velit semper."
},
{
id: "02",
subtitle: "Step Title 2",
imgsrc: "",
instruction: "INSTRUCTIONAL TEXT GOES HERE 2",
detail: "INPUT FIELD DESCRIPTION GOES HERE 2"
},
{
id: "03",
subtitle: "Step Title 3",
imgsrc: "",
instruction: "INSTRUCTIONAL TEXT GOES HERE 3",
detail: "INPUT FIELD DESCRIPTION GOES HERE 3"
},
{
id: "04",
subtitle: "Step Title 4",
imgsrc: "",
instruction: "INSTRUCTIONAL TEXT GOES HERE 4",
detail: "INPUT FIELD DESCRIPTION GOES HERE 4"
},
{
id: "05",
subtitle: "Step Title 5",
imgsrc: "",
instruction: "INSTRUCTIONAL TEXT GOES HERE 5",
detail: "INPUT FIELD DESCRIPTION GOES HERE 5"
},
{
id: "06",
subtitle: "Step Title 6",
imgsrc: "",
instruction: "Confirm your selections before complete",
detail: ""
}
]),
wizResults: new enyo.Collection([
{step: "STEP TITLE 01 : ", result: " -- ", processed: "[FALSE]"},
{step: "STEP TITLE 02 : ", result: " -- ", processed: "[FALSE]"},
{step: "STEP TITLE 03 : ", result: " -- ", processed: "[FALSE]"},
{step: "STEP TITLE 04 : ", result: " -- ", processed: "[FALSE]"},
{step: "STEP TITLE 05 : ", result: " -- ", processed: "[FALSE]"},
{step: "STEP TITLE 06 : ", result: " -- ", processed: "[FALSE]"}
])
}
);
new enyo.Application({
view: {
classes: "enyo-unselectable moon",
components: [
{kind: "enyo.Spotlight"},
{
kind: "moon.sample.wizard.FullScreenSample",
controller: ".app.controllers.WizardController",
classes: "enyo-fit"
}
]
},
controllers: [
{
name: "WizardController",
kind: "enyo.ModelController",
model: wizardModel
}
]
});
>>>>>>>
var wizardModel = new enyo.Model({
title: "Wizard Title",
wizContainer: new enyo.Collection([
{
id: "01",
subtitle: "Step Title 1",
imgsrc: "../assets/album.PNG",
instruction: "INSTRUCTIONAL TEXT GOES HERE",
detail: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer sit amet ipsum tortor,a " +
"hendrerit urna. Integer eget faucibus purus. Nunc non arcu turpis, venenatis aliquam neque. In " +
"pulvinar lectus at orci fringilla eget consectetur arcu vulputate. Nullam sodales dui eu tellus " +
"interdum vel volutpat velit semper."
},
{
id: "02",
subtitle: "Step Title 2",
imgsrc: "",
instruction: "INSTRUCTIONAL TEXT GOES HERE 2",
detail: "INPUT FIELD DESCRIPTION GOES HERE 2"
},
{
id: "03",
subtitle: "Step Title 3",
imgsrc: "",
instruction: "INSTRUCTIONAL TEXT GOES HERE 3",
detail: "INPUT FIELD DESCRIPTION GOES HERE 3"
},
{
id: "04",
subtitle: "Step Title 4",
imgsrc: "",
instruction: "INSTRUCTIONAL TEXT GOES HERE 4",
detail: "INPUT FIELD DESCRIPTION GOES HERE 4"
},
{
id: "05",
subtitle: "Step Title 5",
imgsrc: "",
instruction: "INSTRUCTIONAL TEXT GOES HERE 5",
detail: "INPUT FIELD DESCRIPTION GOES HERE 5"
},
{
id: "06",
subtitle: "Step Title 6",
imgsrc: "",
instruction: "Confirm your selections before complete",
detail: ""
}
]),
wizResults: new enyo.Collection([
{step: "STEP TITLE 01 : ", result: " -- ", processed: "[FALSE]"},
{step: "STEP TITLE 02 : ", result: " -- ", processed: "[FALSE]"},
{step: "STEP TITLE 03 : ", result: " -- ", processed: "[FALSE]"},
{step: "STEP TITLE 04 : ", result: " -- ", processed: "[FALSE]"},
{step: "STEP TITLE 05 : ", result: " -- ", processed: "[FALSE]"},
{step: "STEP TITLE 06 : ", result: " -- ", processed: "[FALSE]"}
])
}
);
new enyo.Application({
view: {
classes: "enyo-unselectable moon",
components: [
{
kind: "moon.sample.wizard.FullScreenSample",
controller: ".app.controllers.WizardController",
classes: "enyo-fit"
}
]
},
controllers: [
{
name: "WizardController",
kind: "enyo.ModelController",
model: wizardModel
}
]
}); |
<<<<<<<
fullscreenChanged: function(inSender, inEvent) {
enyo.Spotlight.unspot();
=======
fullscreenChanged: function(inSender, inEvent) {
this.addRemoveClass("inline", !this.isFullscreen());
>>>>>>>
fullscreenChanged: function(inSender, inEvent) {
enyo.Spotlight.unspot();
this.addRemoveClass("inline", !this.isFullscreen()); |
<<<<<<<
},
preTransitionComplete: function() {
this.isBreadcrumb = true;
this.doPreTransitionComplete();
},
growPanel: function() {
var animation = new StyleAnimation({
duration: 800,
timingFunction: "cubic-bezier(.42, 0, .16, 1.1)",
onComplete: enyo.bind(this, function() {
this.postTransitionComplete();
}),
keyframes: {
0: [{
control: this,
properties: {
"width" : "current",
"min-width" : "current",
"max-width" : "current"
}
}],
25: [{
control: this,
properties: {
"width" : this.width+"px",
"min-width" : this.width+"px",
"max-width" : this.width+"px"
}
},
{
control: this.$.header,
properties: {
"height" : "current"
}
},
{
control: this.$.client,
properties: {
"height" : "current",
"opacity" : "current"
}
}],
50: [{
control: this.$.header,
properties: {
"height" : "current",
"width" : "auto"
}
}],
75: [{
control: this.$.client,
properties: {
"opacity" : "1"
}
}],
100: [
{
control: this.$.client,
properties: {
"height" : "auto"
}
}]
}
}).play();
},
postTransitionComplete: function() {
this.isBreadcrumb = false;
this.doPostTransitionComplete();
},
setHeader : function(pObj) {
this.$.header.setTitleAbove(pObj.index);
this.$.header.setTitle(pObj.title);
},
preTransition: function(inFromIndex, inToIndex) {
var myIndex = this.container.getPanels().indexOf(this);
if (!this.isBreadcrumb && this.container.layout.isBreadcrumb(myIndex, inToIndex)) {
this.shrinkPanel();
return true;
}
return false;
},
postTransition: function(inFromIndex, inToIndex) {
var myIndex = this.container.getPanels().indexOf(this);
if (this.isBreadcrumb && !this.container.layout.isBreadcrumb(myIndex, inToIndex)) {
this.growPanel();
return true;
}
return false;
},
=======
============================================================ components
components : [
{
name : "header",
content : "header",
style : "width:400px;height:150px;top:25px;left:25px;position:absolute;overflow:hidden;",
components : [
{ name : "index", content : "", style : "font-size:20px;text-decoration:underline;"},
{ name : "title", content : "", style : "font-size:60px;font-weight:bold;"}
]
},
{
name : "line",
tag : "hr",
style : "width:700px;top:230px;left:25px;position:absolute;margin:0px;border:0;height:5px;background-color:gray;"
},
{
name : "client",
content : "client",
style : "top:250px;left:25px;position:absolute;width:1000px; height:800px; overflow:hidden;",
ontap : "tapHandler"
},
{
name : "smallTitle", style : "height:30px;position:absolute;left:25px;top:50px;overflow:hidden;",
components : [
{ name : "smallText", content : "", style : "position:relative;font-size:25px;top:25px;font-weight:bold;"}
]
}
],
setHeader : function(pObj){
this.$.index.setContent(pObj.index);
this.$.title.setContent(pObj.title);
this.$.smallText.setContent(pObj.title);
},
// addClient : function(pArray){
// this.destoryClient();
// //this.$.layer.createComponents(pArray,{owner:this});
// this.$.layer.createComponents(pArray,{owner:this.owner});
// this.$.layer.render();
// },
// destoryClient : function(){
// var tArray = this.$.layer.children;
// for(var i=0;i<tArray.length;i++){
// if(tArray[i].destory) tArray[i].destory();
// }
// this.$.layer.children = [];
// },
/**
If this object has internal transition, set transitionReady as false to notify that
it is not prepared to be transited by arranger.
*/
startPreTransition: function() {
this.setTransitionReady(false);
this.firePreTransitionStart();
},
firePreTransitionStart: function() {
this.doPreTransitionStart();
},
finishPreTransition: function() {
if (this.transitionReady != null) {
this.setTransitionReady(true);
this.firePreTransitionFinish();
}
},
firePreTransitionFinish: function() {
this.doPreTransitionFinish();
},
transition: function() {
this.log();
if (this.transitionReady) {
return false;
}
/**
If you have some transition,
You should remove following comment out before doing transition.
*/
this.startPreTransition();
this.ani();
//do some work here.
return true;
}
=======
}
>>>>>>>
},
preTransitionComplete: function() {
this.isBreadcrumb = true;
this.doPreTransitionComplete();
},
growPanel: function() {
var animation = new StyleAnimation({
duration: 800,
timingFunction: "cubic-bezier(.42, 0, .16, 1.1)",
onComplete: enyo.bind(this, function() {
this.postTransitionComplete();
}),
keyframes: {
0: [{
control: this,
properties: {
"width" : "current",
"min-width" : "current",
"max-width" : "current"
}
}],
25: [{
control: this,
properties: {
"width" : this.width+"px",
"min-width" : this.width+"px",
"max-width" : this.width+"px"
}
},
{
control: this.$.header,
properties: {
"height" : "current"
}
},
{
control: this.$.client,
properties: {
"height" : "current",
"opacity" : "current"
}
}],
50: [{
control: this.$.header,
properties: {
"height" : "current",
"width" : "auto"
}
}],
75: [{
control: this.$.client,
properties: {
"opacity" : "1"
}
}],
100: [
{
control: this.$.client,
properties: {
"height" : "auto"
}
}]
}
}).play();
},
postTransitionComplete: function() {
this.isBreadcrumb = false;
this.doPostTransitionComplete();
},
setHeader : function(pObj) {
this.$.header.setTitleAbove(pObj.index);
this.$.header.setTitle(pObj.title);
},
preTransition: function(inFromIndex, inToIndex) {
var myIndex = this.container.getPanels().indexOf(this);
if (!this.isBreadcrumb && this.container.layout.isBreadcrumb(myIndex, inToIndex)) {
this.shrinkPanel();
return true;
}
return false;
},
postTransition: function(inFromIndex, inToIndex) {
var myIndex = this.container.getPanels().indexOf(this);
if (this.isBreadcrumb && !this.container.layout.isBreadcrumb(myIndex, inToIndex)) {
this.growPanel();
return true;
}
return false;
} |
<<<<<<<
{kind: "moon.Header", name:"inputHeaderDismiss", inputMode: true, dismissOnEnter: true, content: "Input-style Header", placeholder:"Type Here", titleAbove: "03", titleBelow: "InputHeader blurs-focus when pressing Enter", subTitleBelow:"", onchange:"handleChange"},
=======
{classes: "moon-1v"},
>>>>>>>
{kind: "moon.Header", name:"inputHeaderDismiss", inputMode: true, dismissOnEnter: true, content: "Input-style Header", placeholder:"Dismiss on Enter", titleAbove: "03", titleBelow: "InputHeader blurs-focus when pressing Enter", subTitleBelow:"", onchange:"handleChange"},
{classes: "moon-1v"},
<<<<<<<
this.$.switchHeader.setInputMode(!this.$.switchHeader.getInputMode());
},
handleChange: function(inSender, inEvent) {
this.$.inputHeaderDismiss.set("subTitleBelow", "Changed: " + inSender.getValue());
=======
var header = this.$[inSender.header];
header.setInputMode(!header.getInputMode());
>>>>>>>
var header = this.$[inSender.header];
header.setInputMode(!header.getInputMode());
},
handleChange: function(inSender, inEvent) {
this.$.inputHeaderDismiss.set("subTitleBelow", "Changed: " + inSender.getValue()); |
<<<<<<<
{kind: "moon.ExpandableInput", oninput:"inputChanging", onChange:"inputChanged", content: "Input", noneText: "No Input"},
{kind: "moon.ExpandableInput", oninput:"inputChanging", onChange:"inputChanged", content: "Input with Placeholder", noneText: "No Input", placeholder: "Placeholder"},
{kind: "moon.ExpandableInput", oninput:"inputChanging", onChange:"inputChanged", content: "Input with Value", noneText: "No Input", placeholder: "Placeholder", value: "Text"},
{kind: "moon.ExpandableInput", oninput:"inputChanging", onChange:"inputChanged", content: "Disabled Input", noneText: "No Input", disabled:true, value: "I am disabled."},
{kind: "moon.ExpandableInput", oninput:"inputChanging", onChange:"inputChanged", content: "Input with loooooooooooooooong text truncation", noneText: "No Input with loooooooooooooooooong text truncation"}
=======
{classes:"moon-5h", components: [
{kind: "moon.ExpandableInput", onChange:"inputChanged", content: "Input", noneText: "No Input"},
{kind: "moon.ExpandableInput", onChange:"inputChanged", content: "Input with Placeholder", noneText: "No Input", placeholder: "Placeholder"},
{kind: "moon.ExpandableInput", onChange:"inputChanged", content: "Input with Value", noneText: "No Input", placeholder: "Placeholder", value: "Text"},
{kind: "moon.ExpandableInput", onChange:"inputChanged", content: "Disabled Input", noneText: "No Input", disabled:true, value: "I am disabled."},
{kind: "moon.ExpandableInput", onChange:"inputChanged", content: "Input with loooooooooooooooong text truncation", noneText: "No Input with loooooooooooooooooong text truncation"}
]}
>>>>>>>
{classes:"moon-5h", components: [
{kind: "moon.ExpandableInput", oninput:"inputChanging", onChange:"inputChanged", content: "Input", noneText: "No Input"},
{kind: "moon.ExpandableInput", oninput:"inputChanging", onChange:"inputChanged", content: "Input with Placeholder", noneText: "No Input", placeholder: "Placeholder"},
{kind: "moon.ExpandableInput", oninput:"inputChanging", onChange:"inputChanged", content: "Input with Value", noneText: "No Input", placeholder: "Placeholder", value: "Text"},
{kind: "moon.ExpandableInput", oninput:"inputChanging", onChange:"inputChanged", content: "Disabled Input", noneText: "No Input", disabled:true, value: "I am disabled."},
{kind: "moon.ExpandableInput", oninput:"inputChanging", onChange:"inputChanged", content: "Input with loooooooooooooooong text truncation", noneText: "No Input with loooooooooooooooooong text truncation"}
]} |
<<<<<<<
/**
* Selection Model Ignore
*
* For clickable elements that don't directly interact with `selectionModel`.
*
* Useful for when you want to manually change the selection, or for things like
* "delete" buttons that belong under `ngRepeat` but shouldn't select an item
* when clicked.
*
* @package selectionModel
* @copyright 2014 Justin Russell, released under the MIT license
*/
angular.module('selectionModel').directive('selectionModelIgnore', [
function() {
'use strict';
return {
restrict: 'A',
link: function(scope, element, attrs) {
element.on('click', function(event) {
event.selectionModelIgnore = true;
/**
* If jQuery is on the page `event` will actually be a jQuery Event
* and other handlers will only get to see a subset of the event
* properties that supported by all browsers. Our custom attribute
* will be dropped. We need to instead decorate the original event
* object.
*
* @see https://github.com/jtrussell/angular-selection-model/issues/27
*/
if(event.originalEvent) {
event.originalEvent.selectionModelIgnore = true;
}
});
}
};
}
]);
/**
* Selection Model - a selection aware companion for ngRepeat
*
* @package selectionModel
* @copyright 2014 Justin Russell, released under the MIT license
*/
=======
/**
* Selection Model Ignore
*
* For clickable elements that don't directly interact with `selectionModel`.
*
* Useful for when you want to manually change the selection, or for things like
* "delete" buttons that belong under `ngRepeat` but shouldn't select an item
* when clicked.
*
* @package selectionModel
* @copyright 2014 Justin Russell, released under the MIT license
*/
angular.module('selectionModel').directive('selectionModelIgnore', [
function() {
'use strict';
return {
restrict: 'A',
link: function(scope, element, attrs) {
element.on('click', function(event) {
event.selectionModelIgnore = true;
});
}
};
}
]);
/**
* Selection Model - a selection aware companion for ngRepeat
*
* @package selectionModel
* @copyright 2014 Justin Russell, released under the MIT license
*/
>>>>>>>
/**
* Selection Model Ignore
*
* For clickable elements that don't directly interact with `selectionModel`.
*
* Useful for when you want to manually change the selection, or for things like
* "delete" buttons that belong under `ngRepeat` but shouldn't select an item
* when clicked.
*
* @package selectionModel
* @copyright 2014 Justin Russell, released under the MIT license
*/
angular.module('selectionModel').directive('selectionModelIgnore', [
function() {
'use strict';
return {
restrict: 'A',
link: function(scope, element, attrs) {
element.on('click', function(event) {
event.selectionModelIgnore = true;
/**
* If jQuery is on the page `event` will actually be a jQuery Event
* and other handlers will only get to see a subset of the event
* properties that supported by all browsers. Our custom attribute
* will be dropped. We need to instead decorate the original event
* object.
*
* @see https://github.com/jtrussell/angular-selection-model/issues/27
*/
if(event.originalEvent) {
event.originalEvent.selectionModelIgnore = true;
}
});
}
};
}
]);
/**
* Selection Model - a selection aware companion for ngRepeat
*
* @package selectionModel
* @copyright 2014 Justin Russell, released under the MIT license
*/
<<<<<<<
/**
* Set by the `selectionModelIgnore` directive
*
* Use `selectionModelIgnore` to cause `selectionModel` to selectively
* ignore clicks on elements. This is useful if you want to manually
* change a selection when certain things are clicked.
*/
if(event.selectionModelIgnore || (event.originalEvent && event.originalEvent.selectionModelIgnore)) {
return;
}
// Never handle a single click twice.
if(event.selectionModelClickHandled) {
return;
}
event.selectionModelClickHandled = true;
=======
/**
* Set by the `selectionModelIgnore` directive
*
* Use `selectionModelIgnore` to cause `selectionModel` to selectively
* ignore clicks on elements. This is useful if you want to manually
* change a selection when certain things are clicked.
*/
if(event.selectionModelIgnore) {
return;
}
>>>>>>>
/**
* Set by the `selectionModelIgnore` directive
*
* Use `selectionModelIgnore` to cause `selectionModel` to selectively
* ignore clicks on elements. This is useful if you want to manually
* change a selection when certain things are clicked.
*/
if(event.selectionModelIgnore || (event.originalEvent && event.originalEvent.selectionModelIgnore)) {
return;
}
// Never handle a single click twice.
if(event.selectionModelClickHandled) {
return;
}
event.selectionModelClickHandled = true;
<<<<<<<
=======
/**
* Guard against label + checkbox clicks
*
* Clicking a label will cause a click event to also be fired on the
* associated input element. If that input is nearby (i.e. under the
* selection model element) we'll suppress the click on the label to
* avoid duplicate click events.
*/
if('LABEL' === target.tagName) {
var labelFor = angular.element(target).attr('for');
if(labelFor) {
var childInputs = element[0].getElementsByTagName('INPUT'), ix;
for(ix = childInputs.length; ix--;) {
if(childInputs[ix].id === labelFor) {
return;
}
}
} else if(target.getElementsByTagName('INPUT').length) {
// Label has a nested input element, we'll handle the click on
// that element
return;
}
}
if(isCheckboxClick) {
event.stopPropagation();
}
>>>>>>>
/**
* Guard against label + checkbox clicks
*
* Clicking a label will cause a click event to also be fired on the
* associated input element. If that input is nearby (i.e. under the
* selection model element) we'll suppress the click on the label to
* avoid duplicate click events.
*/
if('LABEL' === target.tagName) {
var labelFor = angular.element(target).attr('for');
if(labelFor) {
var childInputs = element[0].getElementsByTagName('INPUT'), ix;
for(ix = childInputs.length; ix--;) {
if(childInputs[ix].id === labelFor) {
return;
}
}
} else if(target.getElementsByTagName('INPUT').length) {
// Label has a nested input element, we'll handle the click on
// that element
return;
}
}
if(isCheckboxClick) {
event.stopPropagation();
} |
<<<<<<<
//Modes;
Medium.inlineMode = 'inline';
Medium.partialMode = 'partial';
Medium.richMode = 'rich';
Medium.inlineRichMode = 'inlineRich';
=======
//Modes;
Medium.inlineMode = 'inline';
Medium.partialMode = 'partial';
Medium.richMode = 'rich';
Medium.Messages = {
pastHere: 'Paste Here'
};
>>>>>>>
//Modes;
Medium.inlineMode = 'inline';
Medium.partialMode = 'partial';
Medium.richMode = 'rich';
Medium.inlineRichMode = 'inlineRich';
Medium.Messages = {
pastHere: 'Paste Here'
}; |
<<<<<<<
function deleteTableData(deleteData, callback) {
var selectedTableElement = $("#table-list .list-group-item.selected");
var filteredUpdatedData = deleteData.map(function(columnData){
return {
title: columnData.title,
isPrimary: columnData.isPrimary,
value: columnData.value,
dataType: columnData.dataType
}
});
console.log(filteredUpdatedData);
//build request parameters
var requestParameters = {};
requestParameters.dbName = selectedTableElement.attr('data-db-name');
requestParameters.tableName = selectedTableElement.attr('data-table-name');;
requestParameters.deleteData = encodeURIComponent(JSON.stringify(filteredUpdatedData));
//execute request
$.ajax({
url: "deleteTableData",
type: 'GET',
data: requestParameters,
success: function(response) {
response = JSON.parse(response);
if(response.isSuccessful){
console.log("Data deleted successfully");
callback(true);
} else {
console.log("Data delete failed");
callback(false);
}
}
})
}
function showSuccessInfo(){
$("#success-info").show();
$("#error-info").hide();
}
function showErrorInfo(){
$("#success-info").hide();
$("#error-info").show();
=======
function showSuccessInfo(message){
var snackbar = document.getElementById("snackbar")
snackbar.className = "show";
snackbar.style.backgroundColor = "#5cb85c";
snackbar.innerHTML = message;
setTimeout(function(){ snackbar.className = snackbar.className.replace("show", ""); }, 2000);
>>>>>>>
function deleteTableData(deleteData, callback) {
var selectedTableElement = $("#table-list .list-group-item.selected");
var filteredUpdatedData = deleteData.map(function(columnData){
return {
title: columnData.title,
isPrimary: columnData.isPrimary,
value: columnData.value,
dataType: columnData.dataType
}
});
console.log(filteredUpdatedData);
//build request parameters
var requestParameters = {};
requestParameters.dbName = selectedTableElement.attr('data-db-name');
requestParameters.tableName = selectedTableElement.attr('data-table-name');;
requestParameters.deleteData = encodeURIComponent(JSON.stringify(filteredUpdatedData));
//execute request
$.ajax({
url: "deleteTableData",
type: 'GET',
data: requestParameters,
success: function(response) {
response = JSON.parse(response);
if(response.isSuccessful){
console.log("Data deleted successfully");
callback(true);
} else {
console.log("Data delete failed");
callback(false);
}
}
})
}
function showSuccessInfo(message){
var snackbar = document.getElementById("snackbar")
snackbar.className = "show";
snackbar.style.backgroundColor = "#5cb85c";
snackbar.innerHTML = message;
setTimeout(function(){ snackbar.className = snackbar.className.replace("show", ""); }, 2000); |
<<<<<<<
const winston = require("./logger");
const noble = require("noble");
=======
const winston = require("winston");
>>>>>>>
const winston = require("./logger");
<<<<<<<
this.nListen.on("data", (data, isNotification) => {
winston.verbose("Nordic notification: " + data.toString("hex"));
=======
this.nListen.on("data", (data) => {
winston.log("verbose", "Nordic notification: " + data.toString("hex"));
>>>>>>>
this.nListen.on("data", (data) => {
winston.verbose("Nordic notification: " + data.toString("hex"));
<<<<<<<
this.gpListen.on("data", (data, isNotification) => {
winston.verbose("GP notification: " + data.toString("hex"));
=======
this.gpListen.on("data", (data) => {
winston.log("verbose", "GP notification: " + data.toString("hex"));
>>>>>>>
this.gpListen.on("data", (data) => {
winston.verbose("GP notification: " + data.toString("hex"));
<<<<<<<
this.rssiListen.on("data", (data, isNotification) => {
winston.verbose("RSSI notification: " + data.toString("hex"));
=======
this.rssiListen.on("data", (data) => {
winston.log("verbose", "RSSI notification: " + data.toString("hex"));
>>>>>>>
this.rssiListen.on("data", (data) => {
winston.verbose("RSSI notification: " + data.toString("hex"));
<<<<<<<
winston.info("GATT data structure of furby with UUID " + furby.uuid);
furby.discoverServices(null, function (error, services) {
winston.info("Furby exposes the following services: ");
=======
winston.log("info", "GATT data structure of furby with UUID " + furby.uuid);
furby.discoverServices(null, function(error, services) {
winston.log("info", "Furby exposes the following services: ");
>>>>>>>
winston.info("GATT data structure of furby with UUID " + furby.uuid);
furby.discoverServices(null, function (error, services) {
winston.info("Furby exposes the following services: ");
<<<<<<<
ser.discoverCharacteristics(null, function (error, characteristics) {
winston.info(" " + idx + ") uuid: " + ser.uuid + ", with characteristics: ");
=======
ser.discoverCharacteristics(null, function(error, characteristics) {
winston.log("info", " " + idx + ") uuid: " + ser.uuid + ", with characteristics: ");
>>>>>>>
ser.discoverCharacteristics(null, function (error, characteristics) {
winston.info(" " + idx + ") uuid: " + ser.uuid + ", with characteristics: ");
<<<<<<<
winston.info(" > uuid: " + characteristics[i]);
=======
winston.log("info", " > uuid: " + characteristics[i]);
>>>>>>>
winston.info(" > uuid: " + characteristics[i]);
<<<<<<<
winston.info("Disconnected, exiting")
=======
winston.log("info", "Disconnected, exiting");
>>>>>>>
winston.info("Disconnected, exiting") |
<<<<<<<
run: function (fluff, callback, callback) {
=======
run : function(fluff, callback) {
>>>>>>>
run: function (fluff, callback) {
<<<<<<<
readable: "Debug Screen",
description: "Cycle through LCD eye debug menus"
}
=======
readable : "Debug Screen",
description : "Cycle through LCD eye debug menus"
};
>>>>>>>
readable: "Debug Screen",
description: "Cycle through LCD eye debug menus"
}
<<<<<<<
run: function (fluff, params, callback) {
=======
run : function(fluff, params) {
>>>>>>>
run: function (fluff, params) {
<<<<<<<
run: function (fluff, params, callback) {
dlcsize = fs.statSync(params.dlcfile)["size"]
=======
run : function(fluff, params, callback) {
const dlcsize = fs.statSync(params.dlcfile)["size"];
>>>>>>>
run : function (fluff, params, callback) {
const dlcsize = fs.statSync(params.dlcfile)["size"];
<<<<<<<
let flashint = setInterval(function () {
piece = dlc.slice(offset, offset + 20)
=======
let flashint = setInterval(function() {
const piece = dlc.slice(offset, offset + 20);
>>>>>>>
let flashint = setInterval(function () {
const piece = dlc.slice(offset, offset + 20);
<<<<<<<
readable: "Activate DLC",
description: "Activate loaded DLC - use after 'Load DLC'"
}
=======
readable : "Activate DLC",
description : "Activate loaded DLC - use after 'Load DLC'"
};
>>>>>>>
readable: "Activate DLC",
description: "Activate loaded DLC - use after 'Load DLC'"
}
<<<<<<<
for (let c in commands) {
list[c] = {
readable: commands[c].readable,
description: commands[c].description,
params: commands[c].params,
buttons: commands[c].buttons
=======
for (let command in commands) {
list[command] = {
readable : commands[command].readable,
description : commands[command].description,
params : commands[command].params,
buttons : commands[command].buttons
>>>>>>>
for (let c in commands) {
list[c] = {
readable: commands[c].readable,
description: commands[c].description,
params: commands[c].params,
buttons: commands[c].buttons |
<<<<<<<
const certificate = new Certificate(EthereumMainInvalidMerkleRoot);
const result = await certificate.verify(({step, action, status, errorMessage}) => {
=======
const certificate = new Certificate(FIXTURES.EthereumMainInvalidMerkleRoot);
const result = await certificate.verify((step, text, status, errorMessage) => {
>>>>>>>
const certificate = new Certificate(FIXTURES.EthereumMainInvalidMerkleRoot);
const result = await certificate.verify(({step, action, status, errorMessage}) => {
<<<<<<<
const certificate = new Certificate(EthereumMainRevoked);
const result = await certificate.verify(({step, action, status, errorMessage}) => {
=======
const certificate = new Certificate(FIXTURES.EthereumMainRevoked);
const result = await certificate.verify((step, text, status, errorMessage) => {
>>>>>>>
const certificate = new Certificate(FIXTURES.EthereumMainRevoked);
const result = await certificate.verify(({step, action, status, errorMessage}) => {
<<<<<<<
const certificate = new Certificate(EthereumTampered);
const result = await certificate.verify(({step, action, status, errorMessage}) => {
=======
const certificate = new Certificate(FIXTURES.EthereumTampered);
const result = await certificate.verify((step, text, status, errorMessage) => {
>>>>>>>
const certificate = new Certificate(FIXTURES.EthereumTampered);
const result = await certificate.verify(({step, action, status, errorMessage}) => {
<<<<<<<
const certificate = new Certificate(MainnetInvalidMerkleReceipt);
const result = await certificate.verify(({step, action, status, errorMessage}) => {
=======
const certificate = new Certificate(FIXTURES.MainnetInvalidMerkleReceipt);
const result = await certificate.verify((step, text, status, errorMessage) => {
>>>>>>>
const certificate = new Certificate(FIXTURES.MainnetInvalidMerkleReceipt);
const result = await certificate.verify(({step, action, status, errorMessage}) => {
<<<<<<<
const certificate = new Certificate(MainnetMerkleRootUmmatch);
const result = await certificate.verify(({step, action, status, errorMessage}) => {
=======
const certificate = new Certificate(FIXTURES.MainnetMerkleRootUmmatch);
const result = await certificate.verify((step, text, status, errorMessage) => {
>>>>>>>
const certificate = new Certificate(FIXTURES.MainnetMerkleRootUmmatch);
const result = await certificate.verify(({step, action, status, errorMessage}) => {
<<<<<<<
const certificate = new Certificate(MainnetV2Revoked);
const result = await certificate.verify(({step, action, status, errorMessage}) => {
=======
const certificate = new Certificate(FIXTURES.MainnetV2Revoked);
const result = await certificate.verify((step, text, status, errorMessage) => {
>>>>>>>
const certificate = new Certificate(FIXTURES.MainnetV2Revoked);
const result = await certificate.verify(({step, action, status, errorMessage}) => {
<<<<<<<
const certificate = new Certificate(Testnet404IssuerUrl);
const result = await certificate.verify(({step, action, status, errorMessage}) => {
=======
const certificate = new Certificate(FIXTURES.Testnet404IssuerUrl);
const result = await certificate.verify((step, text, status, errorMessage) => {
>>>>>>>
const certificate = new Certificate(FIXTURES.Testnet404IssuerUrl);
const result = await certificate.verify(({step, action, status, errorMessage}) => {
<<<<<<<
const certificate = new Certificate(TestnetRevokedV2);
const result = await certificate.verify(({step, action, status, errorMessage}) => {
=======
const certificate = new Certificate(FIXTURES.TestnetRevokedV2);
const result = await certificate.verify((step, text, status, errorMessage) => {
>>>>>>>
const certificate = new Certificate(FIXTURES.TestnetRevokedV2);
const result = await certificate.verify(({step, action, status, errorMessage}) => {
<<<<<<<
const certificate = new Certificate(TestnetTamperedHashes);
const result = await certificate.verify(({step, action, status, errorMessage}) => {
=======
const certificate = new Certificate(FIXTURES.TestnetTamperedHashes);
const result = await certificate.verify((step, text, status, errorMessage) => {
>>>>>>>
const certificate = new Certificate(FIXTURES.TestnetTamperedHashes);
const result = await certificate.verify(({step, action, status, errorMessage}) => { |
<<<<<<<
import documentToVerifyAssertion from './assertions/documentToVerify-v1';
import v12MapAssertion from '../domain/certificates/useCases/assertions/v12MapAssertion';
=======
>>>>>>>
import v12MapAssertion from '../domain/certificates/useCases/assertions/v12MapAssertion'; |
<<<<<<<
var domain = {
addresses,
certificates,
chains
};
=======
>>>>>>>
<<<<<<<
* _initVerifier
*
* @private
*/
_initVerifier () {
let document = this.certificateJson.document;
if (!document) {
const certificateCopy = Object.assign({}, this.certificateJson);
delete certificateCopy['signature'];
document = certificateCopy;
}
this.documentToVerify = Object.assign({}, document);
// Final verification result
// Init status as success, we will update the final status at the end
this._stepsStatuses = [];
}
/**
* _setProperties
*
* @param certificateImage
* @param chain
* @param description
* @param expires
* @param id
* @param issuer
* @param publicKey
* @param receipt
* @param recipientFullName
* @param revocationKey
* @param sealImage
* @param signature
* @param signatureImage
* @param subtitle
* @param title
* @param version
* @private
*/
_setProperties ({certificateImage, chain, description, expires, id, issuer, name, publicKey, receipt, recipientFullName, revocationKey, sealImage, signature, signatureImage, subtitle, version}) {
this.certificateImage = certificateImage;
this.chain = chain;
this.description = description;
this.expires = expires;
this.id = id;
this.issuer = issuer;
this.publicKey = publicKey;
this.receipt = receipt;
this.recipientFullName = recipientFullName;
this.revocationKey = revocationKey;
this.sealImage = sealImage;
this.signature = signature;
this.signatureImage = signatureImage;
this.subtitle = subtitle;
this.name = name;
this.version = version;
// Transaction ID, link & raw link
this._setTransactionDetails();
// Get the full verification step-by-step map
this.verificationSteps = domain.certificates.getVerificationMap(chain, version);
}
/**
* _setTransactionDetails
*
* @private
*/
_setTransactionDetails () {
this.transactionId = domain.certificates.getTransactionId(this.receipt);
this.rawTransactionLink = domain.certificates.getTransactionLink(this.transactionId, this.chain, true);
this.transactionLink = domain.certificates.getTransactionLink(this.transactionId, this.chain);
}
/**
* _updateStatusCallback
*
* calls the origin callback to update on a step status
*
* @param code
* @param label
* @param status
* @param errorMessage
* @private
*/
_updateStatusCallback (code, label, status, errorMessage = '') {
if (code != null) {
let update = {code, label, status};
if (errorMessage) {
update.errorMessage = errorMessage;
}
this._stepCallback(update);
}
}
/**
* _succeed
*/
_succeed () {
let status;
if (domain.chains.isTestChain(this.chain)) {
log$4(
'This mock Blockcert passed all checks. Mocknet mode is only used for issuers to test their workflow locally. This Blockcert was not recorded on a blockchain, and it should not be considered a verified Blockcert.'
);
status = MOCK_SUCCESS;
} else {
log$4('success');
status = SUCCESS;
}
return {status};
}
/**
* _failed
*
* @param stepCode
* @param errorMessage
* @returns {{code: string, status: string, errorMessage: string}}
* @private
*/
_failed ({step, errorMessage}) {
log$4(`failure:${errorMessage}`);
return {code: step, status: FAILURE, errorMessage};
}
/**
* _isFailing
*
* whether or not the current verification is failing
*
* @returns {boolean}
* @private
*/
_isFailing () {
return this._stepsStatuses.some(step => step.status === FAILURE);
}
/**
=======
>>>>>>> |
<<<<<<<
import documentToVerifyAssertion from './assertions/documentToVerify-v2';
import v20MapAssertion from '../domain/certificates/useCases/assertions/v20MapAssertion';
=======
>>>>>>>
import v20MapAssertion from '../domain/certificates/useCases/assertions/v20MapAssertion'; |
<<<<<<<
import { CERTIFICATE_VERSIONS, SUB_STEPS, VERIFICATION_STATUSES } from './constants';
import { VerifierError } from './models';
import {
getIssuerKeys,
getIssuerProfile,
getRevokedAssertions,
parseIssuerKeys,
parseRevocationKey
} from './verifierModels';
import * as checks from './checks';
import * as blockchainConnectors from './blockchainConnectors';
import debug from 'debug';
import isTestChain from './domain/chains/useCases/isTestChain';
=======
>>>>>>>
<<<<<<<
*/
async verify (stepCallback = () => {}) {
this._stepCallback = stepCallback;
if (this.version === CERTIFICATE_VERSIONS.V1_1) {
throw new VerifierError(
'',
'Verification of 1.1 certificates is not supported by this component. See the python cert-verifier for legacy verification'
);
}
if (this.version === CERTIFICATE_VERSIONS.V1_2) {
await this._verifyV12();
} else if (isTestChain(this.chain)) {
await this._verifyV2Mock();
} else {
await this._verifyV2();
}
// Send final callback update for global verification status
const erroredStep = this._stepsStatuses.find(step => step.status === VERIFICATION_STATUSES.FAILURE);
if (erroredStep) {
return this._failed({
status: VERIFICATION_STATUSES.FINAL,
errorMessage: erroredStep.message
});
} else {
return this._succeed();
}
}
/**
* _initVerifier
=======
>>>>>>> |
<<<<<<<
textGeometry: {
isComponent: true,
},
=======
tubeGeometry: {
isComponent: true,
},
dodecahedronGeometry: {
isComponent: true,
},
>>>>>>>
tubeGeometry: {
isComponent: true,
},
dodecahedronGeometry: {
isComponent: true,
},
textGeometry: {
isComponent: true,
},
<<<<<<<
'TubeGeometry',
=======
'TextGeometry', // see example, can even use raw text strings for this one? would be cool!
>>>>>>> |
<<<<<<<
this.fixturesDirectory = (fixturesDirectory ? fixturesDirectory : '');
=======
this.queryParameters = [];
>>>>>>>
this.fixturesDirectory = (fixturesDirectory ? fixturesDirectory : '');
this.queryParameters = [];
<<<<<<<
headers: this.headers,
followRedirect: false
=======
headers: this.headers,
qs: this.queryParameters
>>>>>>>
headers: this.headers,
followRedirect: false,
qs: this.queryParameters
<<<<<<<
method: 'POST',
followRedirect: false
=======
method: 'POST',
qs: this.queryParameters
>>>>>>>
method: 'POST',
followRedirect: false,
qs: this.queryParameters
<<<<<<<
method: 'PUT',
followRedirect: false
=======
method: 'PUT',
qs: this.queryParameters
>>>>>>>
method: 'PUT',
followRedirect: false,
qs: this.queryParameters
<<<<<<<
method: 'DELETE',
followRedirect: false
=======
method: 'DELETE',
qs: this.queryParameters
>>>>>>>
method: 'DELETE',
followRedirect: false,
qs: this.queryParameters
<<<<<<<
method: 'PATCH',
followRedirect: false
=======
method: 'PATCH',
qs: this.queryParameters
>>>>>>>
method: 'PATCH',
followRedirect: false,
qs: this.queryParameters |
<<<<<<<
// two-way bindings
_twowayBindings: { value: create( null ) },
=======
// storage for item configuration from instantiation to reset,
// like dynamic functions or original values
ractive._config = {};
ractive._patternObservers = [];
>>>>>>>
// storage for item configuration from instantiation to reset,
// like dynamic functions or original values
ractive._config = {}; |
<<<<<<<
ractive.splice( 'items', 0, 1 );
});
}
=======
ractive.splice( 'items', 0, 1 );
});
test( 'rebinds of IF sections do not add new context (#2454)', function ( t ) {
const ractive = new Ractive({
el: fixture,
template: `
{{#items}}
{{#disabled}}
{{this.name}}
{{/}}
{{/}}`,
data: {
items: [
{ name: "foo", disabled: true },
{ name: "bar", disabled: true }
]
}
});
t.htmlEqual( fixture.innerHTML, 'foobar' );
// Remove first item and test that the second item is still present, and not a new context.
ractive.splice( 'items', 0, 1 );
t.htmlEqual( fixture.innerHTML, 'bar' );
});
test( 'rebinds of if/else sections do not add new context (#2454)', function ( t ) {
const ractive = new Ractive({
el: fixture,
template: `
{{#items}}
{{#disabled}}
disabled!
{{else}}
{{this.name}}
{{/}}
{{/}}`,
data: {
items: [
{ name: "foo", disabled: false },
{ name: "bar", disabled: false }
]
}
});
t.htmlEqual( fixture.innerHTML, 'foobar' );
// Remove first item and test that the second item is still present, and not a new context.
ractive.splice( 'items', 0, 1 );
t.htmlEqual( fixture.innerHTML, 'bar' );
});
test( 'rebinds of UNLESS sections do not add new context (#2454)', function ( t ) {
const ractive = new Ractive({
el: fixture,
template: `
{{#items}}
{{^disabled}}
{{this.name}}
{{/}}
{{/}}`,
data: {
items: [
{ name: "foo", disabled: false },
{ name: "bar", disabled: false }
]
}
});
t.htmlEqual( fixture.innerHTML, 'foobar' );
// Remove first item and test that the second item is still present, and not a new context.
ractive.splice( 'items', 0, 1 );
t.htmlEqual( fixture.innerHTML, 'bar' );
});
>>>>>>>
ractive.splice( 'items', 0, 1 );
});
test( 'rebinds of IF sections do not add new context (#2454)', function ( t ) {
const ractive = new Ractive({
el: fixture,
template: `
{{#items}}
{{#disabled}}
{{this.name}}
{{/}}
{{/}}`,
data: {
items: [
{ name: "foo", disabled: true },
{ name: "bar", disabled: true }
]
}
});
t.htmlEqual( fixture.innerHTML, 'foobar' );
// Remove first item and test that the second item is still present, and not a new context.
ractive.splice( 'items', 0, 1 );
t.htmlEqual( fixture.innerHTML, 'bar' );
});
test( 'rebinds of if/else sections do not add new context (#2454)', function ( t ) {
const ractive = new Ractive({
el: fixture,
template: `
{{#items}}
{{#disabled}}
disabled!
{{else}}
{{this.name}}
{{/}}
{{/}}`,
data: {
items: [
{ name: "foo", disabled: false },
{ name: "bar", disabled: false }
]
}
});
t.htmlEqual( fixture.innerHTML, 'foobar' );
// Remove first item and test that the second item is still present, and not a new context.
ractive.splice( 'items', 0, 1 );
t.htmlEqual( fixture.innerHTML, 'bar' );
});
test( 'rebinds of UNLESS sections do not add new context (#2454)', function ( t ) {
const ractive = new Ractive({
el: fixture,
template: `
{{#items}}
{{^disabled}}
{{this.name}}
{{/}}
{{/}}`,
data: {
items: [
{ name: "foo", disabled: false },
{ name: "bar", disabled: false }
]
}
});
t.htmlEqual( fixture.innerHTML, 'foobar' );
// Remove first item and test that the second item is still present, and not a new context.
ractive.splice( 'items', 0, 1 );
t.htmlEqual( fixture.innerHTML, 'bar' );
});
} |
<<<<<<<
test( 'Sibling components do not unnessarily update on refinement update of data. (#1293)', function ( t ) {
var ractive, Widget, noCall = false, warn = console.warn;
expect( 3 );
console.warn = function (err) { throw err };
try {
Widget = Ractive.extend({
debug: true,
template: '{{data.foo}}{{bar}}',
computed: {
bar: function () {
if( noCall ) { throw new Error('"bar" should not be recalculated!')}
return this.get('data.bar')
}
}
});
ractive = new Ractive({
el: fixture,
template: '{{data.foo}}<widget data="{{data}}"/><widget data="{{data}}"/>',
data: {
data: {
foo: 'foo',
bar: 'bar'
}
},
components: { widget: Widget }
});
t.htmlEqual( fixture.innerHTML, 'foofoobarfoobar' );
noCall = true;
ractive.findComponent('widget').set( 'data.foo', 'update' );
t.htmlEqual( fixture.innerHTML, 'updateupdatebarupdatebar' );
t.ok( true );
} catch(err){
t.ok( false, err );
} finally {
console.warn = warn;
}
});
=======
test( 'Component bindings respect smart updates (#1209)', function ( t ) {
var Widget, ractive, intros = {}, outros = {};
Widget = Ractive.extend({
template: '{{#each items}}<p intro-outro="log">{{this}}</p>{{/each}}',
transitions: {
log: function ( t ) {
var x = t.node.innerHTML, count = t.isIntro ? intros : outros;
if ( !count[x] ) count[x] = 0;
count[x] += 1;
t.complete();
}
}
});
ractive = new Ractive({
el: fixture,
template: '<widget/>',
components: { widget: Widget },
data: { items: [ 'a', 'b', 'c' ]}
});
t.deepEqual( intros, { a: 1, b: 1, c: 1 });
ractive.merge( 'items', [ 'a', 'c' ]);
t.deepEqual( outros, { b: 1 });
ractive.shift( 'items' );
t.deepEqual( outros, { a: 1, b: 1 });
});
>>>>>>>
test( 'Sibling components do not unnessarily update on refinement update of data. (#1293)', function ( t ) {
var ractive, Widget, noCall = false, warn = console.warn;
expect( 3 );
console.warn = function (err) { throw err };
try {
Widget = Ractive.extend({
debug: true,
template: '{{data.foo}}{{bar}}',
computed: {
bar: function () {
if( noCall ) { throw new Error('"bar" should not be recalculated!')}
return this.get('data.bar')
}
}
});
ractive = new Ractive({
el: fixture,
template: '{{data.foo}}<widget data="{{data}}"/><widget data="{{data}}"/>',
data: {
data: {
foo: 'foo',
bar: 'bar'
}
},
components: { widget: Widget }
});
t.htmlEqual( fixture.innerHTML, 'foofoobarfoobar' );
noCall = true;
ractive.findComponent('widget').set( 'data.foo', 'update' );
t.htmlEqual( fixture.innerHTML, 'updateupdatebarupdatebar' );
t.ok( true );
} catch(err){
t.ok( false, err );
} finally {
console.warn = warn;
}
});
test( 'Component bindings respect smart updates (#1209)', function ( t ) {
var Widget, ractive, intros = {}, outros = {};
Widget = Ractive.extend({
template: '{{#each items}}<p intro-outro="log">{{this}}</p>{{/each}}',
transitions: {
log: function ( t ) {
var x = t.node.innerHTML, count = t.isIntro ? intros : outros;
if ( !count[x] ) count[x] = 0;
count[x] += 1;
t.complete();
}
}
});
ractive = new Ractive({
el: fixture,
template: '<widget/>',
components: { widget: Widget },
data: { items: [ 'a', 'b', 'c' ]}
});
t.deepEqual( intros, { a: 1, b: 1, c: 1 });
ractive.merge( 'items', [ 'a', 'c' ]);
t.deepEqual( outros, { b: 1 });
ractive.shift( 'items' );
t.deepEqual( outros, { a: 1, b: 1 });
}); |
<<<<<<<
=======
test( 'processParams extends correctly if no default provided (#2446)', t => {
new Ractive({
el: fixture,
template: '<p intro="foo:{duration: 1000}"></p>',
transitions: {
foo ( transition, params ) {
params = transition.processParams( params );
// Test that the duration param is present
t.equal( params.duration, 1000 );
}
}
});
});
>>>>>>>
test( 'processParams extends correctly if no default provided (#2446)', t => {
new Ractive({
el: fixture,
template: '<p intro="foo:{duration: 1000}"></p>',
transitions: {
foo ( transition, params ) {
params = transition.processParams( params );
// Test that the duration param is present
t.equal( params.duration, 1000 );
}
}
});
}); |
<<<<<<<
"signature_list":"قائمة التوقيع",
=======
// 2019-12-25 xyy
"transaction_hash":"Hash",
"transaction_status_tip":'أكدت الوسائل التي أكدتها أكثر من 19 العقد الفائقة',
"transaction_type": "نوع المعاملة",
"transaction_owner_address":"العنوان الأصلي",
"transaction_receiver_address":"عنوان تلقي الموارد",
"transaction_freeze_num":"المبلغ المجمد",
"transaction_get_resourse":"الموارد المستلمة",
"transaction_recycling_address":"عنوان إعادة تدوير الموارد",
"transaction_unfreeze_num":"المبلغ غير مجمد",
"transaction_fee":"الرسوم",
"transaction_consumed_bandwidth_cap_per":"سقف استهلاك عرض النطاق الترددي لمستخدم واحد",
"transaction_consumed_bandwidth_cap_all":"الحد الأقصى لاستهلاك النطاق الترددي الكلي",
"transaction_frozen_day":"الأيام المغلقة",
"transaction_frozen_number":"المبلغ المغلق",
"transaction_unfreeze_time":"وقت إلغاء التجمد",
"transaction_consumed_bandwidth_cap_per_tip":"سقف استهلاك عرض النطاق الترددي الذي يستهلكه حامل الرمز المميز لمستخدم واحد عند حدوث نقل للرمز TRC10",
"transaction_consumed_bandwidth_cap_all_tip":"الحد الأقصى لاستهلاك عرض النطاق الترددي لحامل الرمز المميز عند عملية نقل الرمز TRC10",
"transaction_activate_account":"العنوان المنشط",
"transaction_TRANSFERCONTRACT":"تحويل TRX",
"transaction_FREEZEBALANCECONTRACT":"تجميد TRX",
"transaction_UNFREEZEBALANCECONTRACT":"إلغاء تجميد TRX",
"transaction_TRANSFERASSETCONTRACT":"تحويل TRC10",
"transaction_ASSETISSUECONTRACT":"إصدار رمز TRC10",
"transaction_PARTICIPATEASSETISSUECONTRACT":"شراء الرمز TRC10",
"transaction_UNFREEZEASSETCONTRACT":"سحب رموز TRC10 غير المؤمنة",
"transaction_UPDATEASSETCONTRACT":"تحديث معايير الرمز TRC10",
"transaction_ACCOUNTCREATECONTRACT":"تنشيط حسابك",
"transaction_WITHDRAWBALANCECONTRACT":"المطالبة المكافآت",
"transaction_TRIGGERSMARTCONTRACT":"مشغل العقود الذكية",
"transaction_VOTEWITNESSCONTRACT":"تصويت",
"transaction_WITNESSCREATECONTRACT":"إنشاء ترشح للمثل الممتاز",
"transaction_WITNESSUPDATECONTRACT":"تحديث معلومات مرشح الممثل الممتاز",
"transaction_ACCOUNTUPDATECONTRACT":"تعديل اسم الحساب",
"transaction_PROPOSALCREATECONTRACT":"بدء عملية الإقتراح",
"transaction_PROPOSALAPPROVECONTRACT":"التصويت للاقتراح",
"transaction_PROPOSALDELETECONTRACT":"سحب الاقتراح",
"transaction_SETACCOUNTIDCONTRACT":"تعيين معرف الحساب",
"transaction_CREATESMARTCONTRACT":"إنشاء عقد ذكي",
"transaction_UPDATESETTINGCONTRACT":"تحديث معايير العقد",
"transaction_EXCHANGECREATECONTRACT":"إنشاء معاملة Bancor",
"transaction_EXCHANGEINJECTCONTRACT":"معاملات Bancor المالية",
"transaction_EXCHANGEWITHDRAWCONTRACT":"سحب الاستثمار من معاملات Bancor",
"transaction_EXCHANGETRANSACTIONCONTRACT":"تنفيذ معاملات Bancor",
"transaction_ACCOUNTPERMISSIONUPDATECONTRACT":"تحديث ضوابط الحساب",
"transaction_UPDATEENERGYLIMITCONTRACT":"تحديث الحد الأقصى للطاقة في العقد",
"transaction_UPDATEBROKERAGECONTRACT":"تحديث نسبة عمولة الممثل الممتاز",
"transaction_CLEARABICONTRACT":"مسح العقد ABI",
"transaction_token_holder_address":"عنوان مالك الرمز",
"transaction_issue_address":"عنوان المصدر"
>>>>>>>
"signature_list":"قائمة التوقيع",
// 2019-12-25 xyy
"transaction_hash":"Hash",
"transaction_status_tip":'أكدت الوسائل التي أكدتها أكثر من 19 العقد الفائقة',
"transaction_type": "نوع المعاملة",
"transaction_owner_address":"العنوان الأصلي",
"transaction_receiver_address":"عنوان تلقي الموارد",
"transaction_freeze_num":"المبلغ المجمد",
"transaction_get_resourse":"الموارد المستلمة",
"transaction_recycling_address":"عنوان إعادة تدوير الموارد",
"transaction_unfreeze_num":"المبلغ غير مجمد",
"transaction_fee":"الرسوم",
"transaction_consumed_bandwidth_cap_per":"سقف استهلاك عرض النطاق الترددي لمستخدم واحد",
"transaction_consumed_bandwidth_cap_all":"الحد الأقصى لاستهلاك النطاق الترددي الكلي",
"transaction_frozen_day":"الأيام المغلقة",
"transaction_frozen_number":"المبلغ المغلق",
"transaction_unfreeze_time":"وقت إلغاء التجمد",
"transaction_consumed_bandwidth_cap_per_tip":"سقف استهلاك عرض النطاق الترددي الذي يستهلكه حامل الرمز المميز لمستخدم واحد عند حدوث نقل للرمز TRC10",
"transaction_consumed_bandwidth_cap_all_tip":"الحد الأقصى لاستهلاك عرض النطاق الترددي لحامل الرمز المميز عند عملية نقل الرمز TRC10",
"transaction_activate_account":"العنوان المنشط",
"transaction_TRANSFERCONTRACT":"تحويل TRX",
"transaction_FREEZEBALANCECONTRACT":"تجميد TRX",
"transaction_UNFREEZEBALANCECONTRACT":"إلغاء تجميد TRX",
"transaction_TRANSFERASSETCONTRACT":"تحويل TRC10",
"transaction_ASSETISSUECONTRACT":"إصدار رمز TRC10",
"transaction_PARTICIPATEASSETISSUECONTRACT":"شراء الرمز TRC10",
"transaction_UNFREEZEASSETCONTRACT":"سحب رموز TRC10 غير المؤمنة",
"transaction_UPDATEASSETCONTRACT":"تحديث معايير الرمز TRC10",
"transaction_ACCOUNTCREATECONTRACT":"تنشيط حسابك",
"transaction_WITHDRAWBALANCECONTRACT":"المطالبة المكافآت",
"transaction_TRIGGERSMARTCONTRACT":"مشغل العقود الذكية",
"transaction_VOTEWITNESSCONTRACT":"تصويت",
"transaction_WITNESSCREATECONTRACT":"إنشاء ترشح للمثل الممتاز",
"transaction_WITNESSUPDATECONTRACT":"تحديث معلومات مرشح الممثل الممتاز",
"transaction_ACCOUNTUPDATECONTRACT":"تعديل اسم الحساب",
"transaction_PROPOSALCREATECONTRACT":"بدء عملية الإقتراح",
"transaction_PROPOSALAPPROVECONTRACT":"التصويت للاقتراح",
"transaction_PROPOSALDELETECONTRACT":"سحب الاقتراح",
"transaction_SETACCOUNTIDCONTRACT":"تعيين معرف الحساب",
"transaction_CREATESMARTCONTRACT":"إنشاء عقد ذكي",
"transaction_UPDATESETTINGCONTRACT":"تحديث معايير العقد",
"transaction_EXCHANGECREATECONTRACT":"إنشاء معاملة Bancor",
"transaction_EXCHANGEINJECTCONTRACT":"معاملات Bancor المالية",
"transaction_EXCHANGEWITHDRAWCONTRACT":"سحب الاستثمار من معاملات Bancor",
"transaction_EXCHANGETRANSACTIONCONTRACT":"تنفيذ معاملات Bancor",
"transaction_ACCOUNTPERMISSIONUPDATECONTRACT":"تحديث ضوابط الحساب",
"transaction_UPDATEENERGYLIMITCONTRACT":"تحديث الحد الأقصى للطاقة في العقد",
"transaction_UPDATEBROKERAGECONTRACT":"تحديث نسبة عمولة الممثل الممتاز",
"transaction_CLEARABICONTRACT":"مسح العقد ABI",
"transaction_token_holder_address":"عنوان مالك الرمز",
"transaction_issue_address":"عنوان المصدر" |
<<<<<<<
},
{
name: 'Root-level reference',
template: '{{#a}}{{#b}}{{#c}}{{~/foo}}{{/c}}{{/b}}{{/a}}',
data: { foo: 'top', a: { b: { c: { foo: 'c' }, foo: 'b' }, foo: 'a' } },
result: 'top'
=======
},
{
name: 'else in non-Handlebars blocks',
template: '{{#foo}}yes{{else}}no{{/foo}}',
data: { foo: true },
result: 'yes',
new_data: { foo: false },
new_result: 'no'
},
{
name: 'Double-rendering bug (#748) is prevented',
template: '{{#foo}}{{#f(this)}}{{this}}{{/f}}{{/foo}}',
data: {
foo: [
[ 2, 1, 4, 3 ]
],
f: function (x) {
return x.sort(function (a, b) { // ... or this (sort) and it will work
return b - a;
});
}
},
result: '4321'
>>>>>>>
},
{
name: 'Root-level reference',
template: '{{#a}}{{#b}}{{#c}}{{~/foo}}{{/c}}{{/b}}{{/a}}',
data: { foo: 'top', a: { b: { c: { foo: 'c' }, foo: 'b' }, foo: 'a' } },
result: 'top'
},
{
name: 'else in non-Handlebars blocks',
template: '{{#foo}}yes{{else}}no{{/foo}}',
data: { foo: true },
result: 'yes',
new_data: { foo: false },
new_result: 'no'
},
{
name: 'Double-rendering bug (#748) is prevented',
template: '{{#foo}}{{#f(this)}}{{this}}{{/f}}{{/foo}}',
data: {
foo: [
[ 2, 1, 4, 3 ]
],
f: function (x) {
return x.sort(function (a, b) { // ... or this (sort) and it will work
return b - a;
});
}
},
result: '4321' |
<<<<<<<
});
test( 'resetting a dynamic partial to its reference name should replace the partial (#2185)', t => {
const r = new Ractive({
el: fixture,
template: '{{>part1}}{{>part2}}',
partials: { part3: 'part3' },
data: { part1: 'part3', part2: 'nope' }
});
t.htmlEqual( fixture.innerHTML, 'part3' );
r.resetPartial( 'part1', 'part1' );
t.htmlEqual( fixture.innerHTML, 'part1' );
r.resetPartial( 'part2', 'part2' );
t.htmlEqual( fixture.innerHTML, 'part1part2' );
=======
});
test( `Partials can have context that starts with '.' (#1880)`, t => {
new Ractive({
el: fixture,
template: '{{#with foo}}{{>foo .bar}}{{/with}}',
data: {
foo: { bar: { baz: 'bat' } }
},
partials: {
foo: '{{.baz}}'
}
});
t.htmlEqual( fixture.innerHTML, 'bat' );
>>>>>>>
});
test( 'resetting a dynamic partial to its reference name should replace the partial (#2185)', t => {
const r = new Ractive({
el: fixture,
template: '{{>part1}}{{>part2}}',
partials: { part3: 'part3' },
data: { part1: 'part3', part2: 'nope' }
});
t.htmlEqual( fixture.innerHTML, 'part3' );
r.resetPartial( 'part1', 'part1' );
t.htmlEqual( fixture.innerHTML, 'part1' );
r.resetPartial( 'part2', 'part2' );
t.htmlEqual( fixture.innerHTML, 'part1part2' );
});
test( `Partials can have context that starts with '.' (#1880)`, t => {
new Ractive({
el: fixture,
template: '{{#with foo}}{{>foo .bar}}{{/with}}',
data: {
foo: { bar: { baz: 'bat' } }
},
partials: {
foo: '{{.baz}}'
}
});
t.htmlEqual( fixture.innerHTML, 'bat' ); |
<<<<<<<
const legalReference = /^(?:[a-zA-Z$_0-9]|\\\.)+(?:(?:\.(?:[a-zA-Z$_0-9]|\\\.)+)|(?:\[[0-9]+\]))*/;
const relaxedName = /^[a-zA-Z_$][-\/a-zA-Z_$0-9]*/;
const specials = /^@(?:keypath|rootpath|index|key|ractive|global)/;
const specialCall = /^\s*\(/;
=======
const legalReference = /^(?:[a-zA-Z$_0-9]|\\\.)+(?:(?:\.(?:[a-zA-Z$_0-9]|\\\.)+)|(?:\[[0-9]+\]))*/;
const relaxedName = /^[a-zA-Z_$][-\/a-zA-Z_$0-9]*/;
const spreadPattern = /^\s*\.{3}/;
>>>>>>>
const legalReference = /^(?:[a-zA-Z$_0-9]|\\\.)+(?:(?:\.(?:[a-zA-Z$_0-9]|\\\.)+)|(?:\[[0-9]+\]))*/;
const relaxedName = /^[a-zA-Z_$][-\/a-zA-Z_$0-9]*/;
const specials = /^@(?:keypath|rootpath|index|key|this|global)/;
const specialCall = /^\s*\(/;
const spreadPattern = /^\s*\.{3}/;
<<<<<<<
name = parser.matchPattern( specials );
if ( name === '@keypath' || name === '@rootpath' ) {
if ( parser.matchPattern( specialCall ) ) {
let ref = readReference( parser );
if ( !ref ) parser.error( `Expected a valid reference for a keypath expression` );
parser.allowWhitespace();
if ( !parser.matchString( ')' ) ) parser.error( `Unclosed keypath expression` );
name += `(${ref.n})`;
}
}
=======
name = parser.matchPattern( /^@(?:keypath|rootpath|index|key|this|global)/ );
spread = !name && parser.spreadArgs && parser.matchPattern( spreadPattern );
>>>>>>>
name = parser.matchPattern( specials );
if ( name === '@keypath' || name === '@rootpath' ) {
if ( parser.matchPattern( specialCall ) ) {
let ref = readReference( parser );
if ( !ref ) parser.error( `Expected a valid reference for a keypath expression` );
parser.allowWhitespace();
if ( !parser.matchString( ')' ) ) parser.error( `Unclosed keypath expression` );
name += `(${ref.n})`;
}
}
spread = !name && parser.spreadArgs && parser.matchPattern( spreadPattern ); |
<<<<<<<
// Catching errors inside handlers for programmatically-fired events
// is a world of facepalm http://jsfiddle.net/geoz2tks/
const onerror = window.onerror;
window.onerror = function ( err ) {
t.ok( /is not a function/.test( err ) );
return true;
};
fire( ractive.find( 'button' ), 'click' );
window.onerror = onerror;
});
test( 'Passing the event object to a method', t => {
t.expect( 1 );
const Widget = Ractive.extend({
template: `<button on-click='activate(event)'>{{foo}}</button>`,
activate ( event ) {
t.equal( event.original.type, 'click' );
}
=======
fire( ractive.find( 'button' ), 'click' );
window.onerror = onerror;
>>>>>>>
fire( ractive.find( 'button' ), 'click' );
window.onerror = onerror;
<<<<<<<
test( 'component "on-" with additive ...arguments', t => {
t.expect( 7 );
=======
const ractive = new Ractive({
el: fixture,
template: '<Component on-foo="foo(...arguments)" on-bar="bar(...arguments)"/>',
components: { Component },
foo ( e, arg1, arg2 ) {
t.equal( e.original.type, 'click' );
t.equal( arg1, 'foo' );
t.equal( arg2, 42 );
},
bar ( arg1, arg2 ) {
t.equal( arg1, 'bar' );
t.equal( arg2, 100 );
}
});
const component = ractive.findComponent( 'Component' );
fire( component.nodes.test, 'click' );
component.fire( 'bar', 'bar', 100 );
});
test( 'component ...arguments must be last argument', t => {
t.throws( () => {
new Ractive({
template: `<c on-foo="foo(...arguments, 'arg after spread')"/>`
});
}, /Expected a property name/);
>>>>>>>
const ractive = new Ractive({
el: fixture,
template: '<Component on-foo="foo(...arguments)" on-bar="bar(...arguments)"/>',
components: { Component },
foo ( e, arg1, arg2 ) {
t.equal( e.original.type, 'click' );
t.equal( arg1, 'foo' );
t.equal( arg2, 42 );
},
bar ( arg1, arg2 ) {
t.equal( arg1, 'bar' );
t.equal( arg2, 100 );
}
});
const component = ractive.findComponent( 'Component' );
fire( component.nodes.test, 'click' );
component.fire( 'bar', 'bar', 100 ); |
<<<<<<<
test( 'Computation on child takes ownership of property (#1357)', ( t ) => {
var ractive = new Ractive({
el: fixture,
template: '{{b}} <component c="{{a}}" d="{{b}}" />',
data: { a: 'a' },
components: {
component: Ractive.extend({
template: '{{c}} {{d}}',
parameters: parameters,
computed: {
d: function() { return 'foo-' + this.get('c'); }
}
})
}
});
t.htmlEqual( fixture.innerHTML, 'foo-a a foo-a' );
ractive.set( 'a', 'bar' );
t.htmlEqual( fixture.innerHTML, 'foo-bar bar foo-bar' );
});
test( 'ComponentData supports JSON.stringify', (t) => {
new Ractive({
el: fixture,
template: `<cmp foo="bar" baz="{{.}}" />`,
components: {
cmp: Ractive.extend({
template: `{{JSON.stringify(.)}} {{foo}} {{baz.bippy}} {{bat}}`,
onconstruct: function() {
this.data.bat = 1;
}
})
},
data: { bippy: 'boppy' }
});
t.htmlEqual( JSON.stringify({foo:'bar',baz:{bippy:'boppy'},bat:1}) + ' bar boppy 1', fixture.innerHTML );
});
test( 'ComponentData supports in operator', (t) => {
let ractive = new Ractive({
el: fixture,
template: `<cmp flag foo="bar" baz="{{.}}" />`,
components: {
cmp: Ractive.extend({
template: `{{JSON.stringify(.)}} {{foo}} {{baz.bippy}} {{bat}}`,
onconstruct: function() {
this.data.bat = 1;
}
})
},
data: { bippy: 'boppy' }
});
let cmp = ractive.findComponent('cmp').data;
t.ok( 'flag' in cmp );
t.ok( 'foo' in cmp );
t.ok( 'baz' in cmp );
t.ok( 'bat' in cmp );
});
test( 'Computation cannot take ownership of an expression', ( t ) => {
expect( 1 );
t.throws( () => {
var ractive = new Ractive({
el: fixture,
template: `<component b="{{ 1+2 }}"/>`,
components: {
component: Ractive.extend({
template: '{{b}}',
parameters: parameters,
computed: { b: '"b"' }
})
}
});
}, /\"b\" cannot be mapped to \"\$\{1\+2\}\"/ );
});
test( 'Computation cannot take ownership if already owned by computation', ( t ) => {
expect( 1 );
t.throws( () => {
var ractive = new Ractive({
el: fixture,
template: '{{b}} <component c="{{a}}" d="{{b}}" />',
data: { a: 2 },
computed: {
b: '${a} * 2'
},
components: {
component: Ractive.extend({
template: '{{c}} {{d}}',
parameters: parameters,
computed: {
d: '${c} * 3'
}
})
}
});
}, /\"d\" cannot be mapped to \"b\"/ );
});
test( 'Computation cannot take ownership if already owned by computation in a sibling component', ( t ) => {
expect( 1 );
t.throws( () => {
var ractive = new Ractive({
el: fixture,
template: `{{out}}
<component in="2" out="{{out}}" />
<component in="3" out="{{out}}" />`,
data: { a: 2 },
components: {
component: Ractive.extend({
template: '{{in}}-{{out}}',
parameters: parameters,
computed: {
out: '${in} * 2'
}
})
}
});
}, /\"out\" cannot be mapped to \"out\"/ );
});
test( 'Computation that takes over ownership reverts when component is torndown: ' + mode, t => {
var ractive = new Ractive({
el: fixture,
template: '{{a}}-{{#if foo}}<cmp b="{{a}}"/>{{/if}}',
data: { a: 1, foo: true },
components: {
cmp: Ractive.extend({
template: '{{b}}',
parameters: parameters,
computed: {
b: function() { return 2; }
}
})
}
});
t.htmlEqual( fixture.innerHTML, '2-2' );
t.equal( ractive.data.a, 2 );
// qunit fails with this combined with the three-run functional call approach :(
// try {
// ractive.set( 'a', 99 );
// } catch ( err ) {
// t.ok( true );
// }
ractive.set( 'foo', false );
t.htmlEqual( fixture.innerHTML, '2-' );
t.equal( ractive.data.a, 2 );
ractive.set( 'a', 3)
t.htmlEqual( fixture.innerHTML, '3-' );
t.equal( ractive.data.a, 3 );
ractive.set( 'foo', true );
t.htmlEqual( fixture.innerHTML, '2-2' );
t.equal( ractive.data.a, 2 );
});
test( 'Computation changes if mapping is keypath expression and it changes', ( t ) => {
var ractive = new Ractive({
el: fixture,
template: '{{a.one}}-{{a.two}}-<component b="{{a[prop]}}"/>',
data: {
a: {
one: 1,
two: 2
},
prop: 'one'
},
components: {
component: Ractive.extend({
template: '{{b}}',
parameters: parameters,
computed: {
b: function() { return 42; }
}
})
}
});
t.htmlEqual( fixture.innerHTML, '42-2-42' );
t.equal( ractive.data.a.one, 42 );
t.equal( ractive.data.a.two, 2 );
ractive.set( 'prop', 'two' );
t.htmlEqual( fixture.innerHTML, '42-42-42' );
t.equal( ractive.data.a.one, 42 );
t.equal( ractive.data.a.two, 42 );
ractive.set( 'a.one', 11 );
t.htmlEqual( fixture.innerHTML, '11-42-42' );
t.equal( ractive.data.a.one, 11 );
t.equal( ractive.data.a.two, 42 );
});
=======
>>>>>>>
test( 'ComponentData supports JSON.stringify', (t) => {
new Ractive({
el: fixture,
template: `<cmp foo="bar" baz="{{.}}" />`,
components: {
cmp: Ractive.extend({
template: `{{JSON.stringify(.)}} {{foo}} {{baz.bippy}} {{bat}}`,
onconstruct: function() {
this.data.bat = 1;
}
})
},
data: { bippy: 'boppy' }
});
t.htmlEqual( JSON.stringify({foo:'bar',baz:{bippy:'boppy'},bat:1}) + ' bar boppy 1', fixture.innerHTML );
});
test( 'ComponentData supports in operator', (t) => {
let ractive = new Ractive({
el: fixture,
template: `<cmp flag foo="bar" baz="{{.}}" />`,
components: {
cmp: Ractive.extend({
template: `{{JSON.stringify(.)}} {{foo}} {{baz.bippy}} {{bat}}`,
onconstruct: function() {
this.data.bat = 1;
}
})
},
data: { bippy: 'boppy' }
});
let cmp = ractive.findComponent('cmp').data;
t.ok( 'flag' in cmp );
t.ok( 'foo' in cmp );
t.ok( 'baz' in cmp );
t.ok( 'bat' in cmp );
}); |
<<<<<<<
import { isArray } from '../../../../utils/is';
=======
import { arrayContains, removeFromArray } from '../../../../utils/array';
>>>>>>>
<<<<<<<
if ( isArray( existingValue ) ) {
this.isChecked = this.arrayContains( existingValue, bindingValue );
=======
if ( Array.isArray( existingValue ) ) {
this.isChecked = arrayContains( existingValue, bindingValue );
>>>>>>>
if ( Array.isArray( existingValue ) ) {
this.isChecked = this.arrayContains( existingValue, bindingValue ); |
<<<<<<<
if ( this._introTransition && this.ractive.transitionsEnabled ) {
this._introTransition.isIntro = true;
runloop.registerTransition( this._introTransition );
}
=======
// store so we can abort if it gets removed
this._introTransition = getTransition( this, this.template.t0 || this.template.t1, 'intro' );
>>>>>>>
if ( this._introTransition && this.ractive.transitionsEnabled ) {
this._introTransition.isIntro = true;
runloop.registerTransition( this._introTransition );
}
<<<<<<<
if ( this._outroTransition && this.ractive.transitionsEnabled ) {
this._outroTransition.isIntro = false;
runloop.registerTransition( this._outroTransition );
}
=======
// outro transition
getTransition( this, this.template.t0 || this.template.t2, 'outro' );
>>>>>>>
// outro transition
if ( this._outroTransition && this.ractive.transitionsEnabled ) {
this._outroTransition.isIntro = false;
runloop.registerTransition( this._outroTransition );
} |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.