conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
* @param file {string} Path to the entry point file
=======
* @param timeout {number} number of ms the server will wait to reload the browser
>>>>>>>
* @param file {string} Path to the entry point file
* @param timeout {number} number of ms the server will wait to reload the browser
<<<<<<<
=======
// Output
var serveURL = "http://" + (host || '127.0.0.1') + ":" + port;
if (logLevel >= 1)
console.log(('Serving "' + root + '" at ' + serveURL).green);
// Launch browser
if (openPath !== null)
open(serveURL + openPath);
>>>>>>> |
<<<<<<<
this.server.listen(port, '0.0.0.0');
sys.puts('Bayeux-attached http server running at http://0.0.0.0:'+port);
sys.puts('Lantern UI running at http://0.0.0.0:'+port+'/app/index.html');
=======
this.server.listen(port);
util.puts('Http Server running at http://localhost:' + port + '/');
>>>>>>>
this.server.listen(port, '0.0.0.0');
util.puts('Bayeux-attached http server running at http://0.0.0.0:'+port);
util.puts('Lantern UI running at http://0.0.0.0:'+port+'/app/index.html');
<<<<<<<
*/
sys.puts(logEntry);
=======
util.puts(logEntry);
>>>>>>>
*/
util.puts(logEntry); |
<<<<<<<
if (changing) return;
=======
yasp.Editor.updateBreakpoints();
>>>>>>>
if (changing) return;
yasp.Editor.updateBreakpoints(); |
<<<<<<<
* @param {IAssetInfo} fromAsset
* @param {IAssetInfo} toAsset
=======
* @param {string} assetIdFrom
* @param {string} assetIdTo
* @return {Promise<AssetsService.rateApi>}
*/
@decorators.cachable(60)
getRate(assetIdFrom, assetIdTo) {
return fetch(`/api/rate/${assetIdFrom}/${assetIdTo}/rate.json`)
.then((r) => r.json())
.then((rateInfo) => {
return this._generateRateApi(rateInfo.rate);
});
}
/**
* @return {Promise<IFeeData>}
*/
getFeeSend() {
return utils.when({
id: WavesApp.defaultAssets.WAVES,
fee: 0.001
});
}
/**
>>>>>>>
<<<<<<<
return AssetsService._round(balance * rate, toAsset.precision);
=======
return balance.mul(rate);
>>>>>>>
return balance.mul(rate.toFixed(8));
<<<<<<<
return rate === 0 ? 0 : AssetsService._round(balance / rate, fromAsset.precision);
},
/**
* @name AssetsService.rateApi#rate
*/
rate
=======
return rate ? balance.div(rate) : 0;
}
>>>>>>>
return rate ? balance.div(rate) : 0;
},
/**
* @name AssetsService.rateApi#rate
*/
rate |
<<<<<<<
controller.$inject = ['Base', 'user', 'i18n', 'assetsService', 'transactionsService', 'createPoll', 'createPromise'];
angular.module('app.wallet.transactions').component('wTransactionList', {
bindings: {
transactionType: '<',
search: '<'
},
templateUrl: 'modules/wallet/modules/transactions/directives/transactionList/transactionList.html',
transclude: false,
controller
});
=======
controller.$inject = [
'Base',
'user',
'i18n',
'assetsService',
'transactionsService',
'createPoll',
'createPromise',
'utils'
];
angular.module('app.wallet.transactions')
.component('wTransactionList', {
bindings: {
transactionType: '<',
search: '<'
},
templateUrl: '/modules/wallet/modules/transactions/directives/transactionList/transactionList.html',
transclude: false,
controller
});
>>>>>>>
controller.$inject = [
'Base',
'user',
'i18n',
'assetsService',
'transactionsService',
'createPoll',
'createPromise',
'utils'
];
angular.module('app.wallet.transactions')
.component('wTransactionList', {
bindings: {
transactionType: '<',
search: '<'
},
templateUrl: 'modules/wallet/modules/transactions/directives/transactionList/transactionList.html',
transclude: false,
controller
}); |
<<<<<<<
function AngularApplicationConfig($provide, $compileProvider, $validatorProvider, $qProvider, $mdAriaProvider,
=======
function AngularApplicationConfig($provide, $compileProvider, $validatorProvider, $qProvider, $sceDelegateProvider,
>>>>>>>
function AngularApplicationConfig($provide, $compileProvider, $validatorProvider, $qProvider, $sceDelegateProvider, $mdAriaProvider,
<<<<<<<
'$mdAriaProvider', 'constants.network', 'constants.application'];
=======
'$sceDelegateProvider', 'constants.network', 'constants.application'];
>>>>>>>
'$sceDelegateProvider', '$mdAriaProvider', 'constants.network', 'constants.application']; |
<<<<<<<
var notifications = require(path.normalize(__dirname + '/plugins/notifications'));
var defaultRegisterCb = function(err) { if (err) throw(err); };
=======
var moderationLog = require(path.normalize(__dirname + '/plugins/moderation_log'));
>>>>>>>
var notifications = require(path.normalize(__dirname + '/plugins/notifications'));
var moderationLog = require(path.normalize(__dirname + '/plugins/moderation_log'));
<<<<<<<
// notification methods
var notificationsOptions = { db: db };
server.register({ register: notifications, options: notificationsOptions }, defaultRegisterCb);
// authorization methods
server.register({ register: authorization }, defaultRegisterCb);
// auth via jwt
var authOptions = { redis: redis };
server.register({ register: jwt, options: authOptions }, function(err) {
if (err) throw err;
=======
})
// auth via jwt
.then(function() {
return server.register({ register: jwt, options: { redis } })
.then(function() {
>>>>>>>
})
// notifications
.then(function() {
// notification methods
return server.register({ register: notifications, options: { db }});
})
// auth via jwt
.then(function() {
return server.register({ register: jwt, options: { redis } })
.then(function() { |
<<<<<<<
* @param {$rootScope.Scope} $rootScope
* @param {$compile} $compile
=======
* @param {$rootScope.Scope} $rootScope
* @param {$rootScope.Scope} $rootScope
* @param {$compile} $compile
* @param {Base} Base
>>>>>>>
* @param {$rootScope.Scope} $rootScope
* @param {$compile} $compile
* @param {Base} Base |
<<<<<<<
this.isWEST = this.balance.asset.id === WavesApp.defaultAssets.WEST;
=======
this.isVST = this.balance.asset.id === WavesApp.defaultAssets.VST;
this.isGateway = isGateway;
>>>>>>>
this.isGateway = isGateway;
this.isWEST = this.balance.asset.id === WavesApp.defaultAssets.WEST; |
<<<<<<<
* @param {ModalRouter} ModalRouter
=======
* @param {Waves} waves
>>>>>>>
* @param {Waves} waves
* @param {ModalRouter} ModalRouter
<<<<<<<
notification, ExtendedAsset, decorators, ModalRouter) {
function remapAssetProps(props) {
props.precision = props.decimals;
delete props.decimals;
return props;
}
const cache = Object.create(null);
Waves.config.set({
/**
* @param {string} id
* @return {Promise<ExtendedAsset>}
*/
assetFactory(id) {
if (cache[id]) {
return cache[id];
}
const promise = fetch(`${WavesApp.network.api}/assets/${id}`)
.then(utils.onFetch)
.then((fullProps) => new ExtendedAsset(remapAssetProps(fullProps)))
.catch(() => {
if (id === Waves.constants.WAVES_PROPS.id) {
const wavesTx = remapAssetProps(Waves.constants.WAVES_V1_ISSUE_TX);
return Promise.resolve(new ExtendedAsset(wavesTx));
}
return Waves.API.Node.v1.transactions.get(id)
.then((partialProps) => new ExtendedAsset(remapAssetProps(partialProps)));
});
cache[id] = promise;
cache[id].catch(() => {
delete cache[id];
});
return cache[id];
}
});
=======
notification, decorators, waves) {
>>>>>>>
notification, decorators, waves, ModalRouter) {
<<<<<<<
/**
* @type {ModalRouter}
* @private
*/
this._modalManager = new ModalRouter();
/**
* @type {function}
* @private
*/
=======
/**
* @type {Function}
* @private
*/
>>>>>>>
/**
* @type {ModalRouter}
* @private
*/
this._modalManager = new ModalRouter();
/**
* @type {function}
* @private
*/
<<<<<<<
'ModalRouter',
=======
'waves',
>>>>>>>
'waves',
'ModalRouter', |
<<<<<<<
const tokenizedCardPayment = this.tokenizeCardPayment();
if (typeof tokenizedCardPayment === 'undefined') {
=======
if (!Number(this._tokenizeCardPayment())) {
>>>>>>>
if (!Number(this._tokenizeCardPayment())) {
<<<<<<<
/**
* @return {boolean}
* @private
*/
static _isNotScam(item) {
return !WavesApp.scam[item.asset.id];
}
=======
_tokenizeCardPayment() {
return (this.cardPayment && this.cardPayment.toTokens()) || 0;
}
>>>>>>>
_tokenizeCardPayment() {
return (this.cardPayment && this.cardPayment.toTokens()) || 0;
}
/**
* @return {boolean}
* @private
*/
static _isNotScam(item) {
return !WavesApp.scam[item.asset.id];
} |
<<<<<<<
/**
* @type {User}
*/
const user = $injector.get('user');
analytics.send({
name: 'Create Done Show', params: { hasBackup: user.getSetting('hasBackup') }
});
=======
>>>>>>>
/**
* @type {User}
*/
const user = $injector.get('user');
analytics.send({
name: 'Create Done Show', params: { hasBackup: user.getSetting('hasBackup') }
});
<<<<<<<
.then(() => {
user.setSetting('termsAccepted', true);
analytics.send({ name: 'Create Done Confirm and Begin Click' });
});
=======
.then(() => {
storage.save('needReadNewTerms', false);
storage.save('termsAccepted', true);
});
>>>>>>>
.then(() => {
analytics.send({ name: 'Create Done Confirm and Begin Click' });
storage.save('needReadNewTerms', false);
storage.save('termsAccepted', true);
}); |
<<<<<<<
const MIN_LINES = 15;
=======
const ds = require('data-service');
const { AssetPair } = require('@waves/data-entities');
>>>>>>>
const ds = require('data-service');
const { AssetPair } = require('@waves/data-entities');
const MIN_LINES = 15; |
<<<<<<<
WatchlistSearch,
PairsStorage
=======
WatchlistSearch,
$element
>>>>>>>
WatchlistSearch,
PairsStorage,
$element
<<<<<<<
/**
* @param element
*/
scrollTo(element) {
=======
scrollTo($el) {
>>>>>>>
/**
* @param element
*/
scrollTo($el) {
<<<<<<<
'WatchlistSearch',
'PairsStorage'
=======
'WatchlistSearch',
'$element'
>>>>>>>
'WatchlistSearch',
'PairsStorage',
'$element' |
<<<<<<<
* @example api.sharedPlaylistFetcher.setPlaylistID('4nUZM-TY2aVxZ2xaA-').fetchMetadata()
* @see https://kkbox.gelato.io/docs/versions/1.1/resources/shared-playlists/endpoints/get-shared-playlists-playlist_id
=======
* @example api.SharedPlaylistFetcher.setPlaylistID('4nUZM-TY2aVxZ2xaA-').fetchMetadata()
* @see https://docs-en.kkbox.codes/v1.1/reference#sharedplaylists-playlist_id
>>>>>>>
* @example api.sharedPlaylistFetcher.setPlaylistID('4nUZM-TY2aVxZ2xaA-').fetchMetadata()
* @see https://docs-en.kkbox.codes/v1.1/reference#sharedplaylists-playlist_id
<<<<<<<
* @example api.sharedPlaylistFetcher.setPlaylistID('4nUZM-TY2aVxZ2xaA-').fetchTracks()
* @see https://kkbox.gelato.io/docs/versions/1.1/resources/shared-playlists/endpoints/get-shared-playlists-playlist_id-tracks
=======
* @example api.SharedPlaylistFetcher.setPlaylistID('4nUZM-TY2aVxZ2xaA-').fetchTracks()
* @see https://docs-en.kkbox.codes/v1.1/reference#sharedplaylists-playlist_id-tracks
>>>>>>>
* @example api.sharedPlaylistFetcher.setPlaylistID('4nUZM-TY2aVxZ2xaA-').fetchTracks()
* @see https://docs-en.kkbox.codes/v1.1/reference#sharedplaylists-playlist_id-tracks |
<<<<<<<
if (!Number(this.tokenizeCardPayment())) {
this.approximateAmount = new ds.wavesDataEntities.Money(0, this.asset);
=======
const tokenizedCardPayment = this.tokenizeCardPayment();
if (typeof tokenizedCardPayment === 'undefined') {
this.approximateAmount = new Waves.Money(0, this.asset);
}
if (!Number(tokenizedCardPayment)) {
>>>>>>>
const tokenizedCardPayment = this.tokenizeCardPayment();
if (typeof tokenizedCardPayment === 'undefined') {
this.approximateAmount = new ds.wavesDataEntities.Money(0, this.asset);
}
if (!Number(tokenizedCardPayment)) { |
<<<<<<<
* @param {app.utils} utils
* @param {Waves} waves
=======
>>>>>>>
* @param {app.utils} utils
* @param {Waves} waves
<<<<<<<
const controller = function (Base, $scope, gatewayService, user, utils, waves) {
=======
const controller = function (Base, $scope, gatewayService, user) {
>>>>>>>
const controller = function (Base, $scope, gatewayService, user, utils, waves) {
<<<<<<<
this.updateApproximateAmount();
=======
const params = {
address: `address=${user.address}`,
amount: `amount=${cardPayment}`,
crypto: `crypto=${this.asset.displayName}`,
fiat: `fiat=${this.currencies[this.chosenCurrencyIndex].fiat}`
};
fetch(
`${COINOMAT_API}rate.php?${params.address}&${params.amount}&${params.crypto}&${params.fiat}`
)
.then((approximateAmount) => {
const coins = new BigNumber(approximateAmount).mul(Math.pow(10, asset.precision));
this.approximateAmount = new Waves.Money(coins.round(0), asset);
});
>>>>>>>
this.updateApproximateAmount();
<<<<<<<
controller.$inject = ['Base', '$scope', 'gatewayService', 'user', 'utils', 'waves'];
=======
controller.$inject = ['Base', '$scope', 'gatewayService', 'user'];
>>>>>>>
controller.$inject = ['Base', '$scope', 'gatewayService', 'user', 'utils', 'waves']; |
<<<<<<<
const controller = function (Base,
waves,
user,
createPoll,
notification,
utils,
$scope,
dexDataService,
modalManager,
permissionManager,
ease,
$element,
=======
const controller = function (
Base,
waves,
user,
createPoll,
notification,
utils,
$scope,
dexDataService,
modalManager,
permissionManager,
ease,
$element,
transactions
>>>>>>>
const controller = function (
Base,
waves,
user,
createPoll,
notification,
utils,
$scope,
dexDataService,
modalManager,
permissionManager,
ease,
$element,
transactions
<<<<<<<
isLockedPair(amountAssetId, priceAssetId) {
return utils.isLockedInDex(amountAssetId, priceAssetId);
}
=======
/**
*
* @param order
* @return {Promise<Object | never>}
*/
>>>>>>>
isLockedPair(amountAssetId, priceAssetId) {
return utils.isLockedInDex(amountAssetId, priceAssetId);
}
/**
*
* @param order
* @return {Promise<Object | never>}
*/ |
<<<<<<<
isSeed = false;
/**
* @type {boolean}
*/
signAdapterError = false;
/**
* @type {boolean}
*/
signPending = false;
/**
* @type {boolean}
*/
hasError = false;
=======
isDesktop = WavesApp.isDesktop();
>>>>>>>
isSeed = false;
/**
* @type {boolean}
*/
signAdapterError = false;
/**
* @type {boolean}
*/
signPending = false;
/**
* @type {boolean}
*/
isDesktop = WavesApp.isDesktop();
<<<<<<<
return this.createUrl();
}).catch((e) => {
this._sendError(e.message || e);
this.signPending = false;
}).finally(() => $scope.$apply());
}
/**
* @param {string} referer
* @return {string}
* @private
*/
static _getDomain(referer) {
const url = new URL(referer);
if (url.protocol !== 'https:') {
throw new Error('Protocol must be "https:"');
}
return url.hostname;
}
/**
* @param {string} urlString
* @return {string}
* @private
*/
static _normalizeUrl(urlString) {
const url = new URL(urlString);
const protocol = `${url.protocol}//`;
return protocol + (`${url.host}/${url.pathname}/${url.search}${url.hash}`.replace(/\/+/g, '/'))
.replace(/\/$/, '');
}
sign() {
this.createUrl()
=======
return Promise.all([
signable.getSignature(),
adapter.getPublicKey()
])
.then(([signature, publicKey]) => {
const search = `?s=${signature}&p=${publicKey}&a=${user.address}`;
const path = successPath || '';
const url = `${referrer}/${path}${search}`;
this.successUrl = GatewaySignCtrl._normalizeUrl(url);
});
})
>>>>>>>
return this.createUrl();
}).catch((e) => {
this._sendError(e.message || e);
this.signPending = false;
}).finally(() => $scope.$apply());
}
sign() {
this.createUrl() |
<<<<<<<
/**
* @private
*/
_handleLogin() {
user.changeSetting.on(this._onUserChangeSetting, this);
user.logoutSignal.once(this._handleLogout, this);
}
/**
* @private
*/
_handleLogout() {
user.changeSetting.off(this._onUserChangeSetting);
user.loginSignal.once(this._handleLogin, this);
}
_onUserChangeSetting(path) {
if (path === 'network.matcher') {
this._updateCurrentMatcherAddress();
}
}
/**
* @param bids
* @param asks
* @param pair
* @returns {Promise<any[]>}
* @private
*/
static _remapOrderBook({ bids, asks, pair }) {
return {
pair,
bids: Matcher._remapBidAsks(bids, pair),
asks: Matcher._remapBidAsks(asks, pair)
};
}
/**
* @param list
* @param pair
* @returns {Promise<(any[])[]>}
* @private
*/
static _remapBidAsks(list, pair) {
return (list || []).map((item) => {
const amount = item.amount.getTokens();
const price = item.price.getTokens();
const total = amount.times(price);
return {
amount: amount.toFixed(pair.amountAsset.precision),
price: price.toFixed(pair.priceAsset.precision),
total: total.toFixed(pair.priceAsset.precision)
};
});
}
/**
* @param {Array} bids
* @param {Array} asks
* @returns {Matcher.ISpread}
* @private
*/
static _getSpread(bids, asks) {
const [lastAsk] = asks;
const [firstBid] = bids;
const sell = new BigNumber(firstBid && firstBid.price);
const buy = new BigNumber(lastAsk && lastAsk.price);
const percent = (buy.gt(0)) ? buy.minus(sell).times(100).div(buy) : new BigNumber(0);
return firstBid && lastAsk && {
lastAsk,
firstBid,
buy,
sell,
percent
} || null;
}
=======
>>>>>>>
/**
* @private
*/
_handleLogin() {
user.changeSetting.on(this._onUserChangeSetting, this);
user.logoutSignal.once(this._handleLogout, this);
}
/**
* @private
*/
_handleLogout() {
user.changeSetting.off(this._onUserChangeSetting);
user.loginSignal.once(this._handleLogin, this);
}
_onUserChangeSetting(path) {
if (path === 'network.matcher') {
this._updateCurrentMatcherAddress();
}
} |
<<<<<<<
createCollection,
createDiagram,
deleteCollection,
deleteDiagram,
deleteEntity,
queryCollections,
queryDiagrams,
queryEntities,
queryNotifications,
=======
queryCollections,
queryEntities,
queryNotifications,
>>>>>>>
queryCollections,
queryDiagrams,
queryEntities,
queryNotifications,
<<<<<<<
[queryDiagrams.START]: (state, { query }) => resultLoadStart(state, query),
[queryDiagrams.ERROR]: (state, {
error, args: { query },
}) => resultLoadError(state, query, error),
[queryDiagrams.COMPLETE]: updateResults,
// Clear out the results cache when operations are performed that
// may affect the content of the results.
[createCollection.COMPLETE]: invalidateResults,
[createDiagram.COMPLETE]: invalidateResults,
[deleteCollection.COMPLETE]: invalidateResults,
[deleteDiagram.COMPLETE]: invalidateResults,
[deleteEntity.COMPLETE]: invalidateResults,
TRIGGER_COLLECTION_RELOAD: invalidateResults,
=======
>>>>>>>
[queryDiagrams.START]: (state, { query }) => resultLoadStart(state, query),
[queryDiagrams.ERROR]: (state, {
error, args: { query },
}) => resultLoadError(state, query, error),
[queryDiagrams.COMPLETE]: updateResults, |
<<<<<<<
import { queryEntitySets, fetchEntitySet, fetchProfile, updateEntitySet, createEntitySetMutate, createEntitySetNoMutate, deleteEntitySet } from 'actions';
import { objectLoadStart, objectLoadComplete, objectLoadError, objectDelete, resultObjects } from 'reducers/util';
=======
import { queryEntitySets, fetchEntitySet, updateEntitySet, createEntitySetMutate, createEntitySetNoMutate, deleteEntitySet } from 'actions';
import { objectLoadComplete, objectLoadError, objectLoadStart, objectDelete, resultObjects } from 'reducers/util';
>>>>>>>
import { queryEntitySets, fetchEntitySet, fetchProfile, updateEntitySet, createEntitySetMutate, createEntitySetNoMutate, deleteEntitySet } from 'actions';
import { objectLoadComplete, objectLoadError, objectLoadStart, objectDelete, resultObjects } from 'reducers/util';
<<<<<<<
[fetchEntitySet.START]: (state, {
id
}) => objectLoadStart(state, id),
=======
[fetchEntitySet.START]: (state, { id }) => objectLoadStart(state, id),
>>>>>>>
[fetchEntitySet.START]: (state, { id }) => objectLoadStart(state, id),
<<<<<<<
id, data,
}) => objectLoadComplete(state, id, data),
[fetchProfile.START]: (state, {
id
}) => objectLoadStart(state, id),
[fetchProfile.ERROR]: (state, {
error, args,
}) => objectLoadError(state, args, error),
[fetchProfile.COMPLETE]: (state, {
id, data,
}) => objectLoadComplete(state, id, data),
=======
id, data,
}) => objectLoadComplete(state, id, data),
>>>>>>>
id, data,
}) => objectLoadComplete(state, id, data),
[fetchProfile.START]: (state, {
id
}) => objectLoadStart(state, id),
[fetchProfile.ERROR]: (state, {
error, args,
}) => objectLoadError(state, args, error),
[fetchProfile.COMPLETE]: (state, {
id, data,
}) => objectLoadComplete(state, id, data), |
<<<<<<<
import { queryNotifications } from './notificationActions';
import { fetchFacet } from './facetActions';
import { fetchDocument, queryDocumentRecords } from './documentActions';
=======
import { queryNotifications, deleteNotifications } from './notificationActions';
import {
fetchDocument,
queryDocumentRecords,
fetchDocumentPage
} from './documentActions';
>>>>>>>
import { queryNotifications } from './notificationActions';
import { fetchDocument, queryDocumentRecords } from './documentActions';
import { queryNotifications, deleteNotifications } from './notificationActions';
import {
fetchDocument,
queryDocumentRecords,
fetchDocumentPage
} from './documentActions';
<<<<<<<
queryNotifications,
createCollection,
deleteCollection
=======
queryNotifications,
deleteNotifications
>>>>>>>
queryNotifications,
createCollection,
deleteCollection,
deleteNotifications |
<<<<<<<
import collectionDiagrams from './collectionDiagrams';
=======
import collectionStatistics from './collectionStatistics';
>>>>>>>
import collectionDiagrams from './collectionDiagrams';
import collectionStatistics from './collectionStatistics';
<<<<<<<
collectionDiagrams,
=======
collectionStatistics,
>>>>>>>
collectionDiagrams,
collectionStatistics, |
<<<<<<<
var request = require('request');
var cheerio = require('cheerio');
var async = require('async');
var url = require('url');
var fs = require('fs');
var ejs = require('ejs');
var wiki = require('./wiki');
var timeline = require('./timeline');
var route = {};
route.params = {
is_front: 0,
header_title: '怒政事件紀錄簿',
meta_desc: '',
page_title: '怒政事件紀錄簿',
mission: '那些年，我們一起憤怒的政客、政策、政績 ...',
timeline: {
source: 'https://docs.google.com/spreadsheet/pub?key=0AuwTztKH2tKidGZ2cEdVY19PZEpzRWVJWWZOeUI1Y0E&output=html',
start_at_end: false,
start_zoom_adjust: 1
}
};
route.run = function(req, res){
route.params_default = this.params;
var path = url.parse(decodeURIComponent(req.url));
var t = this.get('timeline');
t.start_at_end = 'false';
this.put('is_front', 0);
// see which path we need to follow
// we suppose all the data format is json
// var arg0 = path.pathname.match(/^\/[^\/]+/); // not use this yet
var key = path.pathname.replace(/^\/[^\/]+\/|\.[^\/]+$/g, '').replace('/','');
var ext = path.pathname.lastIndexOf('.') === -1 ? null : path.pathname.split('.').pop();
if(!ext && key){
var jsonpath = '/wiki/'+key+'.json';
this.put('page_title', key);
t.source = jsonpath;
this.put('timeline', t);
var have_cache = fs.existsSync('public/cache'+jsonpath);
if(have_cache){
this.end(res, 'timeline');
}
else{
var preload = 'http://' + req.headers.host + jsonpath;
request(preload, function (error, response, data) {
if(!error) {
route.end(res, 'timeline', data);
}
});
}
}
else
if(ext === 'json'){
timeline.init();
async.parallel({
w: function wr(callback){
wiki.request(key, callback);
},
wcoord: function wc(callback){
setTimeout(function wrt(){
wiki.requestCoord(key, callback);
}, 500);
}
/*
,
f: function fr(flickr.request){
setTimeout(function frt(){
flickr.request(path.pathname);
}, 300);
}
*/
},
function endParallel(err, results) {
if(err){
this.end(res, 'error');
}
else{
var json = timeline.exportjson();
fs.writeFile('./public/cache/wiki/'+key+'.json', json);
route.end(res, 'json', json, {"Content-Type": "text/json"});
}
});
}
else{
t.start_at_end = 'true';
t.source = 'https://docs.google.com/spreadsheet/pub?key=0AuwTztKH2tKidGZ2cEdVY19PZEpzRWVJWWZOeUI1Y0E&output=html';
this.put('timeline', t);
this.put('page_title', '怒政事件紀錄簿');
this.put('is_front', 1);
this.end(res, 'timeline');
}
}
route.put = function(name, value){
route.params[name] = value;
}
route.get = function(name){
return route.params[name];
}
route.end = function(res, template, html, head){
if(template !== 'json'){
var page = fs.readFileSync('templates/'+template+'.ejs', 'utf-8');
var html = ejs.render(page, this.params);
}
if(!head){
head = {"Content-Type": "text/html"};
}
res.writeHead(200, head);
res.end(html);
}
module.exports = route;
=======
var request = require('request');
var cheerio = require('cheerio');
var async = require('async');
var url = require('url');
var path = require('path');
var fs = require('fs');
var ejs = require('ejs');
var wiki = require('./wiki');
var timeline = require('./timeline');
var mimeTypes = {
"html": "text/html",
"jpeg": "image/jpeg",
"jpg": "image/jpeg",
"png": "image/png",
"js": "text/javascript",
"css": "text/css",
"json": "text/json"
};
var route = {};
route.params = {
header_title: '怒政事件紀錄簿',
meta_desc: '',
page_title: '怒政事件紀錄簿',
mission: '那些年，我們一起憤怒的政客、政策、政績 ...',
timeline: {
source: 'https://docs.google.com/spreadsheet/pub?key=0AuwTztKH2tKidGZ2cEdVY19PZEpzRWVJWWZOeUI1Y0E&output=html',
start_at_end: false,
start_zoom_adjust: 1
}
};
route.run = function(req, res, port){
route.params_default = this.params;
var p = url.parse(decodeURIComponent(req.url));
var t = this.get('timeline');
t.start_at_end = 'false';
// see which path we need to follow
// we suppose all the data format is json
// var arg0 = path.pathname.match(/^\/[^\/]+/); // not use this yet
var key = p.pathname.replace(/^\/[^\/]+\/|\.[^\/]+$/g, '').replace('/','');
var ext = p.pathname.lastIndexOf('.') === -1 ? null : p.pathname.split('.').pop();
if(!ext && key){
var jsonpath = '/wiki/'+key+'.json';
this.put('page_title', key);
t.source = jsonpath;
this.put('timeline', t);
var have_cache = fs.existsSync('public/cache'+jsonpath);
if(have_cache){
this.end(res, 'timeline');
}
else{
var preload = 'http://' + req.headers.host + jsonpath;
request(preload, function (error, response, data) {
if(!error) {
route.end(res, 'timeline', data);
}
});
}
}
else
if(ext && ext !== 'json'){
var uri = url.parse(req.url).pathname;
var filename = path.join(process.cwd(), 'public', uri);
fs.exists(filename, function(exists) {
if(!exists) {
console.log("not exists: " + filename);
res.writeHead(200, {'Content-Type': 'text/plain'});
res.write('404 Not Found\n');
res.end();
}
var mimeType = mimeTypes[path.extname(filename).split(".")[1]];
res.writeHead(200, mimeType);
var fileStream = fs.createReadStream(filename);
fileStream.pipe(res);
});
}
else
if(ext === 'json'){
timeline.init();
async.parallel({
w: function wr(callback){
wiki.request(key, callback);
},
wcoord: function wc(callback){
setTimeout(function wrt(){
wiki.requestCoord(key, callback);
}, 500);
}
/*
,
f: function fr(flickr.request){
setTimeout(function frt(){
flickr.request(path.pathname);
}, 300);
}
*/
},
function endParallel(err, results) {
if(err){
this.end(res, 'error');
}
else{
var json = timeline.exportjson();
fs.writeFile('./public/cache/wiki/'+key+'.json', json);
route.end(res, 'json', json, {"Content-Type": "text/json"});
}
});
}
else{
t.start_at_end = 'true';
t.source = 'https://docs.google.com/spreadsheet/pub?key=0AuwTztKH2tKidGZ2cEdVY19PZEpzRWVJWWZOeUI1Y0E&output=html';
this.put('timeline', t);
this.put('page_title', '怒政事件紀錄簿');
this.end(res, 'timeline');
}
}
route.put = function(name, value){
route.params[name] = value;
}
route.get = function(name){
return route.params[name];
}
route.end = function(res, template, html, head){
if(template !== 'json'){
var page = fs.readFileSync('templates/'+template+'.ejs', 'utf-8');
var html = ejs.render(page, this.params);
}
if(!head){
head = {"Content-Type": "text/html"};
}
res.writeHead(200, head);
res.end(html);
}
module.exports = route;
>>>>>>>
var request = require('request');
var cheerio = require('cheerio');
var async = require('async');
var url = require('url');
var path = require('path');
var fs = require('fs');
var ejs = require('ejs');
var wiki = require('./wiki');
var timeline = require('./timeline');
var mimeTypes = {
"html": "text/html",
"jpeg": "image/jpeg",
"jpg": "image/jpeg",
"png": "image/png",
"js": "text/javascript",
"css": "text/css",
"json": "text/json"
};
var route = {};
route.params = {
is_front: 0,
header_title: '怒政事件紀錄簿',
meta_desc: '',
page_title: '怒政事件紀錄簿',
mission: '那些年，我們一起憤怒的政客、政策、政績 ...',
timeline: {
source: 'https://docs.google.com/spreadsheet/pub?key=0AuwTztKH2tKidGZ2cEdVY19PZEpzRWVJWWZOeUI1Y0E&output=html',
start_at_end: false,
start_zoom_adjust: 1
}
};
route.run = function(req, res){
route.params_default = this.params;
var p = url.parse(decodeURIComponent(req.url));
var t = this.get('timeline');
t.start_at_end = 'false';
this.put('is_front', 0);
// see which path we need to follow
// we suppose all the data format is json
// var arg0 = path.pathname.match(/^\/[^\/]+/); // not use this yet
var key = p.pathname.replace(/^\/[^\/]+\/|\.[^\/]+$/g, '').replace('/','');
var ext = p.pathname.lastIndexOf('.') === -1 ? null : p.pathname.split('.').pop();
if(!ext && key){
var jsonpath = '/wiki/'+key+'.json';
this.put('page_title', key);
t.source = jsonpath;
this.put('timeline', t);
var have_cache = fs.existsSync('public/cache'+jsonpath);
if(have_cache){
this.end(res, 'timeline');
}
else{
var preload = 'http://' + req.headers.host + jsonpath;
request(preload, function (error, response, data) {
if(!error) {
route.end(res, 'timeline', data);
}
});
}
}
else
if(ext && ext !== 'json'){
var uri = url.parse(req.url).pathname;
var filename = path.join(process.cwd(), 'public', uri);
fs.exists(filename, function(exists) {
if(!exists) {
console.log("not exists: " + filename);
res.writeHead(200, {'Content-Type': 'text/plain'});
res.write('404 Not Found\n');
res.end();
}
var mimeType = mimeTypes[path.extname(filename).split(".")[1]];
res.writeHead(200, mimeType);
var fileStream = fs.createReadStream(filename);
fileStream.pipe(res);
});
}
else
if(ext === 'json'){
timeline.init();
async.parallel({
w: function wr(callback){
wiki.request(key, callback);
},
wcoord: function wc(callback){
setTimeout(function wrt(){
wiki.requestCoord(key, callback);
}, 500);
}
/*
,
f: function fr(flickr.request){
setTimeout(function frt(){
flickr.request(path.pathname);
}, 300);
}
*/
},
function endParallel(err, results) {
if(err){
this.end(res, 'error');
}
else{
var json = timeline.exportjson();
fs.writeFile('./public/cache/wiki/'+key+'.json', json);
route.end(res, 'json', json, {"Content-Type": "text/json"});
}
});
}
else{
t.start_at_end = 'true';
t.source = 'https://docs.google.com/spreadsheet/pub?key=0AuwTztKH2tKidGZ2cEdVY19PZEpzRWVJWWZOeUI1Y0E&output=html';
this.put('timeline', t);
this.put('page_title', '怒政事件紀錄簿');
this.put('is_front', 1);
this.end(res, 'timeline');
}
}
route.put = function(name, value){
route.params[name] = value;
}
route.get = function(name){
return route.params[name];
}
route.end = function(res, template, html, head){
if(template !== 'json'){
var page = fs.readFileSync('templates/'+template+'.ejs', 'utf-8');
var html = ejs.render(page, this.params);
}
if(!head){
head = {"Content-Type": "text/html"};
}
res.writeHead(200, head);
res.end(html);
}
module.exports = route; |
<<<<<<<
<div>
<Statistics />
<div className="row">
<div className="col-md-3">
<Doughnut title="Member Status" data={ memberStatus } />
</div>
<div className="col-md-3">
<Doughnut title="Node Status" data={ nodeStatus } />
</div>
<div className="col-md-3">
<Doughnut title="Job Status" data={ jobStatus } />
</div>
<div className="col-md-3">
<Doughnut title="Job Type" data={ jobTypes } />
</div>
=======
<div>
<Statistics />
<div className="row">
<div className="col-md-3">
<Doughnut title="Server Status" data={memberStatus} />
</div>
<div className="col-md-3">
<Doughnut title="Client Status" data={nodeStatus} />
</div>
<div className="col-md-3">
<Doughnut title="Job Status" data={jobStatus} />
</div>
<div className="col-md-3">
<Doughnut title="Job Type" data={jobTypes} />
</div>
</div>
<Events />
>>>>>>>
<div>
<Statistics />
<div className="row">
<div className="col-md-3">
<Doughnut title="Server Status" data={ memberStatus } />
</div>
<div className="col-md-3">
<Doughnut title="Client Status" data={ nodeStatus } />
</div>
<div className="col-md-3">
<Doughnut title="Job Status" data={ jobStatus } />
</div>
<div className="col-md-3">
<Doughnut title="Job Type" data={ jobTypes } />
</div> |
<<<<<<<
describe('CucumberExpressionGenerator', () => {
=======
describe(CucumberExpressionGenerator.name, () => {
>>>>>>>
describe('CucumberExpressionGenerator', () => {
<<<<<<<
it("generates expression for custom type", () => {
parameterTypeRegistry.defineParameterType(new ParameterType(
'currency',
Currency,
'[A-Z]{3}',
false,
null
))
=======
it('generates expression for custom type', () => {
parameterTypeRegistry.defineParameterType(
new ParameterType('currency', Currency, '[A-Z]{3}', null)
)
>>>>>>>
it('generates expression for custom type', () => {
parameterTypeRegistry.defineParameterType(
new ParameterType('currency', Currency, '[A-Z]{3}', false, null)
)
<<<<<<<
it("prefers leftmost match when there is overlap", () => {
parameterTypeRegistry.defineParameterType(new ParameterType(
'currency',
Currency,
'cd',
false,
null
))
parameterTypeRegistry.defineParameterType(new ParameterType(
'date',
Date,
'bc',
false,
null
))
=======
it('prefers leftmost match when there is overlap', () => {
parameterTypeRegistry.defineParameterType(
new ParameterType('currency', Currency, 'cd', null)
)
parameterTypeRegistry.defineParameterType(
new ParameterType('date', Date, 'bc', null)
)
>>>>>>>
it('prefers leftmost match when there is overlap', () => {
parameterTypeRegistry.defineParameterType(
new ParameterType('currency', Currency, 'cd', false, null)
)
parameterTypeRegistry.defineParameterType(
new ParameterType('date', Date, 'bc', false, null)
)
<<<<<<<
// TODO: prefers widest match
it("generates all combinations of expressions when several parameter types match", () => {
parameterTypeRegistry.defineParameterType(new ParameterType(
"currency",
null,
"x",
false,
null
));
parameterTypeRegistry.defineParameterType(new ParameterType(
"date",
null,
"x",
false,
null
))
const generatedExpressions = generator.generateExpressions("I have x and x and another x");
const expressions = generatedExpressions.map(e => e.source)
assert.deepEqual(expressions, [
"I have {currency} and {currency} and another {currency}",
"I have {currency} and {currency} and another {date}",
"I have {currency} and {date} and another {currency}",
"I have {currency} and {date} and another {date}",
"I have {date} and {currency} and another {currency}",
"I have {date} and {currency} and another {date}",
"I have {date} and {date} and another {currency}",
"I have {date} and {date} and another {date}"
])
})
it("exposes parameter type names in generated expression", () => {
const expression = generator.generateExpression("I have 2 cukes and 1.5 euro")
=======
it('exposes parameter type names in generated expression', () => {
const expression = generator.generateExpression(
'I have 2 cukes and 1.5 euro'
)
>>>>>>>
// TODO: prefers widest match
it('generates all combinations of expressions when several parameter types match', () => {
parameterTypeRegistry.defineParameterType(
new ParameterType('currency', null, 'x', false, null)
)
parameterTypeRegistry.defineParameterType(
new ParameterType('date', null, 'x', false, null)
)
const generatedExpressions = generator.generateExpressions(
'I have x and x and another x'
)
const expressions = generatedExpressions.map(e => e.source)
assert.deepEqual(expressions, [
'I have {currency} and {currency} and another {currency}',
'I have {currency} and {currency} and another {date}',
'I have {currency} and {date} and another {currency}',
'I have {currency} and {date} and another {date}',
'I have {date} and {currency} and another {currency}',
'I have {date} and {currency} and another {date}',
'I have {date} and {date} and another {currency}',
'I have {date} and {date} and another {date}',
])
})
it('exposes parameter type names in generated expression', () => {
const expression = generator.generateExpression(
'I have 2 cukes and 1.5 euro'
) |
<<<<<<<
let expressionTemplate = ""
=======
const parameterTypes = []
const usageByTypeName = {}
let expression = ''
>>>>>>>
let expressionTemplate = ''
<<<<<<<
matchingParameterTypeMatchers = matchingParameterTypeMatchers.sort(ParameterTypeMatcher.compare)
// Find all the best parameter type matchers, they are all candidates.
=======
matchingParameterTypeMatchers = matchingParameterTypeMatchers.sort(
ParameterTypeMatcher.compare
)
>>>>>>>
matchingParameterTypeMatchers = matchingParameterTypeMatchers.sort(
ParameterTypeMatcher.compare
)
// Find all the best parameter type matchers, they are all candidates.
<<<<<<<
for (const parameterType of this._parameterTypeRegistry.parameterTypes) {
parameterMatchers = parameterMatchers.concat(this._createParameterTypeMatchers2(parameterType, text))
=======
for (const parameter of this._parameterTypeRegistry.parameterTypes) {
parameterMatchers = parameterMatchers.concat(
this._createParameterTypeMatchers2(parameter, text)
)
>>>>>>>
for (const parameterType of this._parameterTypeRegistry.parameterTypes) {
parameterMatchers = parameterMatchers.concat(
this._createParameterTypeMatchers2(parameterType, text)
) |
<<<<<<<
describe('getActionsOnBoard', function() {
var get;
beforeEach(function (done) {
sinon.stub(restler, 'get', function (uri, options) {
return {once: function (event, callback) {
callback(null, null);
}};
});
trello.getActionsOnBoard('boardId', function () {
get = restler.get;
done();
});
});
it('should get to https://api.trello.com/1/boards/boardId/actions', function () {
get.should.have.been.calledWith('https://api.trello.com/1/boards/boardId/actions');
});
afterEach(function () {
restler.get.restore();
});
});
=======
describe('getCustomFieldsOnBoard', function() {
var get;
beforeEach(function (done) {
sinon.stub(restler, 'get', function (uri, options) {
return {once: function (event, callback) {
callback(null, null);
}};
});
trello.getCustomFieldsOnBoard('boardId', function () {
get = restler.get;
done();
});
});
it('should get to https://api.trello.com/1/boards/boardId/customFields', function () {
get.should.have.been.calledWith('https://api.trello.com/1/boards/boardId/customFields');
});
afterEach(function () {
restler.get.restore();
});
});
>>>>>>>
describe('getActionsOnBoard', function() {
var get;
beforeEach(function (done) {
sinon.stub(restler, 'get', function (uri, options) {
return {once: function (event, callback) {
callback(null, null);
}};
});
trello.getActionsOnBoard('boardId', function () {
get = restler.get;
done();
});
});
it('should get to https://api.trello.com/1/boards/boardId/actions', function () {
get.should.have.been.calledWith('https://api.trello.com/1/boards/boardId/actions');
});
afterEach(function () {
restler.get.restore();
});
});
describe('getCustomFieldsOnBoard', function() {
var get;
beforeEach(function (done) {
sinon.stub(restler, 'get', function (uri, options) {
return {once: function (event, callback) {
callback(null, null);
}};
});
trello.getCustomFieldsOnBoard('boardId', function () {
get = restler.get;
done();
});
});
it('should get to https://api.trello.com/1/boards/boardId/customFields', function () {
get.should.have.been.calledWith('https://api.trello.com/1/boards/boardId/customFields');
});
afterEach(function () {
restler.get.restore();
});
}); |
<<<<<<<
export default class Node {
constructor ( file, content ) {
this.file = path.resolve( file );
this.content = content || null; // sometimes exists in sourcesContent, sometimes doesn't
=======
var Node = function ( file, content ) {
this.file = file ? path.resolve( file ) : null;
this.content = content || null; // sometimes exists in sourcesContent, sometimes doesn't
>>>>>>>
export default class Node {
constructor ( file, content ) {
this.file = path.resolve( file );
this.content = content || null; // sometimes exists in sourcesContent, sometimes doesn't
<<<<<<<
this.sourcesContentByPath = {};
}
=======
this._stats = {
decodingTime: 0,
encodingTime: 0,
tracingTime: 0,
untraceable: 0
};
this.sourcesContentByPath = {};
};
>>>>>>>
this._stats = {
decodingTime: 0,
encodingTime: 0,
tracingTime: 0,
untraceable: 0
};
this.sourcesContentByPath = {};
}
<<<<<<<
return trace( this, oneBasedLineIndex - 1, zeroBasedColumnIndex, null );
}
=======
return traceMapping( this, oneBasedLineIndex - 1, zeroBasedColumnIndex, null );
},
>>>>>>>
return traceMapping( this, oneBasedLineIndex - 1, zeroBasedColumnIndex, null );
} |
<<<<<<<
// @include ./ui/views/dialog.js
=======
// @include ./ui/views/toggle.js
>>>>>>>
// @include ./ui/views/dialog.js
// @include ./ui/views/toggle.js |
<<<<<<<
if(obj.model.record[prop].type === 'M.Date') {}
console.log(obj.model.record[prop]);
var recordPropValue = (obj.model.record[prop].type === 'M.Date') ? obj.model.record[prop].toJSON() : obj.model.record[prop];
=======
var recordPropValue = (obj.model.record[prop2].type === 'M.Date') ? obj.model.record[prop2].toJSON() : obj.model.record[prop2];
>>>>>>>
if(obj.model.record[prop].type === 'M.Date') {}
console.log(obj.model.record[prop]);
var recordPropValue = (obj.model.record[prop2].type === 'M.Date') ? obj.model.record[prop2].toJSON() : obj.model.record[prop2]; |
<<<<<<<
expect(spySerializerToDatastore.getCall(0).args[0].className).equal('Entity');
expect(spySerializerToDatastore.getCall(0).args[0].excludeFromIndexes).equal(model.excludeFromIndexes);
=======
expect(spySerializerToDatastore.getCall(0).args[0].entityData).equal(model.entityData);
expect(spySerializerToDatastore.getCall(0).args[0].excludeFromIndexes).equal(model.excludeFromIndexes);
>>>>>>>
expect(spySerializerToDatastore.getCall(0).args[0].className).equal('Entity');
expect(spySerializerToDatastore.getCall(0).args[0].entityData).equal(model.entityData);
expect(spySerializerToDatastore.getCall(0).args[0].excludeFromIndexes).equal(model.excludeFromIndexes);
<<<<<<<
=======
assert.isDefined(model.gstore.ds.save.getCall(0).args[0].excludeFromIndexes);
>>>>>>> |
<<<<<<<
const geoKeyDirectory = {};
for (let i = 4; i < rawGeoKeyDirectory[3] * 4; i += 4) {
const key = geoKeyNames[rawGeoKeyDirectory[i]];
const location = (rawGeoKeyDirectory[i + 1]) ?
(fieldTagNames[rawGeoKeyDirectory[i + 1]]) : null;
const count = rawGeoKeyDirectory[i + 2];
const offset = rawGeoKeyDirectory[i + 3];
=======
var geoKeyDirectory = {};
for (var i = 4; i <= rawGeoKeyDirectory[3] * 4; i += 4) {
var key = geoKeyNames[rawGeoKeyDirectory[i]],
location = (rawGeoKeyDirectory[i+1]) ? (fieldTagNames[rawGeoKeyDirectory[i+1]]) : null,
count = rawGeoKeyDirectory[i+2],
offset = rawGeoKeyDirectory[i+3];
>>>>>>>
const geoKeyDirectory = {};
for (let i = 4; i <= rawGeoKeyDirectory[3] * 4; i += 4) {
const key = geoKeyNames[rawGeoKeyDirectory[i]];
const location = (rawGeoKeyDirectory[i + 1]) ?
(fieldTagNames[rawGeoKeyDirectory[i + 1]]) : null;
const count = rawGeoKeyDirectory[i + 2];
const offset = rawGeoKeyDirectory[i + 3]; |
<<<<<<<
it('should correctly run the "test" task and and return the result', function (finished) {
var sandcastle = new SandCastle();
var script = sandcastle.createScript("\
exports = {\
onTestTask: function (data) {\
if (data.count > 1) {\
exit(data);\
}\
else {\
runTask('test', data);\
}\
},\
main: function() {\
runTask('test', {count: 0});\
}\
}\
");
script.on('task', function (err, options, methodName, callback) {
options.count++;
equal(methodName, 'main');
return callback(options);
});
script.on('exit', function (err, result) {
equal(result.count, 2);
sandcastle.kill();
finished();
});
script.run();
});
=======
it('should allow api to see globals',function(finished){
var sandcastle = new SandCastle({
api: './examples/contextObjectApi.js'
});
var script = sandcastle.createScript("\
exports.main = function() {\n\
var globalState = {};\n\
if(typeof state === \"undefined\"){\n\
globalState = 'none';\n\
}\n\
else{\n\
globalState = state;\n\
}\n\
exit({\n\
globalState:globalState,\n\
apiState:stateManager.getState()\n\
});\n\
}\n");
script.on('exit', function(err, result) {
equal(result.globalState, 'none');
equal(result.apiState.key, 'val');
sandcastle.kill();
finished();
});
script.run({state:{key:'val'}});
});
>>>>>>>
it('should allow api to see globals',function(finished){
var sandcastle = new SandCastle({
api: './examples/contextObjectApi.js'
});
var script = sandcastle.createScript("\
exports.main = function() {\n\
var globalState = {};\n\
if(typeof state === \"undefined\"){\n\
globalState = 'none';\n\
}\n\
else{\n\
globalState = state;\n\
}\n\
exit({\n\
globalState:globalState,\n\
apiState:stateManager.getState()\n\
});\n\
}\n");
script.on('exit', function(err, result) {
equal(result.globalState, 'none');
equal(result.apiState.key, 'val');
sandcastle.kill();
finished();
});
script.run({state:{key:'val'}});
});
it('should correctly run the "test" task and and return the result', function (finished) {
var sandcastle = new SandCastle();
var script = sandcastle.createScript("\
exports = {\
onTestTask: function (data) {\
if (data.count > 1) {\
exit(data);\
}\
else {\
runTask('test', data);\
}\
},\
main: function() {\
runTask('test', {count: 0});\
}\
}\
");
script.on('task', function (err, options, methodName, callback) {
options.count++;
equal(methodName, 'main');
return callback(options);
});
script.on('exit', function (err, result) {
equal(result.count, 2);
sandcastle.kill();
finished();
});
script.run();
}); |
<<<<<<<
return {
logLevel: "warn",
version: '0.1.34',
minNativeAppVersion: '0.1.9'
};
});
=======
this.ENV = {
logLevel: "warn",
version: '0.1.36',
minNativeAppVersion: '0.1.9'
};
>>>>>>>
return {
logLevel: "warn",
version: '0.1.36',
minNativeAppVersion: '0.1.9'
};
}); |
<<<<<<<
module.exports.isVisibleFile = (path) => {
const pathParts = path.split('/');
return !/^\./.test(pathParts.pop());
};
module.exports.isSubDirectory = isSubDirectory;
=======
module.exports.isSubDirectory = isSubDirectory;
module.exports.pathDepth = (dir) => {
return splitPath(dir).length;
};
>>>>>>>
module.exports.isVisibleFile = (path) => {
const pathParts = path.split('/');
return !/^\./.test(pathParts.pop());
};
module.exports.isSubDirectory = isSubDirectory;
module.exports.pathDepth = (dir) => {
return splitPath(dir).length;
}; |
<<<<<<<
=======
var Zlib = require("zlib");
var MultiPart = require('multipart-parser');
>>>>>>>
<<<<<<<
=======
internals.unwrap = function (payload, encoding, req, callback) {
req.rawBody = payload;
return callback(null, payload);
};
internals.unwrapGzip = function (payload, encoding, req, callback) {
Zlib.unzip(new Buffer(payload, encoding), function (err, buffer) {
if (err) {
return callback(err);
}
var newPayload = buffer.toString();
req.rawBody = newPayload;
return callback(null, newPayload);
});
};
internals.multipartParser = function(contentType) {
var boundary = contentType ? contentType.split(';')[1] : '';
boundary = boundary.substring(boundary.indexOf('=') + 1);
return function(result) {
var parsedParts = [];
MultiPart.create(boundary)
.on('part', function(part) {
parsedParts.push(part);
})
.on('error', function(err) {
parsedParts.push(err);
})
.write(new Buffer(result));
return parsedParts;
};
};
>>>>>>>
internals.multipartParser = function(contentType) {
var boundary = contentType ? contentType.split(';')[1] : '';
boundary = boundary.substring(boundary.indexOf('=') + 1);
return function(result) {
var parsedParts = [];
MultiPart.create(boundary)
.on('part', function(part) {
parsedParts.push(part);
})
.on('error', function(err) {
parsedParts.push(err);
})
.write(new Buffer(result));
return parsedParts;
};
}; |
<<<<<<<
const { URL, URLSearchParams } = require('url');
// Load modules
=======
>>>>>>>
const { URL, URLSearchParams } = require('url'); |
<<<<<<<
var params = Object.keys(config.query);
// var params = Object.keys(request.query)
var submitted = Utils.clone(request.query);
=======
var params = Object.keys(config.query || {});
>>>>>>>
var params = Object.keys(config.query || {});
var submitted = Utils.clone(request.query);
<<<<<<<
var completed = {};
for(var i in params) {
=======
for (var i in params) {
>>>>>>>
var completed = {};
for(var i in params) {
<<<<<<<
for(var j in validators) {
=======
for (var j in validators) {
>>>>>>>
for(var j in validators) {
<<<<<<<
// Handle inputs that haven't been defined in query config
var processed = Object.keys(submitted);
if (processed.length > 0) {
isInvalid = true;
var plural = "";
var verb = "is"
if (processed.length > 1) {
plural = "s";
verb = "are";
}
var plural = (processed.length > 1 ? "s" : "");
invalidParam = "the parameter" + plural + " (" + processed + ") " + verb + " not allowed";
}
=======
>>>>>>>
// Handle inputs that haven't been defined in query config
var processed = Object.keys(submitted);
if (processed.length > 0) {
isInvalid = true;
var plural = "";
var verb = "is"
if (processed.length > 1) {
plural = "s";
verb = "are";
}
var plural = (processed.length > 1 ? "s" : "");
invalidParam = "the parameter" + plural + " (" + processed + ") " + verb + " not allowed";
} |
<<<<<<<
var funcs = [
// self.server._ext.onRequest() in Server
internals.authenticate,
internals.processDebug,
Validation.query,
State.parseCookies,
Payload.read,
internals.authValidatePayload,
Validation.payload,
Validation.path,
ext(self.server._ext.onPreHandler),
internals.handler, // Must not call next() with an Error
ext(self.server._ext.onPostHandler), // An error from here on will override any result set in handler()
Validation.response
];
var funcsIterator = function (func, next) {
func(self, next);
};
=======
>>>>>>> |
<<<<<<<
internals.authValidatePayload = function (request, next) {
var config = request._route.config.auth;
if (config.payload === 'none' || !request.session) {
return next();
}
else if (config.payload === 'optional' && (!request.session || !request.session.hash)) {
return next();
}
return request.server.auth.validatePayload(request, next);
};
internals.Request.prototype._generateResponse = function (result, onSend) {
if (result instanceof Stream === false &&
this.server.settings.format.payload) {
result = this.server.settings.format.payload(result);
}
return Response.generate(result, onSend);
};
=======
>>>>>>> |
<<<<<<<
const { URL, URLSearchParams } = require('url');
// Load modules
=======
const Url = require('url');
>>>>>>>
const { URL, URLSearchParams } = require('url'); |
<<<<<<<
const res = await server.inject('/?a=123');
expect(res.statusCode).to.equal(200);
expect(res.result).to.equal('a');
=======
server.inject('/?a=123', (res) => {
expect(res.statusCode).to.equal(200);
expect(res.result).to.equal(['a']);
done();
});
>>>>>>>
const res = await server.inject('/?a=123');
expect(res.statusCode).to.equal(200);
expect(res.result).to.equal(['a']);
<<<<<<<
it('ignores invalid input', async () => {
=======
it('fails on invalid input (with joi 11 error)', (done) => {
// Fake the joi 11 format
const joiFakeError = new Error();
joiFakeError.details = [{ path: ['foo', 'bar'] }];
const server = new Hapi.Server();
server.connection();
server.route({
method: 'GET',
path: '/',
handler: function (request, reply) {
return reply('ok');
},
config: {
validate: {
query: {
a: Joi.number().error(joiFakeError)
}
}
}
});
server.inject('/?a=abc', (res) => {
expect(res.statusCode).to.equal(400);
expect(res.result.validation).to.equal({
source: 'query',
keys: ['foo.bar']
});
done();
});
});
it('ignores invalid input', (done) => {
>>>>>>>
it('ignores invalid input', async () => {
<<<<<<<
const res = await server.inject({ method: 'POST', url: '/' });
expect(res.statusCode).to.equal(400);
expect(res.result.validation).to.equal({
source: 'payload',
keys: ['value']
=======
server.inject({ method: 'POST', url: '/' }, (res) => {
expect(res.statusCode).to.equal(400);
expect(res.result.validation).to.equal({
source: 'payload',
keys: ['']
});
done();
>>>>>>>
const res = await server.inject({ method: 'POST', url: '/' });
expect(res.statusCode).to.equal(400);
expect(res.result.validation).to.equal({
source: 'payload',
keys: [''] |
<<<<<<<
\-- Generic --| /-- Text
=======
\-- Generic --|--- Cache /-- Text ----|-- Directory
>>>>>>>
\-- Generic --| /-- Text ----|-- Directory |
<<<<<<<
=======
document.getElementById('convex').value = configData.convex;
var joints = configData.joints;
// Delete all existing slots
var existing = document.getElementsByClassName('joint-config');
while (existing.length > 0)
existing[0].parentNode.removeChild(existing[0]);
// Add slots for given joinst
var template = jointTemplate;
var exportForm = document.getElementById('export-settings');
for (var i = 0; i < joints.length; i++)
{
var fieldset = template.cloneNode(true);
fieldset.id = 'joint-config-' + String(i);
fieldset.dataset.jointId = joints[i].id;
fieldset.dataset.asBuilt = joints[i].asBuilt ? 'true' : 'false';
fieldset.dataset.sensors = JSON.stringify(joints[i].sensors);
// Highlight joint if hover for 0.5 seconds
(function(id){delayHover(fieldset, function () {
highlightJoint(id)
}, 200)}(fieldset.dataset.jointId));
var jointTitle = getElByClass(fieldset, 'joint-config-legend');
jointTitle.innerHTML = joints[i].name;
jointTitle.dataset.jointId = joints[i].id;
var jointImage = getElByClass(fieldset, 'joint-config-image');
jointImage.setAttribute("src",configData.tempIconDir+i+".png");
// Filter for angular or linear joints
var angularJointDiv = getElByClass(fieldset, 'angular-joint-div');
var linearJointDiv = getElByClass(fieldset, 'linear-joint-div');
var elsToHide = [];
if ((joints[i].type & JOINT_ANGULAR) != JOINT_ANGULAR)
{
elsToHide = elsToHide.concat(Array.from(fieldset.getElementsByClassName('angular-driver')));
elsToHide.push(angularJointDiv);
}
if ((joints[i].type & JOINT_LINEAR) != JOINT_LINEAR)
{
elsToHide = elsToHide.concat(Array.from(fieldset.getElementsByClassName('linear-driver')));
elsToHide.push(linearJointDiv);
}
for (var j = 0; j < elsToHide.length; j++)
elsToHide[j].style.display = 'none';
// Hide sensors button if joint is not angular
if ((joints[i].type & JOINT_LINEAR) == JOINT_LINEAR)
setVisible(getElByClass(fieldset, 'edit-sensors-button'), false);
// Set joint type
fieldset.dataset.joint_type = joints[i].type;
// Apply any existing configuration
applyDriverData(joints[i].driver, fieldset);
// Show or hide other elements
updateFieldOptions(fieldset);
// Add field to form
exportForm.appendChild(fieldset);
}
}
// Applies existing driver configuration to a field
function applyDriverData(driver, fieldset)
{
if (driver == null)
return;
getElByClass(fieldset, 'driver-type').value = driver.type;
getElByClass(fieldset, 'port-signal').value = driver.signal;
getElByClass(fieldset, 'port-number-one').value = driver.portOne;
getElByClass(fieldset, 'port-number-two').value = driver.portTwo;
if (driver.wheel != null)
{
getElByClass(fieldset, 'wheel-type').value = driver.wheel.type;
getElByClass(fieldset, 'is-drive-wheel').checked = driver.wheel.isDriveWheel;
if (driver.wheel.isDriveWheel)
getElByClass(fieldset, 'wheel-side').value = driver.portOne;
}
if (driver.pneumatic != null)
{
getElByClass(fieldset, 'pneumatic-width').value = driver.pneumatic.width;
getElByClass(fieldset, 'pneumatic-pressure').value = driver.pneumatic.pressure;
}
if (driver.type == DRIVER_ELEVATOR && driver.elevator != null)
{
getElByClass(fieldset, 'elevator-type').value = driver.elevator.type;
}
>>>>>>>
document.getElementById('convex').value = configData.convex;
<<<<<<<
var configData = { 'name': document.getElementById('name').value };
=======
var configData = {
'name': document.getElementById('name').value,
'convex': document.getElementById('convex').value
};
var joints = [];
var jointOptions = document.getElementsByClassName('joint-config');
for (var i = 0; i < jointOptions.length; i++)
{
var fieldset = jointOptions[i];
var joint = {
'driver': null,
'id': fieldset.dataset.jointId,
'asBuilt': fieldset.dataset.asBuilt == 'true',
'name': getElByClass(fieldset, 'joint-config-legend').innerHTML,
'type': parseInt(fieldset.dataset.joint_type),
'sensors': JSON.parse(fieldset.dataset.sensors)
};
var selectedDriver = parseInt(fieldset.getElementsByClassName('driver-type')[0].value);
if (selectedDriver > 0)
{
var signal = parseInt(getElByClass(fieldset, 'port-signal').querySelector('option:checked').dataset.portValue);
var portOne = parseInt(getElByClass(fieldset, 'port-number-one').value);
var portTwo = parseInt(getElByClass(fieldset, 'port-number-two').value);
joint.driver = createDriver(selectedDriver, signal, portOne, portTwo);
if ((joint.type & JOINT_ANGULAR) == JOINT_ANGULAR)
{
var selectedWheel = parseInt(getElByClass(fieldset, 'wheel-type').value);
if (selectedWheel > 0)
{
var isDriveWheel = getElByClass(fieldset, 'is-drive-wheel').checked;
joint.driver.wheel = createWheel(selectedWheel, FRICTION_MEDIUM, isDriveWheel);
if (isDriveWheel)
{
joint.driver.signal = PWM;
joint.driver.portOne = parseInt(getElByClass(fieldset, 'wheel-side').value);
joint.driver.portTwo = parseInt(getElByClass(fieldset, 'wheel-side').value);
}
}
}
if ((joint.type & JOINT_LINEAR) == JOINT_LINEAR)
{
if (selectedDriver == DRIVER_BUMPER_PNEUMATIC ||
selectedDriver == DRIVER_RELAY_PNEUMATIC)
{
var width = parseInt(getElByClass(fieldset, 'pneumatic-width').value);
var pressure = parseInt(getElByClass(fieldset, 'pneumatic-pressure').value);
joint.driver.pneumatic = createPneumatic(width, pressure);
}
else if (selectedDriver == DRIVER_ELEVATOR)
{
var type = parseInt(getElByClass(fieldset, 'elevator-type').value);
joint.driver.elevator = createElevator(type);
}
}
}
joints.push(joint);
}
configData.joints = joints;
>>>>>>>
var configData = {
'name': document.getElementById('name').value,
'convex': document.getElementById('convex').value
}; |
<<<<<<<
import renderer from "react-test-renderer";
import { AppContext, AppProvider, Container, withApp } from "../src";
import { createStageClass } from "../src/Stage";
import { appTestHook } from "../src/Stage";
import { render } from "../src/render";
=======
import { AppContext, AppProvider, Container, Stage, withApp } from "../src";
import { ReactPixiFiberAsPrimaryRenderer as ReactPixiFiber } from "../src/ReactPixiFiber";
import { createRender } from "../src/render";
>>>>>>>
import renderer from "react-test-renderer";
import { AppContext, AppProvider, Container, withApp } from "../src";
import { createStageClass } from "../src/Stage";
import { appTestHook } from "../src/Stage";
import { ReactPixiFiberAsPrimaryRenderer as ReactPixiFiber } from "../src/ReactPixiFiber";
import { createRender } from "../src/render"; |
<<<<<<<
import ReactPixiFiber from "../src/ReactPixiFiber";
import {
appTestHook,
createStageFunction,
=======
import Stage, {
>>>>>>>
import ReactPixiFiber from "../src/ReactPixiFiber";
import {
appTestHook,
createStageFunction,
<<<<<<<
describe("Stage (function)", () => {
=======
describe("Stage", () => {
const { __renderMock, __unmounMock } = require("../src/render");
>>>>>>>
describe("Stage (function)", () => {
const { __renderMock, __unmounMock } = require("../src/render");
<<<<<<<
expect(render).toHaveBeenCalledTimes(1);
expect(render).toHaveBeenCalledWith(
<AppProvider app={appTestHook}>{children}</AppProvider>,
stage
=======
expect(__renderMock).toHaveBeenCalledTimes(1);
expect(__renderMock).toHaveBeenCalledWith(
<AppProvider app={instance._app}>{children}</AppProvider>,
stage,
undefined,
instance
>>>>>>>
expect(__renderMock).toHaveBeenCalledTimes(1);
expect(__renderMock).toHaveBeenCalledWith(
<AppProvider app={appTestHook}>{children}</AppProvider>,
stage
<<<<<<<
expect(render).toHaveBeenCalledTimes(1);
expect(render).toHaveBeenCalledWith(
<AppProvider app={appTestHook}>{children2}</AppProvider>,
stage
=======
expect(__renderMock).toHaveBeenCalledTimes(1);
expect(__renderMock).toHaveBeenCalledWith(
<AppProvider app={instance._app}>{children2}</AppProvider>,
stage,
undefined,
instance
>>>>>>>
expect(__renderMock).toHaveBeenCalledTimes(1);
expect(__renderMock).toHaveBeenCalledWith(
<AppProvider app={appTestHook}>{children2}</AppProvider>,
stage
<<<<<<<
const { stage } = appTestHook;
unmount.mockClear();
=======
const instance = element.getInstance();
const stage = instance._app.stage;
__unmounMock.mockClear();
>>>>>>>
const { stage } = appTestHook;
__unmounMock.mockClear(); |
<<<<<<<
// There are nodes added
if (jq.length > 0) {
// Mute user
var thisUser = $(jq[0] && jq[0].children[1]).text();
if (mutedList.indexOf(thisUser) >= 0) {
$(jq[0]).hide();
// Remove spam
} else {
var msg = jq[0];
var msgText = msg.children[2].textContent;
if (isBotSpam(msgText)) $(msg).hide();
messageCount++;
removeOldMsgs();
findAndHideSpam();
}
=======
// cool we have a message.
var thisUser = $(jq[0].children[1]).text();
// Check if the user is muted.
if (mutedList.indexOf(thisUser) >= 0) {
// He is, hide the message.
$(jq[0]).hide();
} else {
// He isn't register an EH to mute the user on name-click.
$(jq[0].children[1]).click(function() {
// Check the user actually wants to mute this person.
if (confirm('You are about to mute ' + $(this).text() + ". Press OK to confirm.")) {
// Mute our user.
mutedList.push($(this).text());
$(this).css("text-decoration", "line-through");
$(this).hide();
}
// Output currently muted people in the console for debuggery.
console.log(mutedList);
});
>>>>>>>
// There are nodes added
if (jq.length > 0) {
// Mute user
// cool we have a message.
var thisUser = $(jq[0] && jq[0].children[1]).text();
// Check if the user is muted.
if (mutedList.indexOf(thisUser) >= 0) {
// He is, hide the message.
$(jq[0]).hide();
} else {
// He isn't register an EH to mute the user on name-click.
$(jq[0].children[1]).click(function() {
// Check the user actually wants to mute this person.
if (confirm('You are about to mute ' + $(this).text() + ". Press OK to confirm.")) {
// Mute our user.
mutedList.push($(this).text());
$(this).css("text-decoration", "line-through");
$(this).hide();
}
// Output currently muted people in the console for debuggery.
// console.log(mutedList);
}); |
<<<<<<<
selector: "exportAmdPackageEpilogueOn:",
fn: function (aStream){
var self=this;
return smalltalk.withContext(function($ctx1) {
var $1,$2;
$1=aStream;
_st($1)._nextPutAll_("});");
$2=_st($1)._lf();
return self}, function($ctx1) {$ctx1.fill(self,"exportAmdPackageEpilogueOn:",{aStream:aStream},smalltalk.Exporter)})},
messageSends: ["nextPutAll:", "lf"]}),
smalltalk.Exporter);
smalltalk.addMethod(
smalltalk.method({
selector: "exportAmdPackagePrologueOf:on:",
fn: function (aPackage,aStream){
var self=this;
return smalltalk.withContext(function($ctx1) {
var $1,$2;
$1=aStream;
_st($1)._nextPutAll_("define(\x22amber/");
_st($1)._nextPutAll_(_st(aPackage)._name());
_st($1)._nextPutAll_("\x22, [\x22amber_vm/smalltalk\x22,\x22amber_vm/nil\x22,\x22amber_vm/_st\x22], function(smalltalk,nil,_st){");
$2=_st($1)._lf();
return self}, function($ctx1) {$ctx1.fill(self,"exportAmdPackagePrologueOf:on:",{aPackage:aPackage,aStream:aStream},smalltalk.Exporter)})},
messageSends: ["nextPutAll:", "name", "lf"]}),
smalltalk.Exporter);
smalltalk.addMethod(
smalltalk.method({
selector: "exportClass:",
fn: function (aClass){
=======
selector: "exportCategoryPrologueOf:on:",
fn: function (category,aStream){
>>>>>>>
selector: "exportCategoryPrologueOf:on:",
fn: function (category,aStream){
<<<<<<<
selector: "exportPackageExtensionsOf:on:",
fn: function (package_,aStream){
=======
selector: "ownCategoriesOfMetaClass:",
fn: function (aClass){
var self=this;
return smalltalk.withContext(function($ctx1) {
var $1;
$1=self._ownCategoriesOfClass_(_st(aClass)._class());
return $1;
}, function($ctx1) {$ctx1.fill(self,"ownCategoriesOfMetaClass:",{aClass:aClass},smalltalk.ChunkExporter.klass)})},
messageSends: ["ownCategoriesOfClass:", "class"]}),
smalltalk.ChunkExporter.klass);
smalltalk.addMethod(
smalltalk.method({
selector: "recipe",
fn: function (){
>>>>>>>
selector: "ownCategoriesOfMetaClass:",
fn: function (aClass){
var self=this;
return smalltalk.withContext(function($ctx1) {
var $1;
$1=self._ownCategoriesOfClass_(_st(aClass)._class());
return $1;
}, function($ctx1) {$ctx1.fill(self,"ownCategoriesOfMetaClass:",{aClass:aClass},smalltalk.ChunkExporter.klass)})},
messageSends: ["ownCategoriesOfClass:", "class"]}),
smalltalk.ChunkExporter.klass);
smalltalk.addMethod(
smalltalk.method({
selector: "recipe",
fn: function (){
<<<<<<<
=======
smalltalk.addMethod(
smalltalk.method({
selector: "stream:",
fn: function (aStream){
var self=this;
return smalltalk.withContext(function($ctx1) {
self["@stream"]=aStream;
return self}, function($ctx1) {$ctx1.fill(self,"stream:",{aStream:aStream},smalltalk.ChunkParser)})},
messageSends: []}),
smalltalk.ChunkParser);
>>>>>>>
smalltalk.addMethod(
smalltalk.method({
selector: "stream:",
fn: function (aStream){
var self=this;
return smalltalk.withContext(function($ctx1) {
self["@stream"]=aStream;
return self}, function($ctx1) {$ctx1.fill(self,"stream:",{aStream:aStream},smalltalk.ChunkParser)})},
messageSends: []}),
smalltalk.ChunkParser);
<<<<<<<
selector: "exportPackageExtensionsOf:on:",
fn: function (package_,aStream){
=======
selector: "exportPackagePrologueOf:on:",
fn: function (aPackage,aStream){
var self=this;
return smalltalk.withContext(function($ctx1) {
var $1,$2;
$1=aStream;
_st($1)._nextPutAll_("(function(smalltalk,nil,_st){");
$2=_st($1)._lf();
return self}, function($ctx1) {$ctx1.fill(self,"exportPackagePrologueOf:on:",{aPackage:aPackage,aStream:aStream},smalltalk.Exporter.klass)})},
messageSends: ["nextPutAll:", "lf"]}),
smalltalk.Exporter.klass);
smalltalk.addMethod(
smalltalk.method({
selector: "extensionMethodsOfPackage:",
fn: function (package_){
>>>>>>>
selector: "exportPackagePrologueOf:on:",
fn: function (aPackage,aStream){
var self=this;
return smalltalk.withContext(function($ctx1) {
var $1,$2;
$1=aStream;
_st($1)._nextPutAll_("(function(smalltalk,nil,_st){");
$2=_st($1)._lf();
return self}, function($ctx1) {$ctx1.fill(self,"exportPackagePrologueOf:on:",{aPackage:aPackage,aStream:aStream},smalltalk.Exporter.klass)})},
messageSends: ["nextPutAll:", "lf"]}),
smalltalk.Exporter.klass);
smalltalk.addMethod(
smalltalk.method({
selector: "extensionMethodsOfPackage:",
fn: function (package_){
<<<<<<<
=======
smalltalk.addMethod(
smalltalk.method({
selector: "ownMethodsOfClass:",
fn: function (aClass){
var self=this;
return smalltalk.withContext(function($ctx1) {
var $1;
$1=_st(_st(_st(_st(aClass)._methodDictionary())._values())._sorted_((function(a,b){
return smalltalk.withContext(function($ctx2) {
return _st(_st(a)._selector()).__lt_eq(_st(b)._selector());
}, function($ctx2) {$ctx2.fillBlock({a:a,b:b},$ctx1)})})))._reject_((function(each){
return smalltalk.withContext(function($ctx2) {
return _st(_st(each)._category())._match_("^\x5c*");
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1)})}));
return $1;
}, function($ctx1) {$ctx1.fill(self,"ownMethodsOfClass:",{aClass:aClass},smalltalk.Exporter.klass)})},
messageSends: ["reject:", "match:", "category", "sorted:", "<=", "selector", "values", "methodDictionary"]}),
smalltalk.Exporter.klass);
smalltalk.addMethod(
smalltalk.method({
selector: "ownMethodsOfMetaClass:",
fn: function (aClass){
var self=this;
return smalltalk.withContext(function($ctx1) {
var $1;
$1=self._ownMethodsOfClass_(_st(aClass)._class());
return $1;
}, function($ctx1) {$ctx1.fill(self,"ownMethodsOfMetaClass:",{aClass:aClass},smalltalk.Exporter.klass)})},
messageSends: ["ownMethodsOfClass:", "class"]}),
smalltalk.Exporter.klass);
smalltalk.addMethod(
smalltalk.method({
selector: "recipe",
fn: function (){
var self=this;
function $PluggableExporter(){return smalltalk.PluggableExporter||(typeof PluggableExporter=="undefined"?nil:PluggableExporter)}
return smalltalk.withContext(function($ctx1) {
var $1;
$1=[self.__minus_gt("exportPackagePrologueOf:on:"),self.__minus_gt("exportPackageDefinitionOf:on:"),[_st($PluggableExporter()).__minus_gt("ownClassesOfPackage:"),self.__minus_gt("exportDefinitionOf:on:"),[self.__minus_gt("ownMethodsOfClass:"),self.__minus_gt("exportMethod:on:")],self.__minus_gt("exportMetaDefinitionOf:on:"),[self.__minus_gt("ownMethodsOfMetaClass:"),self.__minus_gt("exportMethod:on:")]],[self.__minus_gt("extensionMethodsOfPackage:"),self.__minus_gt("exportMethod:on:")],self.__minus_gt("exportPackageEpilogueOf:on:")];
return $1;
}, function($ctx1) {$ctx1.fill(self,"recipe",{},smalltalk.Exporter.klass)})},
messageSends: ["->"]}),
smalltalk.Exporter.klass);
>>>>>>>
smalltalk.addMethod(
smalltalk.method({
selector: "ownMethodsOfClass:",
fn: function (aClass){
var self=this;
return smalltalk.withContext(function($ctx1) {
var $1;
$1=_st(_st(_st(_st(aClass)._methodDictionary())._values())._sorted_((function(a,b){
return smalltalk.withContext(function($ctx2) {
return _st(_st(a)._selector()).__lt_eq(_st(b)._selector());
}, function($ctx2) {$ctx2.fillBlock({a:a,b:b},$ctx1)})})))._reject_((function(each){
return smalltalk.withContext(function($ctx2) {
return _st(_st(each)._category())._match_("^\x5c*");
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1)})}));
return $1;
}, function($ctx1) {$ctx1.fill(self,"ownMethodsOfClass:",{aClass:aClass},smalltalk.Exporter.klass)})},
messageSends: ["reject:", "match:", "category", "sorted:", "<=", "selector", "values", "methodDictionary"]}),
smalltalk.Exporter.klass);
smalltalk.addMethod(
smalltalk.method({
selector: "ownMethodsOfMetaClass:",
fn: function (aClass){
var self=this;
return smalltalk.withContext(function($ctx1) {
var $1;
$1=self._ownMethodsOfClass_(_st(aClass)._class());
return $1;
}, function($ctx1) {$ctx1.fill(self,"ownMethodsOfMetaClass:",{aClass:aClass},smalltalk.Exporter.klass)})},
messageSends: ["ownMethodsOfClass:", "class"]}),
smalltalk.Exporter.klass);
smalltalk.addMethod(
smalltalk.method({
selector: "recipe",
fn: function (){
var self=this;
function $PluggableExporter(){return smalltalk.PluggableExporter||(typeof PluggableExporter=="undefined"?nil:PluggableExporter)}
return smalltalk.withContext(function($ctx1) {
var $1;
$1=[self.__minus_gt("exportAmdPackagePrologueOf:on:"),self.__minus_gt("exportPackageDefinitionOf:on:"),[_st($PluggableExporter()).__minus_gt("ownClassesOfPackage:"),self.__minus_gt("exportDefinitionOf:on:"),[self.__minus_gt("ownMethodsOfClass:"),self.__minus_gt("exportMethod:on:")],self.__minus_gt("exportMetaDefinitionOf:on:"),[self.__minus_gt("ownMethodsOfMetaClass:"),self.__minus_gt("exportMethod:on:")]],[self.__minus_gt("extensionMethodsOfPackage:"),self.__minus_gt("exportMethod:on:")],self.__minus_gt("exportAmdPackageEpilogueOf:on:")];
return $1;
}, function($ctx1) {$ctx1.fill(self,"recipe",{},smalltalk.Exporter.klass)})},
messageSends: ["->"]}),
smalltalk.Exporter.klass); |
<<<<<<<
source: "renameClass: aClass to: className\x0a\x09self basicRenameClass: aClass to: className.\x0a\x09\x0a\x09SystemAnnouncer current\x0a\x09\x09announce: (ClassRenamed new\x0a\x09\x09\x09theClass: aClass;\x0a\x09\x09\x09yourself)",
messageSends: ["basicRenameClass:to:", "announce:", "current", "theClass:", "new", "yourself"],
referencedClasses: ["SystemAnnouncer", "ClassRenamed"]
=======
source: "renameClass: aClass to: className\x0a\x09self basicRenameClass: aClass to: className.\x0a\x09\x0a\x09\x22Recompile the class to fix potential issues with super sends\x22\x0a\x09aClass recompile.\x0a\x09\x0a\x09SystemAnnouncer current\x0a\x09\x09announce: (ClassRenamed new\x0a\x09\x09\x09theClass: aClass;\x0a\x09\x09\x09yourself)",
messageSends: ["basicRenameClass:to:", "recompile", "announce:", "theClass:", "new", "yourself", "current"],
referencedClasses: ["ClassRenamed", "SystemAnnouncer"]
>>>>>>>
source: "renameClass: aClass to: className\x0a\x09self basicRenameClass: aClass to: className.\x0a\x09\x0a\x09\x22Recompile the class to fix potential issues with super sends\x22\x0a\x09aClass recompile.\x0a\x09\x0a\x09SystemAnnouncer current\x0a\x09\x09announce: (ClassRenamed new\x0a\x09\x09\x09theClass: aClass;\x0a\x09\x09\x09yourself)",
messageSends: ["basicRenameClass:to:", "recompile", "announce:", "current", "theClass:", "new", "yourself"],
referencedClasses: ["SystemAnnouncer", "ClassRenamed"] |
<<<<<<<
selector: "testDNURegression1057",
protocol: 'tests',
fn: function (){
var self=this;
var jsObject;
function $Error(){return globals.Error||(typeof Error=="undefined"?nil:Error)}
return smalltalk.withContext(function($ctx1) {
var $1;
jsObject=[];
_st(jsObject)._basicAt_put_("allowJavaScriptCalls",true);
$ctx1.sendIdx["basicAt:put:"]=1;
_st(jsObject)._basicAt_put_("foo",(3));
self._shouldnt_raise_((function(){
return smalltalk.withContext(function($ctx2) {
return _st(jsObject)._foo();
$ctx2.sendIdx["foo"]=1;
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}),$Error());
$ctx1.sendIdx["shouldnt:raise:"]=1;
$1=_st(jsObject)._foo();
$ctx1.sendIdx["foo"]=2;
self._assert_equals_($1,(3));
$ctx1.sendIdx["assert:equals:"]=1;
self._shouldnt_raise_((function(){
return smalltalk.withContext(function($ctx2) {
return _st(jsObject)._foo_((4));
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}),$Error());
self._assert_equals_(_st(jsObject)._foo(),(4));
return self}, function($ctx1) {$ctx1.fill(self,"testDNURegression1057",{jsObject:jsObject},globals.JSObjectProxyTest)})},
args: [],
source: "testDNURegression1057\x0a\x09| jsObject |\x0a\x09jsObject := #().\x0a\x09jsObject basicAt: 'allowJavaScriptCalls' put: true.\x0a\x09jsObject basicAt: 'foo' put: 3.\x0a\x09self shouldnt: [ jsObject foo ] raise: Error.\x0a\x09self assert: jsObject foo equals: 3.\x0a\x09self shouldnt: [ jsObject foo: 4 ] raise: Error.\x0a\x09self assert: jsObject foo equals: 4",
messageSends: ["basicAt:put:", "shouldnt:raise:", "foo", "assert:equals:", "foo:"],
referencedClasses: ["Error"]
}),
globals.JSObjectProxyTest);
smalltalk.addMethod(
smalltalk.method({
selector: "testDNURegression1059",
protocol: 'tests',
fn: function (){
var self=this;
var jsObject;
function $Error(){return globals.Error||(typeof Error=="undefined"?nil:Error)}
return smalltalk.withContext(function($ctx1) {
jsObject=[];
_st(jsObject)._basicAt_put_("allowJavaScriptCalls",true);
$ctx1.sendIdx["basicAt:put:"]=1;
_st(jsObject)._basicAt_put_("x",(3));
$ctx1.sendIdx["basicAt:put:"]=2;
_st(jsObject)._basicAt_put_("x:",(function(){
return smalltalk.withContext(function($ctx2) {
return self._error();
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
self._shouldnt_raise_((function(){
return smalltalk.withContext(function($ctx2) {
return _st(jsObject)._x_((4));
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}),$Error());
self._assert_equals_(_st(jsObject)._x(),(4));
return self}, function($ctx1) {$ctx1.fill(self,"testDNURegression1059",{jsObject:jsObject},globals.JSObjectProxyTest)})},
args: [],
source: "testDNURegression1059\x0a\x09| jsObject |\x0a\x09jsObject := #().\x0a\x09jsObject basicAt: 'allowJavaScriptCalls' put: true.\x0a\x09jsObject basicAt: 'x' put: 3.\x0a\x09jsObject basicAt: 'x:' put: [ self error ].\x0a\x09self shouldnt: [ jsObject x: 4 ] raise: Error.\x0a\x09self assert: jsObject x equals: 4\x0a\x09",
messageSends: ["basicAt:put:", "error", "shouldnt:raise:", "x:", "assert:equals:", "x"],
referencedClasses: ["Error"]
}),
globals.JSObjectProxyTest);
smalltalk.addMethod(
smalltalk.method({
=======
selector: "testDNURegression1062",
protocol: 'tests',
fn: function (){
var self=this;
var jsObject,stored;
function $Error(){return globals.Error||(typeof Error=="undefined"?nil:Error)}
return smalltalk.withContext(function($ctx1) {
jsObject=[];
_st(jsObject)._basicAt_put_("allowJavaScriptCalls",true);
$ctx1.sendIdx["basicAt:put:"]=1;
_st(jsObject)._basicAt_put_("x",(function(v){
stored=v;
return stored;
}));
self._shouldnt_raise_((function(){
return smalltalk.withContext(function($ctx2) {
return _st(jsObject)._x_((4));
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}),$Error());
self._assert_equals_(stored,(4));
return self}, function($ctx1) {$ctx1.fill(self,"testDNURegression1062",{jsObject:jsObject,stored:stored},globals.JSObjectProxyTest)})},
args: [],
source: "testDNURegression1062\x0a\x09| jsObject stored |\x0a\x09jsObject := #().\x0a\x09jsObject basicAt: 'allowJavaScriptCalls' put: true.\x0a\x09jsObject basicAt: 'x' put: [ :v | stored := v ].\x0a\x09self shouldnt: [ jsObject x: 4 ] raise: Error.\x0a\x09self assert: stored equals: 4",
messageSends: ["basicAt:put:", "shouldnt:raise:", "x:", "assert:equals:"],
referencedClasses: ["Error"]
}),
globals.JSObjectProxyTest);
smalltalk.addMethod(
smalltalk.method({
>>>>>>>
selector: "testDNURegression1057",
protocol: 'tests',
fn: function (){
var self=this;
var jsObject;
function $Error(){return globals.Error||(typeof Error=="undefined"?nil:Error)}
return smalltalk.withContext(function($ctx1) {
var $1;
jsObject=[];
_st(jsObject)._basicAt_put_("allowJavaScriptCalls",true);
$ctx1.sendIdx["basicAt:put:"]=1;
_st(jsObject)._basicAt_put_("foo",(3));
self._shouldnt_raise_((function(){
return smalltalk.withContext(function($ctx2) {
return _st(jsObject)._foo();
$ctx2.sendIdx["foo"]=1;
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}),$Error());
$ctx1.sendIdx["shouldnt:raise:"]=1;
$1=_st(jsObject)._foo();
$ctx1.sendIdx["foo"]=2;
self._assert_equals_($1,(3));
$ctx1.sendIdx["assert:equals:"]=1;
self._shouldnt_raise_((function(){
return smalltalk.withContext(function($ctx2) {
return _st(jsObject)._foo_((4));
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}),$Error());
self._assert_equals_(_st(jsObject)._foo(),(4));
return self}, function($ctx1) {$ctx1.fill(self,"testDNURegression1057",{jsObject:jsObject},globals.JSObjectProxyTest)})},
args: [],
source: "testDNURegression1057\x0a\x09| jsObject |\x0a\x09jsObject := #().\x0a\x09jsObject basicAt: 'allowJavaScriptCalls' put: true.\x0a\x09jsObject basicAt: 'foo' put: 3.\x0a\x09self shouldnt: [ jsObject foo ] raise: Error.\x0a\x09self assert: jsObject foo equals: 3.\x0a\x09self shouldnt: [ jsObject foo: 4 ] raise: Error.\x0a\x09self assert: jsObject foo equals: 4",
messageSends: ["basicAt:put:", "shouldnt:raise:", "foo", "assert:equals:", "foo:"],
referencedClasses: ["Error"]
}),
globals.JSObjectProxyTest);
smalltalk.addMethod(
smalltalk.method({
selector: "testDNURegression1059",
protocol: 'tests',
fn: function (){
var self=this;
var jsObject;
function $Error(){return globals.Error||(typeof Error=="undefined"?nil:Error)}
return smalltalk.withContext(function($ctx1) {
jsObject=[];
_st(jsObject)._basicAt_put_("allowJavaScriptCalls",true);
$ctx1.sendIdx["basicAt:put:"]=1;
_st(jsObject)._basicAt_put_("x",(3));
$ctx1.sendIdx["basicAt:put:"]=2;
_st(jsObject)._basicAt_put_("x:",(function(){
return smalltalk.withContext(function($ctx2) {
return self._error();
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
self._shouldnt_raise_((function(){
return smalltalk.withContext(function($ctx2) {
return _st(jsObject)._x_((4));
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}),$Error());
self._assert_equals_(_st(jsObject)._x(),(4));
return self}, function($ctx1) {$ctx1.fill(self,"testDNURegression1059",{jsObject:jsObject},globals.JSObjectProxyTest)})},
args: [],
source: "testDNURegression1059\x0a\x09| jsObject |\x0a\x09jsObject := #().\x0a\x09jsObject basicAt: 'allowJavaScriptCalls' put: true.\x0a\x09jsObject basicAt: 'x' put: 3.\x0a\x09jsObject basicAt: 'x:' put: [ self error ].\x0a\x09self shouldnt: [ jsObject x: 4 ] raise: Error.\x0a\x09self assert: jsObject x equals: 4\x0a\x09",
messageSends: ["basicAt:put:", "error", "shouldnt:raise:", "x:", "assert:equals:", "x"],
referencedClasses: ["Error"]
}),
globals.JSObjectProxyTest);
smalltalk.addMethod(
smalltalk.method({
selector: "testDNURegression1062",
protocol: 'tests',
fn: function (){
var self=this;
var jsObject,stored;
function $Error(){return globals.Error||(typeof Error=="undefined"?nil:Error)}
return smalltalk.withContext(function($ctx1) {
jsObject=[];
_st(jsObject)._basicAt_put_("allowJavaScriptCalls",true);
$ctx1.sendIdx["basicAt:put:"]=1;
_st(jsObject)._basicAt_put_("x",(function(v){
stored=v;
return stored;
}));
self._shouldnt_raise_((function(){
return smalltalk.withContext(function($ctx2) {
return _st(jsObject)._x_((4));
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}),$Error());
self._assert_equals_(stored,(4));
return self}, function($ctx1) {$ctx1.fill(self,"testDNURegression1062",{jsObject:jsObject,stored:stored},globals.JSObjectProxyTest)})},
args: [],
source: "testDNURegression1062\x0a\x09| jsObject stored |\x0a\x09jsObject := #().\x0a\x09jsObject basicAt: 'allowJavaScriptCalls' put: true.\x0a\x09jsObject basicAt: 'x' put: [ :v | stored := v ].\x0a\x09self shouldnt: [ jsObject x: 4 ] raise: Error.\x0a\x09self assert: stored equals: 4",
messageSends: ["basicAt:put:", "shouldnt:raise:", "x:", "assert:equals:"],
referencedClasses: ["Error"]
}),
globals.JSObjectProxyTest);
smalltalk.addMethod(
smalltalk.method({ |
<<<<<<<
return smalltalk.IRVisitor.fn.prototype._visitIRClosure_.apply(_st(self), [anIRClosure]);
}, function($ctx3) {$ctx3.fillBlock({},$ctx2,3)})}));
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}),_st(anIRClosure)._arguments());
=======
return smalltalk.IRJSTranslator.superclass.fn.prototype._visitIRClosure_.apply(_st(self), [anIRClosure]);
}, function($ctx3) {$ctx3.fillBlock({},$ctx2)})}));
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}),_st(anIRClosure)._arguments());
>>>>>>>
return smalltalk.IRJSTranslator.superclass.fn.prototype._visitIRClosure_.apply(_st(self), [anIRClosure]);
}, function($ctx3) {$ctx3.fillBlock({},$ctx2,3)})}));
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}),_st(anIRClosure)._arguments());
<<<<<<<
return smalltalk.IRVisitor.fn.prototype._visitIRMethod_.apply(_st(self), [anIRMethod]);
}, function($ctx5) {$ctx5.fillBlock({},$ctx4,9)})}));
=======
return smalltalk.IRJSTranslator.superclass.fn.prototype._visitIRMethod_.apply(_st(self), [anIRMethod]);
}, function($ctx5) {$ctx5.fillBlock({},$ctx4)})}));
>>>>>>>
return smalltalk.IRJSTranslator.superclass.fn.prototype._visitIRMethod_.apply(_st(self), [anIRMethod]);
}, function($ctx5) {$ctx5.fillBlock({},$ctx4,9)})}));
<<<<<<<
return smalltalk.IRVisitor.fn.prototype._visitIRNonLocalReturn_.apply(_st(self), [anIRNonLocalReturn]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
=======
return smalltalk.IRJSTranslator.superclass.fn.prototype._visitIRNonLocalReturn_.apply(_st(self), [anIRNonLocalReturn]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
>>>>>>>
return smalltalk.IRJSTranslator.superclass.fn.prototype._visitIRNonLocalReturn_.apply(_st(self), [anIRNonLocalReturn]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
<<<<<<<
return smalltalk.IRVisitor.fn.prototype._visitIRReturn_.apply(_st(self), [anIRReturn]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
=======
return smalltalk.IRJSTranslator.superclass.fn.prototype._visitIRReturn_.apply(_st(self), [anIRReturn]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
>>>>>>>
return smalltalk.IRJSTranslator.superclass.fn.prototype._visitIRReturn_.apply(_st(self), [anIRReturn]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
<<<<<<<
messageSends: ["nextPutAll:", "stream", ",", "asJavascript", "classSend", "asSelector", "selector", "visit:", "first", "instructions", "do:separatedBy:", "allButFirst"]}),
=======
messageSends: ["nextPutAll:", "asJavascript", "currentClass", "stream", ",", "asSelector", "selector", "visit:", "first", "instructions", "do:separatedBy:", "allButFirst"]}),
>>>>>>>
messageSends: ["nextPutAll:", "stream", "asJavascript", "currentClass", ",", "asSelector", "selector", "visit:", "first", "instructions", "do:separatedBy:", "allButFirst"]}), |
<<<<<<<
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
_st($1)._whileKeyPressed_do_((40),(function(){
=======
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
_st($1)._whileKeyDown_do_((40),(function(){
>>>>>>>
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
_st($1)._whileKeyDown_do_((40),(function(){
<<<<<<<
messageSends: ["whileKeyPressed:do:", "forWidget:", "activatePreviousListItem", "activateNextListItem", "rebindKeys"]}),
=======
messageSends: ["whileKeyDown:do:", "activatePreviousListItem", "on:", "activateNextListItem", "rebindKeys"]}),
>>>>>>>
messageSends: ["whileKeyDown:do:", "on:", "activatePreviousListItem", "activateNextListItem", "rebindKeys"]}),
<<<<<<<
messageSends: ["appendToJQuery:", "confirmationString:", "new", "cancelBlock:", "yourself", "asJQuery"]}),
=======
messageSends: ["confirmationString:", "new", "cancelBlock:", "show"]}),
>>>>>>>
messageSends: ["confirmationString:", "new", "cancelBlock:", "show"]}),
<<<<<<<
messageSends: ["appendToJQuery:", "confirmationString:", "new", "actionBlock:", "yourself", "asJQuery"]}),
=======
messageSends: ["confirmationString:", "new", "actionBlock:", "show"]}),
>>>>>>>
messageSends: ["confirmationString:", "new", "actionBlock:", "show"]}),
<<<<<<<
messageSends: ["appendToJQuery:", "confirmationString:", "new", "actionBlock:", "value:", "yourself", "asJQuery"]}),
=======
messageSends: ["confirmationString:", "new", "actionBlock:", "value:", "show"]}),
>>>>>>>
messageSends: ["confirmationString:", "new", "actionBlock:", "value:", "show"]}),
<<<<<<<
$3=self;
_st($3)._renderMainOn_(html);
$4=_st($3)._renderButtonsOn_(html);
return $4;
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
=======
self._renderMainOn_(html);
$3=self._hasButtons();
if(smalltalk.assert($3)){
return self._renderButtonsOn_(html);
};
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
>>>>>>>
self._renderMainOn_(html);
$3=self._hasButtons();
if(smalltalk.assert($3)){
return self._renderButtonsOn_(html);
};
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
<<<<<<<
messageSends: ["keyup:", "asJQuery", "ifTrue:", "=", "keyCode", "cancel"]}),
=======
messageSends: ["keyup:", "ifTrue:", "cancel", "=", "asciiValue", "esc", "keyCode", "asJQuery"]}),
smalltalk.HLModalWidget);
smalltalk.addMethod(
smalltalk.method({
selector: "show",
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
self._appendToJQuery_("body"._asJQuery());
return self}, function($ctx1) {$ctx1.fill(self,"show",{},smalltalk.HLModalWidget)})},
messageSends: ["appendToJQuery:", "asJQuery"]}),
>>>>>>>
messageSends: ["keyup:", "asJQuery", "ifTrue:", "=", "keyCode", "asciiValue", "esc", "cancel"]}),
smalltalk.HLModalWidget);
smalltalk.addMethod(
smalltalk.method({
selector: "show",
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
self._appendToJQuery_("body"._asJQuery());
return self}, function($ctx1) {$ctx1.fill(self,"show",{},smalltalk.HLModalWidget)})},
messageSends: ["appendToJQuery:", "asJQuery"]}),
<<<<<<<
selector: "remove",
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
_st(".dialog"._asJQuery())._removeClass_("active");
_st((function(){
return smalltalk.withContext(function($ctx2) {
_st("#overlay"._asJQuery())._remove();
return _st(".dialog"._asJQuery())._remove();
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}))._valueWithTimeout_((300));
return self}, function($ctx1) {$ctx1.fill(self,"remove",{},smalltalk.HLConfirmationWidget)})},
messageSends: ["removeClass:", "asJQuery", "valueWithTimeout:", "remove"]}),
smalltalk.HLConfirmationWidget);
smalltalk.addMethod(
smalltalk.method({
selector: "renderButtonsOn:",
fn: function (html){
var self=this;
var confirmButton;
return smalltalk.withContext(function($ctx1) {
var $1,$3,$4,$5,$6,$2;
$1=_st(html)._div();
_st($1)._class_("buttons");
$2=_st($1)._with_((function(){
return smalltalk.withContext(function($ctx2) {
$3=_st(html)._button();
_st($3)._class_("button");
_st($3)._with_("Cancel");
$4=_st($3)._onClick_((function(){
return smalltalk.withContext(function($ctx3) {
return self._cancel();
}, function($ctx3) {$ctx3.fillBlock({},$ctx2,2)})}));
$4;
$5=_st(html)._button();
_st($5)._class_("button default");
_st($5)._with_("Confirm");
$6=_st($5)._onClick_((function(){
return smalltalk.withContext(function($ctx3) {
return self._confirm();
}, function($ctx3) {$ctx3.fillBlock({},$ctx2,3)})}));
confirmButton=$6;
return confirmButton;
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
_st(_st(confirmButton)._asJQuery())._focus();
return self}, function($ctx1) {$ctx1.fill(self,"renderButtonsOn:",{html:html,confirmButton:confirmButton},smalltalk.HLConfirmationWidget)})},
messageSends: ["class:", "div", "with:", "button", "onClick:", "cancel", "confirm", "focus", "asJQuery"]}),
smalltalk.HLConfirmationWidget);
smalltalk.addMethod(
smalltalk.method({
=======
>>>>>>>
<<<<<<<
messageSends: ["value:", "actionBlock", "val", "asJQuery", "remove"]}),
=======
messageSends: ["confirm", "value:", "val", "asJQuery", "actionBlock"]}),
>>>>>>>
messageSends: ["confirm", "value:", "actionBlock", "val", "asJQuery"]}),
<<<<<<<
messageSends: ["ifFalse:", "isVisible", "appendToJQuery:", "asJQuery"]}),
=======
messageSends: ["ifFalse:", "show", "isVisible"]}),
>>>>>>>
messageSends: ["ifFalse:", "isVisible", "show"]}), |
<<<<<<<
source: "renderContentOn: html\x0a\x09\x0a html div with: self selectionDisplayString\x0a ",
messageSends: ["with:", "div", "selectionDisplayString"],
=======
source: "renderContentOn: html\x0a\x09\x0a html div with: self selectionDisplayString",
messageSends: ["with:", "selectionDisplayString", "div"],
>>>>>>>
source: "renderContentOn: html\x0a\x09\x0a html div with: self selectionDisplayString",
messageSends: ["with:", "div", "selectionDisplayString"],
<<<<<<<
source: "selection: anObject\x0a\x09selection := anObject.\x0a\x0a\x09self announcer announce: (HLInstanceVariableSelected on: selection)\x0a ",
messageSends: ["announce:", "announcer", "on:"],
=======
source: "selection: anObject\x0a\x09selection := anObject.\x0a\x0a\x09self announcer announce: (HLInstanceVariableSelected on: selection)",
messageSends: ["announce:", "on:", "announcer"],
>>>>>>>
source: "selection: anObject\x0a\x09selection := anObject.\x0a\x0a\x09self announcer announce: (HLInstanceVariableSelected on: selection)",
messageSends: ["announce:", "announcer", "on:"],
<<<<<<<
source: "observeVariablesWidget\x0a\x09self variablesWidget announcer \x0a on: HLDiveRequested do:[ self onDive ]\x0a ",
messageSends: ["on:do:", "announcer", "variablesWidget", "onDive"],
=======
source: "observeVariablesWidget\x0a\x09self variablesWidget announcer \x0a on: HLDiveRequested do:[ self onDive ]",
messageSends: ["on:do:", "onDive", "announcer", "variablesWidget"],
>>>>>>>
source: "observeVariablesWidget\x0a\x09self variablesWidget announcer \x0a on: HLDiveRequested do:[ self onDive ]",
messageSends: ["on:do:", "announcer", "variablesWidget", "onDive"], |
<<<<<<<
}
// Searches through all messages to find and hide spam
var spamCounts = {};
function findAndHideSpam() {
$('.robin-message--message:not(.addon--hide)').each(function() {
=======
$('.robin--user-class--user .robin-message--message:not(.addon--hide)').each(function() {
>>>>>>>
}
// Searches through all messages to find and hide spam
var spamCounts = {};
function findAndHideSpam() {
$('.robin--user-class--user > .robin-message--message:not(.addon--hide)').each(function() {
<<<<<<<
function isBotSpam(text) {
// starts with a [ or has "Autovoter"
return text.indexOf("[") === 0
|| text.indexOf("Autovoter") > -1
/* Detects unicode spam - Credit to travelton (https://gist.github.com/travelton)*/
|| (/[\u0080-\uFFFF]/.test(text));
=======
function removeSpam() {
$(".robin--user-class--user").filter(function(num,message){
var text = $(message).find(".robin-message--message").text();
var filter = text.indexOf("[") === 0
|| text == "voted to STAY"
|| text == "voted to GROW"
|| text == "voted to ABANDON"
|| text.indexOf("Autovoter") > -1
|| (/[\u0080-\uFFFF]/.test(text));
; // starts with a [ or has "Autovoter"
// if(filter)console.log("removing "+text);
return filter;
}).remove();
>>>>>>>
function isBotSpam(text) {
var filter = text.indexOf("[") === 0
|| text == "voted to STAY"
|| text == "voted to GROW"
|| text == "voted to ABANDON"
|| text.indexOf("Autovoter") > -1
|| (/[\u0080-\uFFFF]/.test(text));
; // starts with a [ or has "Autovoter"
// if(filter)console.log("removing "+text);
return filter; |
<<<<<<<
function $PluggableExporter(){return smalltalk.PluggableExporter||(typeof PluggableExporter=="undefined"?nil:PluggableExporter)}
function $String(){return smalltalk.String||(typeof String=="undefined"?nil:String)}
function $Exporter(){return smalltalk.Exporter||(typeof Exporter=="undefined"?nil:Exporter)}
function $StrippedExporter(){return smalltalk.StrippedExporter||(typeof StrippedExporter=="undefined"?nil:StrippedExporter)}
function $ChunkExporter(){return smalltalk.ChunkExporter||(typeof ChunkExporter=="undefined"?nil:ChunkExporter)}
=======
>>>>>>>
function $PluggableExporter(){return smalltalk.PluggableExporter||(typeof PluggableExporter=="undefined"?nil:PluggableExporter)}
function $String(){return smalltalk.String||(typeof String=="undefined"?nil:String)}
<<<<<<<
fileContents=_st($String())._streamContents_((function(stream){
return smalltalk.withContext(function($ctx3) {
return _st(_st($PluggableExporter())._newUsing_(_st(_st(commitStrategy)._key())._recipe()))._exportPackage_on_(aPackage,stream);
}, function($ctx3) {$ctx3.fillBlock({stream:stream},$ctx2)})}));
=======
commitStrategy=_st(commitStrategyFactory)._value_(aPackage);
commitStrategy;
fileContents=_st(_st(commitStrategy)._key())._exportPackage_(_st(aPackage)._name());
>>>>>>>
commitStrategy=_st(commitStrategyFactory)._value_(aPackage);
commitStrategy;
fileContents=_st($String())._streamContents_((function(stream){
return smalltalk.withContext(function($ctx3) {
return _st(_st($PluggableExporter())._newUsing_(_st(commitStrategy)._key()))._exportPackage_on_(aPackage,stream);
}, function($ctx3) {$ctx3.fillBlock({stream:stream},$ctx2)})}));
<<<<<<<
messageSends: ["do:displayingProgress:", "streamContents:", "exportPackage:on:", "newUsing:", "recipe", "key", "ajaxPutAt:data:", "value", ",", "name", "->", "commitPathJs", "commitPathSt"]}),
=======
messageSends: ["do:displayingProgress:", "value:", "exportPackage:", "name", "key", "ajaxPutAt:data:", "value", ",", "commitChannels"]}),
>>>>>>>
messageSends: ["do:displayingProgress:", "value:", "streamContents:", "exportPackage:on:", "newUsing:", "key", "ajaxPutAt:data:", "value", ",", "name", "commitChannels"]}), |
<<<<<<<
return smalltalk.ASTInterpreter.fn.prototype._interpret_continue_.apply(_st(self), [aNode,aBlock]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})});
=======
return smalltalk.ASTSteppingInterpreter.superclass.fn.prototype._interpret_continue_.apply(_st(self), [aNode,aBlock]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})});
>>>>>>>
return smalltalk.ASTSteppingInterpreter.superclass.fn.prototype._interpret_continue_.apply(_st(self), [aNode,aBlock]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})});
<<<<<<<
var $1,$2,$3;
smalltalk.NodeVisitor.fn.prototype._visitSendNode_.apply(_st(self), [aNode]);
=======
var $1,$2;
smalltalk.ASTPCNodeVisitor.superclass.fn.prototype._visitSendNode_.apply(_st(self), [aNode]);
>>>>>>>
var $1,$2,$3;
smalltalk.ASTPCNodeVisitor.superclass.fn.prototype._visitSendNode_.apply(_st(self), [aNode]); |
<<<<<<<
"_isCompiledMethod",
smalltalk.method({
selector: "isCompiledMethod",
category: 'testing',
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
return false;
}, function($ctx1) {$ctx1.fill(self,"isCompiledMethod",{},smalltalk.Object)})},
args: [],
source: "isCompiledMethod\x0a\x09^ false",
messageSends: [],
referencedClasses: []
}),
smalltalk.Object);
smalltalk.addMethod(
"_isImmutable",
=======
>>>>>>>
smalltalk.method({
selector: "isCompiledMethod",
category: 'testing',
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
return false;
}, function($ctx1) {$ctx1.fill(self,"isCompiledMethod",{},smalltalk.Object)})},
args: [],
source: "isCompiledMethod\x0a\x09^ false",
messageSends: [],
referencedClasses: []
}),
smalltalk.Object);
smalltalk.addMethod(
<<<<<<<
"_isPackage",
smalltalk.method({
selector: "isPackage",
category: 'testing',
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
return false;
}, function($ctx1) {$ctx1.fill(self,"isPackage",{},smalltalk.Object)})},
args: [],
source: "isPackage\x0a\x09^ false",
messageSends: [],
referencedClasses: []
}),
smalltalk.Object);
smalltalk.addMethod(
"_isParseFailure",
=======
>>>>>>>
smalltalk.method({
selector: "isPackage",
category: 'testing',
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
return false;
}, function($ctx1) {$ctx1.fill(self,"isPackage",{},smalltalk.Object)})},
args: [],
source: "isPackage\x0a\x09^ false",
messageSends: [],
referencedClasses: []
}),
smalltalk.Object);
smalltalk.addMethod(
<<<<<<<
"_isPackage",
smalltalk.method({
selector: "isPackage",
category: 'testing',
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
return true;
}, function($ctx1) {$ctx1.fill(self,"isPackage",{},smalltalk.Package)})},
args: [],
source: "isPackage\x0a\x09^ true",
messageSends: [],
referencedClasses: []
}),
smalltalk.Package);
smalltalk.addMethod(
"_name",
=======
>>>>>>>
smalltalk.method({
selector: "isPackage",
category: 'testing',
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
return true;
}, function($ctx1) {$ctx1.fill(self,"isPackage",{},smalltalk.Package)})},
args: [],
source: "isPackage\x0a\x09^ true",
messageSends: [],
referencedClasses: []
}),
smalltalk.Package);
smalltalk.addMethod( |
<<<<<<<
selector: "renderActionFor:html:",
category: 'rendering',
fn: function (aBinder,html){
var self=this;
return smalltalk.withContext(function($ctx1) {
var $1,$3,$4,$5,$6,$2;
$1=_st(html)._span();
_st($1)._class_("command");
$2=_st($1)._with_((function(){
return smalltalk.withContext(function($ctx2) {
$3=_st(html)._span();
_st($3)._class_("label");
$4=_st($3)._with_(_st(self._shortcut())._asLowercase());
$4;
$5=_st(html)._a();
_st($5)._class_("action");
_st($5)._with_(self._displayLabel());
$6=_st($5)._onClick_((function(){
return smalltalk.withContext(function($ctx3) {
return _st(aBinder)._applyBinding_(self);
}, function($ctx3) {$ctx3.fillBlock({},$ctx2,2)})}));
return $6;
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
return self}, function($ctx1) {$ctx1.fill(self,"renderActionFor:html:",{aBinder:aBinder,html:html},smalltalk.HLBinding)})},
args: ["aBinder", "html"],
source: "renderActionFor: aBinder html: html\x0a\x09html span class: 'command'; with: [\x0a\x09\x09html span \x0a\x09\x09\x09class: 'label'; \x0a\x09\x09\x09with: self shortcut asLowercase.\x0a \x09\x09html a \x0a \x09class: 'action'; \x0a with: self displayLabel;\x0a \x09\x09\x09onClick: [ aBinder applyBinding: self ] ]",
messageSends: ["class:", "span", "with:", "asLowercase", "shortcut", "a", "displayLabel", "onClick:", "applyBinding:"],
referencedClasses: []
}),
smalltalk.HLBinding);
smalltalk.addMethod(
smalltalk.method({
=======
>>>>>>>
<<<<<<<
return self}, function($ctx1) {$ctx1.fill(self,"applyOn:",{aKeyBinder:aKeyBinder},smalltalk.HLBindingAction)})},
args: ["aKeyBinder"],
source: "applyOn: aKeyBinder\x0a\x09self command isInputRequired\x0a\x09\x09ifTrue: [ aKeyBinder selectBinding: self inputBinding ]\x0a\x09\x09ifFalse: [ self command execute ]",
messageSends: ["ifTrue:ifFalse:", "isInputRequired", "command", "selectBinding:", "inputBinding", "execute"],
referencedClasses: []
=======
return self}, function($ctx1) {$ctx1.fill(self,"apply",{},smalltalk.HLBindingAction)})},
args: [],
source: "apply\x0a\x09self command isInputRequired\x0a\x09\x09ifTrue: [ HLKeyBinder current helper showWidget: self inputWidget ]\x0a\x09\x09ifFalse: [ self executeCommand ]",
messageSends: ["ifTrue:ifFalse:", "showWidget:", "inputWidget", "helper", "current", "executeCommand", "isInputRequired", "command"],
referencedClasses: ["HLKeyBinder"]
>>>>>>>
return self}, function($ctx1) {$ctx1.fill(self,"apply",{},smalltalk.HLBindingAction)})},
args: [],
source: "apply\x0a\x09self command isInputRequired\x0a\x09\x09ifTrue: [ HLKeyBinder current helper showWidget: self inputWidget ]\x0a\x09\x09ifFalse: [ self executeCommand ]",
messageSends: ["ifTrue:ifFalse:", "isInputRequired", "command", "showWidget:", "helper", "current", "inputWidget", "executeCommand"],
referencedClasses: ["HLKeyBinder"]
<<<<<<<
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,3)})}))._valueWithTimeout_((10));
return self}, function($ctx1) {$ctx1.fill(self,"renderOn:html:",{aBinder:aBinder,html:html},smalltalk.HLBindingInput)})},
args: ["aBinder", "html"],
source: "renderOn: aBinder html: html\x0a\x09binder := aBinder.\x0a\x09wrapper ifNil: [ wrapper := html span ].\x0a\x0a\x09wrapper \x0a\x09\x09class: self status;\x0a\x09\x09with: [\x0a\x09\x09\x09input := html input\x0a\x09\x09\x09\x09placeholder: self ghostText;\x0a\x09\x09\x09\x09value: self defaultValue;\x0a\x09\x09\x09\x09yourself.\x0a\x09\x09\x09input asJQuery \x0a\x09\x09\x09\x09typeahead: #{ 'source' -> self inputCompletion }.\x0a\x09\x09\x09messageTag := (html span\x0a\x09\x09\x09\x09class: 'help-inline';\x0a\x09\x09\x09\x09with: self message;\x0a\x09\x09\x09\x09yourself) ].\x0a\x09\x0a\x09\x22Evaluate with a timeout to ensure focus.\x0a\x09Commands can be executed from a menu, clicking on the menu to\x0a\x09evaluate the command would give it the focus otherwise\x22\x0a\x09\x0a\x09[ input asJQuery focus ] valueWithTimeout: 10",
messageSends: ["ifNil:", "span", "class:", "status", "with:", "placeholder:", "input", "ghostText", "value:", "defaultValue", "yourself", "typeahead:", "asJQuery", "->", "inputCompletion", "message", "valueWithTimeout:", "focus"],
=======
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}))._valueWithTimeout_((10));
return self}, function($ctx1) {$ctx1.fill(self,"renderOn:",{html:html},smalltalk.HLBindingActionInputWidget)})},
args: ["html"],
source: "renderOn: html\x0a\x09wrapper ifNil: [ wrapper := html span ].\x0a\x0a\x09wrapper \x0a\x09\x09class: self status;\x0a\x09\x09with: [\x0a\x09\x09\x09input := html input\x0a\x09\x09\x09\x09placeholder: self ghostText;\x0a\x09\x09\x09\x09value: self defaultValue;\x0a\x09\x09\x09\x09onKeyDown: [ :event | \x0a\x09\x09\x09\x09\x09event which = 13 ifTrue: [\x0a\x09\x09\x09\x09\x09\x09self evaluate: input asJQuery val ] ]\x0a\x09\x09\x09\x09yourself.\x0a\x09\x09\x09input asJQuery \x0a\x09\x09\x09\x09typeahead: #{ 'source' -> self inputCompletion }.\x0a\x09\x09\x09messageTag := (html span\x0a\x09\x09\x09\x09class: 'help-inline';\x0a\x09\x09\x09\x09with: self message;\x0a\x09\x09\x09\x09yourself) ].\x0a\x09\x0a\x09\x22Evaluate with a timeout to ensure focus.\x0a\x09Commands can be executed from a menu, clicking on the menu to\x0a\x09evaluate the command would give it the focus otherwise\x22\x0a\x09\x0a\x09[ input asJQuery focus ] valueWithTimeout: 10",
messageSends: ["ifNil:", "span", "class:", "status", "with:", "placeholder:", "ghostText", "input", "value:", "defaultValue", "onKeyDown:", "yourself", "ifTrue:", "evaluate:", "val", "asJQuery", "=", "which", "typeahead:", "->", "inputCompletion", "message", "valueWithTimeout:", "focus"],
>>>>>>>
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,5)})}))._valueWithTimeout_((10));
return self}, function($ctx1) {$ctx1.fill(self,"renderOn:",{html:html},smalltalk.HLBindingActionInputWidget)})},
args: ["html"],
source: "renderOn: html\x0a\x09wrapper ifNil: [ wrapper := html span ].\x0a\x0a\x09wrapper \x0a\x09\x09class: self status;\x0a\x09\x09with: [\x0a\x09\x09\x09input := html input\x0a\x09\x09\x09\x09placeholder: self ghostText;\x0a\x09\x09\x09\x09value: self defaultValue;\x0a\x09\x09\x09\x09onKeyDown: [ :event | \x0a\x09\x09\x09\x09\x09event which = 13 ifTrue: [\x0a\x09\x09\x09\x09\x09\x09self evaluate: input asJQuery val ] ]\x0a\x09\x09\x09\x09yourself.\x0a\x09\x09\x09input asJQuery \x0a\x09\x09\x09\x09typeahead: #{ 'source' -> self inputCompletion }.\x0a\x09\x09\x09messageTag := (html span\x0a\x09\x09\x09\x09class: 'help-inline';\x0a\x09\x09\x09\x09with: self message;\x0a\x09\x09\x09\x09yourself) ].\x0a\x09\x0a\x09\x22Evaluate with a timeout to ensure focus.\x0a\x09Commands can be executed from a menu, clicking on the menu to\x0a\x09evaluate the command would give it the focus otherwise\x22\x0a\x09\x0a\x09[ input asJQuery focus ] valueWithTimeout: 10",
messageSends: ["ifNil:", "span", "class:", "status", "with:", "placeholder:", "input", "ghostText", "value:", "defaultValue", "onKeyDown:", "yourself", "ifTrue:", "=", "which", "evaluate:", "val", "asJQuery", "typeahead:", "->", "inputCompletion", "message", "valueWithTimeout:", "focus"],
<<<<<<<
source: "applyBinding: aBinding\x0a\x09aBinding isActive ifFalse: [ ^ self ].\x0a\x09\x0a\x09self selectBinding: aBinding.\x0a aBinding applyOn: self.\x0a\x09\x0a\x09aBinding isFinal ifTrue: [ self deactivate ]",
messageSends: ["ifFalse:", "isActive", "selectBinding:", "applyOn:", "ifTrue:", "isFinal", "deactivate"],
=======
source: "applyBinding: aBinding\x0a\x09aBinding isActive ifFalse: [ ^ self ].\x0a\x09\x0a\x09self selectBinding: aBinding.\x0a aBinding apply",
messageSends: ["ifFalse:", "isActive", "selectBinding:", "apply"],
>>>>>>>
source: "applyBinding: aBinding\x0a\x09aBinding isActive ifFalse: [ ^ self ].\x0a\x09\x0a\x09self selectBinding: aBinding.\x0a aBinding apply",
messageSends: ["ifFalse:", "isActive", "selectBinding:", "apply"],
<<<<<<<
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}));
return self}, function($ctx1) {$ctx1.fill(self,"renderCloseOn:",{html:html},smalltalk.HLKeyBinderHelper)})},
=======
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
return self}, function($ctx1) {$ctx1.fill(self,"renderCloseOn:",{html:html},smalltalk.HLKeyBinderHelperWidget)})},
>>>>>>>
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}));
return self}, function($ctx1) {$ctx1.fill(self,"renderCloseOn:",{html:html},smalltalk.HLKeyBinderHelperWidget)})},
<<<<<<<
}, function($ctx2) {$ctx2.fillBlock({html:html},$ctx1,1)})}))._appendToJQuery_("body"._asJQuery());
return self}, function($ctx1) {$ctx1.fill(self,"renderCog",{},smalltalk.HLKeyBinderHelper)})},
=======
}, function($ctx2) {$ctx2.fillBlock({html:html},$ctx1)})}))._appendToJQuery_("body"._asJQuery());
return self}, function($ctx1) {$ctx1.fill(self,"renderCog",{},smalltalk.HLKeyBinderHelperWidget)})},
>>>>>>>
}, function($ctx2) {$ctx2.fillBlock({html:html},$ctx1,1)})}))._appendToJQuery_("body"._asJQuery());
return self}, function($ctx1) {$ctx1.fill(self,"renderCog",{},smalltalk.HLKeyBinderHelperWidget)})},
<<<<<<<
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}))._valueWithTimeout_((2000));
return self}, function($ctx1) {$ctx1.fill(self,"renderStart",{},smalltalk.HLKeyBinderHelper)})},
=======
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}))._valueWithTimeout_((2000));
return self}, function($ctx1) {$ctx1.fill(self,"renderStart",{},smalltalk.HLKeyBinderHelperWidget)})},
>>>>>>>
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}))._valueWithTimeout_((2000));
return self}, function($ctx1) {$ctx1.fill(self,"renderStart",{},smalltalk.HLKeyBinderHelperWidget)})},
<<<<<<<
return self._handleKeyUp_(e);
}, function($ctx2) {$ctx2.fillBlock({e:e},$ctx1,2)})}));
return self}, function($ctx1) {$ctx1.fill(self,"bindKeys",{},smalltalk.HLRepeatingKeyBindingHandler)})},
=======
return self._handleKeyUp();
}, function($ctx2) {$ctx2.fillBlock({e:e},$ctx1)})}));
return self}, function($ctx1) {$ctx1.fill(self,"bindKeys",{},smalltalk.HLRepeatedKeyDownHandler)})},
>>>>>>>
return self._handleKeyUp();
}, function($ctx2) {$ctx2.fillBlock({e:e},$ctx1,2)})}));
return self}, function($ctx1) {$ctx1.fill(self,"bindKeys",{},smalltalk.HLRepeatedKeyDownHandler)})},
<<<<<<<
self["@interval"]=self._startRepeatingAction_(action);
return self["@interval"];
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}))._valueWithTimeout_((300));
return $1;
}, function($ctx1) {$ctx1.fill(self,"delayBeforeStartingRepeatWithAction:",{action:action},smalltalk.HLRepeatingKeyBindingHandler)})},
args: ["action"],
source: "delayBeforeStartingRepeatWithAction: action\x0a\x09^ [ interval := self startRepeatingAction: action ] valueWithTimeout: 300",
messageSends: ["valueWithTimeout:", "startRepeatingAction:"],
=======
return _st(self._isKeyDown())._not();
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
if(smalltalk.assert($1)){
self._whileKeyDownDo_(aBlock);
};
return self}, function($ctx1) {$ctx1.fill(self,"handleEvent:forKey:action:",{anEvent:anEvent,anInteger:anInteger,aBlock:aBlock},smalltalk.HLRepeatedKeyDownHandler)})},
args: ["anEvent", "anInteger", "aBlock"],
source: "handleEvent: anEvent forKey: anInteger action: aBlock\x0a\x09(anEvent which = anInteger and: [ self isKeyDown not ])\x0a\x09\x09ifTrue: [ self whileKeyDownDo: aBlock ]",
messageSends: ["ifTrue:", "whileKeyDownDo:", "and:", "not", "isKeyDown", "=", "which"],
>>>>>>>
return _st(self._isKeyDown())._not();
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
if(smalltalk.assert($1)){
self._whileKeyDownDo_(aBlock);
};
return self}, function($ctx1) {$ctx1.fill(self,"handleEvent:forKey:action:",{anEvent:anEvent,anInteger:anInteger,aBlock:aBlock},smalltalk.HLRepeatedKeyDownHandler)})},
args: ["anEvent", "anInteger", "aBlock"],
source: "handleEvent: anEvent forKey: anInteger action: aBlock\x0a\x09(anEvent which = anInteger and: [ self isKeyDown not ])\x0a\x09\x09ifTrue: [ self whileKeyDownDo: aBlock ]",
messageSends: ["ifTrue:", "and:", "=", "which", "not", "isKeyDown", "whileKeyDownDo:"],
<<<<<<<
return self._ifKey_wasPressedIn_thenDo_(key,e,action);
}, function($ctx2) {$ctx2.fillBlock({key:key,action:action},$ctx1,1)})}));
return self}, function($ctx1) {$ctx1.fill(self,"handleKeyDown:",{e:e},smalltalk.HLRepeatingKeyBindingHandler)})},
args: ["e"],
source: "handleKeyDown: e\x0a\x09 keyBindings keysAndValuesDo: [ :key :action | \x0a\x09\x09self ifKey: key wasPressedIn: e thenDo: action ]",
messageSends: ["keysAndValuesDo:", "ifKey:wasPressedIn:thenDo:"],
=======
return self._handleEvent_forKey_action_(anEvent,key,action);
}, function($ctx2) {$ctx2.fillBlock({key:key,action:action},$ctx1)})}));
return self}, function($ctx1) {$ctx1.fill(self,"handleKeyDown:",{anEvent:anEvent},smalltalk.HLRepeatedKeyDownHandler)})},
args: ["anEvent"],
source: "handleKeyDown: anEvent\x0a\x09self keyBindings keysAndValuesDo: [ :key :action | \x0a\x09\x09self handleEvent: anEvent forKey: key action: action ]",
messageSends: ["keysAndValuesDo:", "handleEvent:forKey:action:", "keyBindings"],
>>>>>>>
return self._handleEvent_forKey_action_(anEvent,key,action);
}, function($ctx2) {$ctx2.fillBlock({key:key,action:action},$ctx1,1)})}));
return self}, function($ctx1) {$ctx1.fill(self,"handleKeyDown:",{anEvent:anEvent},smalltalk.HLRepeatedKeyDownHandler)})},
args: ["anEvent"],
source: "handleKeyDown: anEvent\x0a\x09self keyBindings keysAndValuesDo: [ :key :action | \x0a\x09\x09self handleEvent: anEvent forKey: key action: action ]",
messageSends: ["keysAndValuesDo:", "keyBindings", "handleEvent:forKey:action:"], |
<<<<<<<
messageSends: ["basicRenameClass:to:", "announce:", "current", "theClass:", "new", "yourself"]}),
=======
messageSends: ["basicRenameClass:to:", "recompile", "announce:", "theClass:", "new", "yourself", "current"]}),
>>>>>>>
messageSends: ["basicRenameClass:to:", "recompile", "announce:", "current", "theClass:", "new", "yourself"]}), |
<<<<<<<
smalltalk.send(smalltalk.send(self, "_methods", []), "_do_", [(function(each){smalltalk.send((function(){return smalltalk.send((function(){return smalltalk.send(self, "_perform_", [each]);}), "_on_do_", [smalltalk.TestFailure, (function(ex){return smalltalk.send(aResult, "_addFailure_", [smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(self, "_class", []), "_name", []), "__comma", [unescape("%3E%3E")]), "__comma", [each]), "__comma", [": "]), "__comma", [smalltalk.send(ex, "_messageText", [])])]);})]);}), "_on_do_", [smalltalk.Error, (function(ex){return smalltalk.send(aResult, "_addError_", [smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(self, "_class", []), "_name", []), "__comma", [unescape("%3E%3E")]), "__comma", [each]), "__comma", [": "]), "__comma", [smalltalk.send(ex, "_messageText", [])])]);})]);return smalltalk.send(aResult, "_increaseRuns", []);})]);
return self;},
source: unescape('performTestFor%3A%20aResult%0A%09self%20methods%20do%3A%20%5B%3Aeach%20%7C%20%0A%09%09%5B%5Bself%20perform%3A%20each%5D%0A%09%09%09on%3A%20TestFailure%20do%3A%20%5B%3Aex%20%7C%20aResult%20addFailure%3A%20self%20class%20name%2C%20%27%3E%3E%27%2C%20each%2C%20%27%3A%20%27%2C%20ex%20messageText%5D%5D%0A%09%09%09on%3A%20Error%20do%3A%20%5B%3Aex%20%7C%20aResult%20addError%3A%20self%20class%20name%2C%20%27%3E%3E%27%2C%20each%2C%20%27%3A%20%27%2C%20ex%20messageText%5D.%0A%09%09aResult%20increaseRuns%5D'),
messageSends: ["do:", "methods", "on:do:", "perform:", "addFailure:", unescape("%2C"), "name", "class", "messageText", "addError:", "increaseRuns"],
referencedClasses: [smalltalk.TestFailure,smalltalk.Error]
=======
smalltalk.send(smalltalk.send(self, "_methods", []), "_do_", [(function(each){smalltalk.send((function(){return smalltalk.send((function(){return smalltalk.send(self, "_perform_", [each]);}), "_on_do_", [smalltalk.TestFailure, (function(ex){return smalltalk.send(aResult, "_addFailure_", [smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(self, "_class", []), "_name", []), "__comma", [unescape("%3E%3E")]), "__comma", [each])]);})]);}), "_on_do_", [smalltalk.Error, (function(ex){return smalltalk.send(aResult, "_addError_", [smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(self, "_class", []), "_name", []), "__comma", [unescape("%3E%3E")]), "__comma", [each])]);})]);return smalltalk.send(aResult, "_increaseRuns", []);})]);
return self;}
>>>>>>>
smalltalk.send(smalltalk.send(self, "_methods", []), "_do_", [(function(each){smalltalk.send((function(){return smalltalk.send((function(){return smalltalk.send(self, "_perform_", [each]);}), "_on_do_", [smalltalk.TestFailure, (function(ex){return smalltalk.send(aResult, "_addFailure_", [smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(self, "_class", []), "_name", []), "__comma", [unescape("%3E%3E")]), "__comma", [each]), "__comma", [": "]), "__comma", [smalltalk.send(ex, "_messageText", [])])]);})]);}), "_on_do_", [smalltalk.Error, (function(ex){return smalltalk.send(aResult, "_addError_", [smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(self, "_class", []), "_name", []), "__comma", [unescape("%3E%3E")]), "__comma", [each]), "__comma", [": "]), "__comma", [smalltalk.send(ex, "_messageText", [])])]);})]);return smalltalk.send(aResult, "_increaseRuns", []);})]);
return self;}
<<<<<<<
smalltalk.send(self, "_assert_description_", [aBoolean, "Assertion failed"]);
return self;},
source: unescape('assert%3A%20aBoolean%0A%09self%20assert%3A%20aBoolean%20description%3A%20%27Assertion%20failed%27'),
messageSends: ["assert:description:"],
referencedClasses: []
=======
smalltalk.send(aBoolean, "_ifFalse_", [(function(){return smalltalk.send(self, "_signalFailure_", ["Assertion failed"]);})]);
return self;}
>>>>>>>
smalltalk.send(self, "_assert_description_", [aBoolean, "Assertion failed"]);
return self;}
<<<<<<<
return smalltalk.send(self, "_assert_description_", [smalltalk.send(expected, "__eq", [actual]), smalltalk.send(smalltalk.send(smalltalk.send("Expected: ", "__comma", [smalltalk.send(expected, "_asString", [])]), "__comma", [" but was: "]), "__comma", [smalltalk.send(actual, "_asString", [])])]);
return self;},
source: unescape('assert%3A%20expected%20equals%3A%20actual%0A%09%5E%20self%20assert%3A%20%28expected%20%3D%20actual%29%20description%3A%20%27Expected%3A%20%27%2C%20expected%20asString%2C%20%27%20but%20was%3A%20%27%2C%20actual%20asString'),
messageSends: ["assert:description:", unescape("%3D"), unescape("%2C"), "asString"],
referencedClasses: []
}),
smalltalk.TestCase);
smalltalk.addMethod(
'_assert_description_',
smalltalk.method({
selector: 'assert:description:',
category: 'testing',
fn: function (aBoolean, aString){
var self=this;
smalltalk.send(aBoolean, "_ifFalse_", [(function(){return smalltalk.send(self, "_signalFailure_", [aString]);})]);
return self;},
source: unescape('assert%3A%20aBoolean%20description%3A%20aString%0A%09aBoolean%20ifFalse%3A%20%5Bself%20signalFailure%3A%20aString%5D'),
messageSends: ["ifFalse:", "signalFailure:"],
referencedClasses: []
=======
return smalltalk.send(self, "_assert_", [smalltalk.send(expected, "__eq", [actual])]);
return self;}
>>>>>>>
return smalltalk.send(self, "_assert_description_", [smalltalk.send(expected, "__eq", [actual]), smalltalk.send(smalltalk.send(smalltalk.send("Expected: ", "__comma", [smalltalk.send(expected, "_asString", [])]), "__comma", [" but was: "]), "__comma", [smalltalk.send(actual, "_asString", [])])]);
return self;}
}),
smalltalk.TestCase);
smalltalk.addMethod(
'_assert_description_',
smalltalk.method({
selector: 'assert:description:',
fn: function (aBoolean, aString){
var self=this;
smalltalk.send(aBoolean, "_ifFalse_", [(function(){return smalltalk.send(self, "_signalFailure_", [aString]);})]);
return self;} |
<<<<<<<
return smalltalk.HLToolListWidget.fn.prototype._renderContentOn_.apply(_st(self), [html]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}));
=======
return smalltalk.HLMethodsListWidget.superclass.fn.prototype._renderContentOn_.apply(_st(self), [html]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
>>>>>>>
return smalltalk.HLMethodsListWidget.superclass.fn.prototype._renderContentOn_.apply(_st(self), [html]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}));
<<<<<<<
return smalltalk.HLToolListWidget.fn.prototype._renderContentOn_.apply(_st(self), [html]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}));
=======
return smalltalk.HLProtocolsListWidget.superclass.fn.prototype._renderContentOn_.apply(_st(self), [html]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
>>>>>>>
return smalltalk.HLProtocolsListWidget.superclass.fn.prototype._renderContentOn_.apply(_st(self), [html]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})})); |
<<<<<<<
source: "errorUnknownVariable: aNode\x0a\x09\x22Throw an error if the variable is undeclared in the global JS scope (i.e. window).\x0a\x09We allow four variable names in addition: `jQuery`, `window`, `process` and `global`\x0a\x09for nodejs and browser environments.\x0a\x09\x0a\x09This is only to make sure compilation works on both browser-based and nodejs environments.\x0a\x09The ideal solution would be to use a pragma instead\x22\x0a\x0a\x09| identifier |\x0a\x09identifier := aNode value.\x0a\x09\x0a\x09((#('jQuery' 'window' 'document' 'process' 'global') includes: identifier) not\x0a\x09\x09and: [ self isVariableGloballyUndefined: identifier ])\x0a\x09\x09\x09ifTrue: [\x0a\x09\x09\x09\x09UnknownVariableError new\x0a\x09\x09\x09\x09\x09variableName: aNode value;\x0a\x09\x09\x09\x09\x09signal ]\x0a\x09\x09\x09ifFalse: [\x0a\x09\x09\x09\x09currentScope methodScope unknownVariables add: aNode value ]",
messageSends: ["value", "ifTrue:ifFalse:", "and:", "not", "includes:", "isVariableGloballyUndefined:", "variableName:", "new", "signal", "add:", "unknownVariables", "methodScope"],
referencedClasses: ["UnknownVariableError"]
=======
source: "errorUnknownVariable: aNode\x0a\x09\x22Throw an error if the variable is undeclared in the global JS scope (i.e. window).\x0a\x09We allow all variables listed by Smalltalk>>#globalJsVariables.\x0a\x09This list includes: `jQuery`, `window`, `document`, `process` and `global`\x0a\x09for nodejs and browser environments.\x0a\x09\x0a\x09This is only to make sure compilation works on both browser-based and nodejs environments.\x0a\x09The ideal solution would be to use a pragma instead\x22\x0a\x0a\x09| identifier |\x0a\x09identifier := aNode value.\x0a\x09\x0a\x09((Smalltalk current globalJsVariables includes: identifier) not\x0a\x09\x09and: [ self isVariableGloballyUndefined: identifier ])\x0a\x09\x09\x09ifTrue: [\x0a\x09\x09\x09\x09UnknownVariableError new\x0a\x09\x09\x09\x09\x09variableName: aNode value;\x0a\x09\x09\x09\x09\x09signal ]\x0a\x09\x09\x09ifFalse: [\x0a\x09\x09\x09\x09currentScope methodScope unknownVariables add: aNode value ]",
messageSends: ["value", "ifTrue:ifFalse:", "variableName:", "new", "signal", "add:", "unknownVariables", "methodScope", "and:", "isVariableGloballyUndefined:", "not", "includes:", "globalJsVariables", "current"],
referencedClasses: ["UnknownVariableError", "Smalltalk"]
>>>>>>>
source: "errorUnknownVariable: aNode\x0a\x09\x22Throw an error if the variable is undeclared in the global JS scope (i.e. window).\x0a\x09We allow all variables listed by Smalltalk>>#globalJsVariables.\x0a\x09This list includes: `jQuery`, `window`, `document`, `process` and `global`\x0a\x09for nodejs and browser environments.\x0a\x09\x0a\x09This is only to make sure compilation works on both browser-based and nodejs environments.\x0a\x09The ideal solution would be to use a pragma instead\x22\x0a\x0a\x09| identifier |\x0a\x09identifier := aNode value.\x0a\x09\x0a\x09((Smalltalk current globalJsVariables includes: identifier) not\x0a\x09\x09and: [ self isVariableGloballyUndefined: identifier ])\x0a\x09\x09\x09ifTrue: [\x0a\x09\x09\x09\x09UnknownVariableError new\x0a\x09\x09\x09\x09\x09variableName: aNode value;\x0a\x09\x09\x09\x09\x09signal ]\x0a\x09\x09\x09ifFalse: [\x0a\x09\x09\x09\x09currentScope methodScope unknownVariables add: aNode value ]",
messageSends: ["value", "ifTrue:ifFalse:", "and:", "not", "includes:", "globalJsVariables", "current", "isVariableGloballyUndefined:", "variableName:", "new", "signal", "add:", "unknownVariables", "methodScope"],
referencedClasses: ["Smalltalk", "UnknownVariableError"]
<<<<<<<
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)})}));
smalltalk.NodeVisitor.fn.prototype._visitBlockNode_.apply(_st(self), [aNode]);
=======
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1)})}));
smalltalk.SemanticAnalyzer.superclass.fn.prototype._visitBlockNode_.apply(_st(self), [aNode]);
>>>>>>>
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)})}));
smalltalk.SemanticAnalyzer.superclass.fn.prototype._visitBlockNode_.apply(_st(self), [aNode]);
<<<<<<<
smalltalk.NodeVisitor.fn.prototype._visitCascadeNode_.apply(_st(self), [aNode]);
=======
_st(_st(aNode)._nodes())._do_((function(each){
return smalltalk.withContext(function($ctx2) {
return _st(each)._receiver_(_st(aNode)._receiver());
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1)})}));
smalltalk.SemanticAnalyzer.superclass.fn.prototype._visitCascadeNode_.apply(_st(self), [aNode]);
>>>>>>>
smalltalk.SemanticAnalyzer.superclass.fn.prototype._visitCascadeNode_.apply(_st(self), [aNode]);
<<<<<<<
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)})}));
smalltalk.NodeVisitor.fn.prototype._visitMethodNode_.apply(_st(self), [aNode]);
=======
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1)})}));
smalltalk.SemanticAnalyzer.superclass.fn.prototype._visitMethodNode_.apply(_st(self), [aNode]);
>>>>>>>
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)})}));
smalltalk.SemanticAnalyzer.superclass.fn.prototype._visitMethodNode_.apply(_st(self), [aNode]);
<<<<<<<
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)})}));
smalltalk.NodeVisitor.fn.prototype._visitSequenceNode_.apply(_st(self), [aNode]);
=======
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1)})}));
smalltalk.SemanticAnalyzer.superclass.fn.prototype._visitSequenceNode_.apply(_st(self), [aNode]);
>>>>>>>
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,1)})}));
smalltalk.SemanticAnalyzer.superclass.fn.prototype._visitSequenceNode_.apply(_st(self), [aNode]); |
<<<<<<<
smalltalk.packages["Helios-Exceptions"].transport = {"type":"amd","amdNamespace":"amber"};
=======
>>>>>>>
smalltalk.packages["Helios-Exceptions"].transport = {"type":"amd","amdNamespace":"amber"};
<<<<<<<
});
=======
})(global_smalltalk,global_nil,global__st);
>>>>>>>
}); |
<<<<<<<
"_isCompiledMethod",
smalltalk.method({
selector: "isCompiledMethod",
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
return false;
}, function($ctx1) {$ctx1.fill(self,"isCompiledMethod",{},smalltalk.Object)})},
messageSends: []}),
smalltalk.Object);
smalltalk.addMethod(
"_isImmutable",
=======
>>>>>>>
smalltalk.method({
selector: "isCompiledMethod",
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
return false;
}, function($ctx1) {$ctx1.fill(self,"isCompiledMethod",{},smalltalk.Object)})},
messageSends: []}),
smalltalk.Object);
smalltalk.addMethod(
<<<<<<<
"_isPackage",
smalltalk.method({
selector: "isPackage",
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
return false;
}, function($ctx1) {$ctx1.fill(self,"isPackage",{},smalltalk.Object)})},
messageSends: []}),
smalltalk.Object);
smalltalk.addMethod(
"_isParseFailure",
=======
>>>>>>>
smalltalk.method({
selector: "isPackage",
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
return false;
}, function($ctx1) {$ctx1.fill(self,"isPackage",{},smalltalk.Object)})},
messageSends: []}),
smalltalk.Object);
smalltalk.addMethod(
<<<<<<<
"_isPackage",
smalltalk.method({
selector: "isPackage",
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
return true;
}, function($ctx1) {$ctx1.fill(self,"isPackage",{},smalltalk.Package)})},
messageSends: []}),
smalltalk.Package);
smalltalk.addMethod(
"_name",
=======
>>>>>>>
smalltalk.method({
selector: "isPackage",
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
return true;
}, function($ctx1) {$ctx1.fill(self,"isPackage",{},smalltalk.Package)})},
messageSends: []}),
smalltalk.Package);
smalltalk.addMethod( |
<<<<<<<
selector: "renderActionFor:html:",
fn: function (aBinder,html){
var self=this;
return smalltalk.withContext(function($ctx1) {
var $1,$3,$4,$5,$6,$2;
$1=_st(html)._span();
_st($1)._class_("command");
$2=_st($1)._with_((function(){
return smalltalk.withContext(function($ctx2) {
$3=_st(html)._span();
_st($3)._class_("label");
$4=_st($3)._with_(_st(self._shortcut())._asLowercase());
$4;
$5=_st(html)._a();
_st($5)._class_("action");
_st($5)._with_(self._displayLabel());
$6=_st($5)._onClick_((function(){
return smalltalk.withContext(function($ctx3) {
return _st(aBinder)._applyBinding_(self);
}, function($ctx3) {$ctx3.fillBlock({},$ctx2,2)})}));
return $6;
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
return self}, function($ctx1) {$ctx1.fill(self,"renderActionFor:html:",{aBinder:aBinder,html:html},smalltalk.HLBinding)})},
messageSends: ["class:", "span", "with:", "asLowercase", "shortcut", "a", "displayLabel", "onClick:", "applyBinding:"]}),
smalltalk.HLBinding);
smalltalk.addMethod(
smalltalk.method({
=======
>>>>>>>
<<<<<<<
return self}, function($ctx1) {$ctx1.fill(self,"applyOn:",{aKeyBinder:aKeyBinder},smalltalk.HLBindingAction)})},
messageSends: ["ifTrue:ifFalse:", "isInputRequired", "command", "selectBinding:", "inputBinding", "execute"]}),
=======
return self}, function($ctx1) {$ctx1.fill(self,"apply",{},smalltalk.HLBindingAction)})},
messageSends: ["ifTrue:ifFalse:", "showWidget:", "inputWidget", "helper", "current", "executeCommand", "isInputRequired", "command"]}),
>>>>>>>
return self}, function($ctx1) {$ctx1.fill(self,"apply",{},smalltalk.HLBindingAction)})},
messageSends: ["ifTrue:ifFalse:", "isInputRequired", "command", "showWidget:", "helper", "current", "inputWidget", "executeCommand"]}),
<<<<<<<
self._errorStatus();
return self._isFinal_(false);
}, function($ctx2) {$ctx2.fillBlock({ex:ex},$ctx1,2)})}));
return self}, function($ctx1) {$ctx1.fill(self,"evaluate:",{aString:aString},smalltalk.HLBindingInput)})},
messageSends: ["on:do:", "value:", "callback", "one:do:", "asJQuery", "input", "clearStatus", "message:", "messageText", "errorStatus", "isFinal:"]}),
smalltalk.HLBindingInput);
=======
return self._errorStatus();
}, function($ctx2) {$ctx2.fillBlock({ex:ex},$ctx1)})}));
return self}, function($ctx1) {$ctx1.fill(self,"evaluate:",{aString:aString},smalltalk.HLBindingActionInputWidget)})},
messageSends: ["on:do:", "one:do:", "clearStatus", "asJQuery", "input", "message:", "messageText", "errorStatus", "value:", "callback"]}),
smalltalk.HLBindingActionInputWidget);
>>>>>>>
return self._errorStatus();
}, function($ctx2) {$ctx2.fillBlock({ex:ex},$ctx1,2)})}));
return self}, function($ctx1) {$ctx1.fill(self,"evaluate:",{aString:aString},smalltalk.HLBindingActionInputWidget)})},
messageSends: ["on:do:", "value:", "callback", "one:do:", "asJQuery", "input", "clearStatus", "message:", "messageText", "errorStatus"]}),
smalltalk.HLBindingActionInputWidget);
<<<<<<<
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,3)})}))._valueWithTimeout_((10));
return self}, function($ctx1) {$ctx1.fill(self,"renderOn:html:",{aBinder:aBinder,html:html},smalltalk.HLBindingInput)})},
messageSends: ["ifNil:", "span", "class:", "status", "with:", "placeholder:", "input", "ghostText", "value:", "defaultValue", "yourself", "typeahead:", "asJQuery", "->", "inputCompletion", "message", "valueWithTimeout:", "focus"]}),
smalltalk.HLBindingInput);
=======
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}))._valueWithTimeout_((10));
return self}, function($ctx1) {$ctx1.fill(self,"renderOn:",{html:html},smalltalk.HLBindingActionInputWidget)})},
messageSends: ["ifNil:", "span", "class:", "status", "with:", "placeholder:", "ghostText", "input", "value:", "defaultValue", "onKeyDown:", "yourself", "ifTrue:", "evaluate:", "val", "asJQuery", "=", "which", "typeahead:", "->", "inputCompletion", "message", "valueWithTimeout:", "focus"]}),
smalltalk.HLBindingActionInputWidget);
>>>>>>>
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,5)})}))._valueWithTimeout_((10));
return self}, function($ctx1) {$ctx1.fill(self,"renderOn:",{html:html},smalltalk.HLBindingActionInputWidget)})},
messageSends: ["ifNil:", "span", "class:", "status", "with:", "placeholder:", "input", "ghostText", "value:", "defaultValue", "onKeyDown:", "yourself", "ifTrue:", "=", "which", "evaluate:", "val", "asJQuery", "typeahead:", "->", "inputCompletion", "message", "valueWithTimeout:", "focus"]}),
smalltalk.HLBindingActionInputWidget);
<<<<<<<
messageSends: ["ifFalse:", "isActive", "selectBinding:", "applyOn:", "ifTrue:", "isFinal", "deactivate"]}),
=======
messageSends: ["ifFalse:", "isActive", "selectBinding:", "apply"]}),
>>>>>>>
messageSends: ["ifFalse:", "isActive", "selectBinding:", "apply"]}),
<<<<<<<
return _st(each)._renderActionFor_html_(self._keyBinder(),html);
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)})}));
return self}, function($ctx1) {$ctx1.fill(self,"renderBindingGroup:on:",{aBindingGroup:aBindingGroup,html:html},smalltalk.HLKeyBinderHelper)})},
messageSends: ["do:", "sorted:", "activeBindings", "<", "key", "renderActionFor:html:", "keyBinder"]}),
smalltalk.HLKeyBinderHelper);
smalltalk.addMethod(
smalltalk.method({
selector: "renderBindingOn:",
fn: function (html){
var self=this;
return smalltalk.withContext(function($ctx1) {
_st(self._selectedBinding())._renderOn_html_(self,html);
return self}, function($ctx1) {$ctx1.fill(self,"renderBindingOn:",{html:html},smalltalk.HLKeyBinderHelper)})},
messageSends: ["renderOn:html:", "selectedBinding"]}),
smalltalk.HLKeyBinderHelper);
=======
return self._renderBindingActionFor_on_(each,html);
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1)})}));
return self}, function($ctx1) {$ctx1.fill(self,"renderBindingGroup:on:",{aBindingGroup:aBindingGroup,html:html},smalltalk.HLKeyBinderHelperWidget)})},
messageSends: ["do:", "renderBindingActionFor:on:", "sorted:", "<", "key", "activeBindings"]}),
smalltalk.HLKeyBinderHelperWidget);
>>>>>>>
return self._renderBindingActionFor_on_(each,html);
}, function($ctx2) {$ctx2.fillBlock({each:each},$ctx1,2)})}));
return self}, function($ctx1) {$ctx1.fill(self,"renderBindingGroup:on:",{aBindingGroup:aBindingGroup,html:html},smalltalk.HLKeyBinderHelperWidget)})},
messageSends: ["do:", "sorted:", "activeBindings", "<", "key", "renderBindingActionFor:on:"]}),
smalltalk.HLKeyBinderHelperWidget);
<<<<<<<
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}));
return self}, function($ctx1) {$ctx1.fill(self,"renderCloseOn:",{html:html},smalltalk.HLKeyBinderHelper)})},
=======
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
return self}, function($ctx1) {$ctx1.fill(self,"renderCloseOn:",{html:html},smalltalk.HLKeyBinderHelperWidget)})},
>>>>>>>
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}));
return self}, function($ctx1) {$ctx1.fill(self,"renderCloseOn:",{html:html},smalltalk.HLKeyBinderHelperWidget)})},
<<<<<<<
}, function($ctx2) {$ctx2.fillBlock({html:html},$ctx1,1)})}))._appendToJQuery_("body"._asJQuery());
return self}, function($ctx1) {$ctx1.fill(self,"renderCog",{},smalltalk.HLKeyBinderHelper)})},
messageSends: ["appendToJQuery:", "id:", "div", "with:", "a", "class:", "tag:", "onClick:", "activate", "keyBinder", "asJQuery"]}),
smalltalk.HLKeyBinderHelper);
=======
}, function($ctx2) {$ctx2.fillBlock({html:html},$ctx1)})}))._appendToJQuery_("body"._asJQuery());
return self}, function($ctx1) {$ctx1.fill(self,"renderCog",{},smalltalk.HLKeyBinderHelperWidget)})},
messageSends: ["appendToJQuery:", "asJQuery", "id:", "div", "with:", "class:", "tag:", "a", "onClick:", "activate", "keyBinder"]}),
smalltalk.HLKeyBinderHelperWidget);
>>>>>>>
}, function($ctx2) {$ctx2.fillBlock({html:html},$ctx1,1)})}))._appendToJQuery_("body"._asJQuery());
return self}, function($ctx1) {$ctx1.fill(self,"renderCog",{},smalltalk.HLKeyBinderHelperWidget)})},
messageSends: ["appendToJQuery:", "id:", "div", "with:", "a", "class:", "tag:", "onClick:", "activate", "keyBinder", "asJQuery"]}),
smalltalk.HLKeyBinderHelperWidget);
<<<<<<<
$3=self;
_st($3)._renderSelectionOn_(html);
_st($3)._renderBindingOn_(html);
$4=_st($3)._renderCloseOn_(html);
return $4;
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
return self}, function($ctx1) {$ctx1.fill(self,"renderContentOn:",{html:html},smalltalk.HLKeyBinderHelper)})},
messageSends: ["class:", "div", "cssClass", "with:", "renderSelectionOn:", "renderBindingOn:", "renderCloseOn:"]}),
smalltalk.HLKeyBinderHelper);
=======
self._renderLabelOn_(html);
$3=_st(html)._div();
_st($3)._id_(self._mainId());
$4=_st($3)._with_((function(){
return smalltalk.withContext(function($ctx3) {
return self._renderSelectedBindingOn_(html);
}, function($ctx3) {$ctx3.fillBlock({},$ctx2)})}));
$4;
return self._renderCloseOn_(html);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
return self}, function($ctx1) {$ctx1.fill(self,"renderContentOn:",{html:html},smalltalk.HLKeyBinderHelperWidget)})},
messageSends: ["class:", "cssClass", "div", "with:", "renderLabelOn:", "id:", "mainId", "renderSelectedBindingOn:", "renderCloseOn:"]}),
smalltalk.HLKeyBinderHelperWidget);
>>>>>>>
self._renderLabelOn_(html);
$3=_st(html)._div();
_st($3)._id_(self._mainId());
$4=_st($3)._with_((function(){
return smalltalk.withContext(function($ctx3) {
return self._renderSelectedBindingOn_(html);
}, function($ctx3) {$ctx3.fillBlock({},$ctx2,2)})}));
$4;
return self._renderCloseOn_(html);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
return self}, function($ctx1) {$ctx1.fill(self,"renderContentOn:",{html:html},smalltalk.HLKeyBinderHelperWidget)})},
messageSends: ["class:", "div", "cssClass", "with:", "renderLabelOn:", "id:", "mainId", "renderSelectedBindingOn:", "renderCloseOn:"]}),
smalltalk.HLKeyBinderHelperWidget);
<<<<<<<
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}))._valueWithTimeout_((2000));
return self}, function($ctx1) {$ctx1.fill(self,"renderStart",{},smalltalk.HLKeyBinderHelper)})},
=======
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}))._valueWithTimeout_((2000));
return self}, function($ctx1) {$ctx1.fill(self,"renderStart",{},smalltalk.HLKeyBinderHelperWidget)})},
>>>>>>>
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}))._valueWithTimeout_((2000));
return self}, function($ctx1) {$ctx1.fill(self,"renderStart",{},smalltalk.HLKeyBinderHelperWidget)})},
<<<<<<<
return self._handleKeyUp_(e);
}, function($ctx2) {$ctx2.fillBlock({e:e},$ctx1,2)})}));
return self}, function($ctx1) {$ctx1.fill(self,"bindKeys",{},smalltalk.HLRepeatingKeyBindingHandler)})},
messageSends: ["bindKeyDown:up:", "handleKeyDown:", "handleKeyUp:"]}),
smalltalk.HLRepeatingKeyBindingHandler);
=======
return self._handleKeyUp();
}, function($ctx2) {$ctx2.fillBlock({e:e},$ctx1)})}));
return self}, function($ctx1) {$ctx1.fill(self,"bindKeys",{},smalltalk.HLRepeatedKeyDownHandler)})},
messageSends: ["bindKeyDown:keyUp:", "handleKeyDown:", "handleKeyUp", "widget"]}),
smalltalk.HLRepeatedKeyDownHandler);
>>>>>>>
return self._handleKeyUp();
}, function($ctx2) {$ctx2.fillBlock({e:e},$ctx1,2)})}));
return self}, function($ctx1) {$ctx1.fill(self,"bindKeys",{},smalltalk.HLRepeatedKeyDownHandler)})},
messageSends: ["bindKeyDown:keyUp:", "widget", "handleKeyDown:", "handleKeyUp"]}),
smalltalk.HLRepeatedKeyDownHandler);
<<<<<<<
self["@interval"]=self._startRepeatingAction_(action);
return self["@interval"];
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}))._valueWithTimeout_((300));
return $1;
}, function($ctx1) {$ctx1.fill(self,"delayBeforeStartingRepeatWithAction:",{action:action},smalltalk.HLRepeatingKeyBindingHandler)})},
messageSends: ["valueWithTimeout:", "startRepeatingAction:"]}),
smalltalk.HLRepeatingKeyBindingHandler);
=======
return _st(self._isKeyDown())._not();
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
if(smalltalk.assert($1)){
self._whileKeyDownDo_(aBlock);
};
return self}, function($ctx1) {$ctx1.fill(self,"handleEvent:forKey:action:",{anEvent:anEvent,anInteger:anInteger,aBlock:aBlock},smalltalk.HLRepeatedKeyDownHandler)})},
messageSends: ["ifTrue:", "whileKeyDownDo:", "and:", "not", "isKeyDown", "=", "which"]}),
smalltalk.HLRepeatedKeyDownHandler);
>>>>>>>
return _st(self._isKeyDown())._not();
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
if(smalltalk.assert($1)){
self._whileKeyDownDo_(aBlock);
};
return self}, function($ctx1) {$ctx1.fill(self,"handleEvent:forKey:action:",{anEvent:anEvent,anInteger:anInteger,aBlock:aBlock},smalltalk.HLRepeatedKeyDownHandler)})},
messageSends: ["ifTrue:", "and:", "=", "which", "not", "isKeyDown", "whileKeyDownDo:"]}),
smalltalk.HLRepeatedKeyDownHandler);
<<<<<<<
return self._ifKey_wasPressedIn_thenDo_(key,e,action);
}, function($ctx2) {$ctx2.fillBlock({key:key,action:action},$ctx1,1)})}));
return self}, function($ctx1) {$ctx1.fill(self,"handleKeyDown:",{e:e},smalltalk.HLRepeatingKeyBindingHandler)})},
messageSends: ["keysAndValuesDo:", "ifKey:wasPressedIn:thenDo:"]}),
smalltalk.HLRepeatingKeyBindingHandler);
=======
return self._handleEvent_forKey_action_(anEvent,key,action);
}, function($ctx2) {$ctx2.fillBlock({key:key,action:action},$ctx1)})}));
return self}, function($ctx1) {$ctx1.fill(self,"handleKeyDown:",{anEvent:anEvent},smalltalk.HLRepeatedKeyDownHandler)})},
messageSends: ["keysAndValuesDo:", "handleEvent:forKey:action:", "keyBindings"]}),
smalltalk.HLRepeatedKeyDownHandler);
>>>>>>>
return self._handleEvent_forKey_action_(anEvent,key,action);
}, function($ctx2) {$ctx2.fillBlock({key:key,action:action},$ctx1,1)})}));
return self}, function($ctx1) {$ctx1.fill(self,"handleKeyDown:",{anEvent:anEvent},smalltalk.HLRepeatedKeyDownHandler)})},
messageSends: ["keysAndValuesDo:", "keyBindings", "handleEvent:forKey:action:"]}),
smalltalk.HLRepeatedKeyDownHandler); |
<<<<<<<
smalltalk.packages["Kernel-Exceptions"].transport = {"type":"amd","amdNamespace":"amber"};
=======
>>>>>>>
smalltalk.packages["Kernel-Exceptions"].transport = {"type":"amd","amdNamespace":"amber"};
<<<<<<<
});
=======
})(global_smalltalk,global_nil,global__st);
>>>>>>>
}); |
<<<<<<<
smalltalk.packages["Compiler-Semantic"].transport = {"type":"amd","amdNamespace":"amber"};
=======
>>>>>>>
smalltalk.packages["Compiler-Semantic"].transport = {"type":"amd","amdNamespace":"amber"};
<<<<<<<
});
=======
})(global_smalltalk,global_nil,global__st);
>>>>>>>
}); |
<<<<<<<
import terminalLink from 'terminal-link'
=======
import { runCommandTask } from 'src/lib'
>>>>>>>
<<<<<<<
import { runCommandTask } from 'src/lib'
=======
import * as options from 'src/commands/dbCommands/options'
>>>>>>>
import * as options from 'src/commands/dbCommands/options'
import { runCommandTask } from 'src/lib' |
<<<<<<<
"_isCompiledMethod",
smalltalk.method({
selector: "isCompiledMethod",
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
return true;
}, function($ctx1) {$ctx1.fill(self,"isCompiledMethod",{},smalltalk.CompiledMethod)})},
messageSends: []}),
smalltalk.CompiledMethod);
smalltalk.addMethod(
"_messageSends",
=======
>>>>>>>
smalltalk.method({
selector: "isCompiledMethod",
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
return true;
}, function($ctx1) {$ctx1.fill(self,"isCompiledMethod",{},smalltalk.CompiledMethod)})},
messageSends: []}),
smalltalk.CompiledMethod);
smalltalk.addMethod( |
<<<<<<<
smalltalk.packages["Kernel-Methods"].transport = {"type":"amd","amdNamespace":"amber"};
=======
>>>>>>>
smalltalk.packages["Kernel-Methods"].transport = {"type":"amd","amdNamespace":"amber"};
<<<<<<<
});
=======
})(global_smalltalk,global_nil,global__st);
>>>>>>>
}); |
<<<<<<<
this.methods = [];
this.selectors = [];
this.get = function (string) {
var index = this.selectors.indexOf(string);
if(index !== -1) {
return this.methods[index];
}
this.selectors.push(string);
var selector = st.selector(string);
var method = {jsSelector: selector, fn: this.createHandler(selector)};
this.methods.push(method);
return method;
};
/* Dnu handler method */
this.createHandler = function (selector) {
var handler = function() {
var args = Array.prototype.slice.call(arguments);
return brikz.messageSend.messageNotUnderstood(this, selector, args);
};
return handler;
}
this.installHandlers = function (klass) {
var m = this.methods;
for(var i=0; i<m.length; i++) {
manip.installMethodIfAbsent(m[i], klass);
}
};
}
function ClassInitBrik(brikz, st) {
var dnu = brikz.ensure("dnu");
var manip = brikz.ensure("manipulation");
var nil = brikz.ensure("root").nil;
/* Initialize a class in its class hierarchy. Handle both classes and
metaclasses. */
st.init = function(klass) {
st.initClass(klass);
if(klass.klass && !klass.meta) {
st.initClass(klass.klass);
}
};
st.initClass = function(klass) {
if(klass.wrapped) {
klass.inheritedMethods = {};
copySuperclass(klass);
} else {
installSuperclass(klass);
}
if(klass === st.Object || klass.wrapped) {
dnu.installHandlers(klass);
}
};
function installSuperclass(klass) {
// only if the klass has not been initialized yet.
if(klass.fn.prototype._yourself) { return; }
if(klass.superclass && klass.superclass !== nil) {
inherits(klass.fn, klass.superclass.fn);
manip.wireKlass(klass);
manip.reinstallMethods(klass);
}
}
=======
var dnu = {
methods: [],
selectors: [],
checker: Object.create(null),
>>>>>>>
this.methods = [];
this.selectors = [];
this.checker = Object.create(null);
this.get = function (string) {
var index = this.selectors.indexOf(string);
if(index !== -1) {
return this.methods[index];
}
this.selectors.push(string);
var selector = st.selector(string);
this.checker[selector] = true;
var method = {jsSelector: selector, fn: this.createHandler(selector)};
this.methods.push(method);
return method;
};
this.isSelector = function (selector) {
return this.checker[selector];
};
/* Dnu handler method */
this.createHandler = function (selector) {
var handler = function() {
var args = Array.prototype.slice.call(arguments);
return brikz.messageSend.messageNotUnderstood(this, selector, args);
};
return handler;
}
this.installHandlers = function (klass) {
var m = this.methods;
for(var i=0; i<m.length; i++) {
manip.installMethodIfAbsent(m[i], klass);
}
};
}
function ClassInitBrik(brikz, st) {
var dnu = brikz.ensure("dnu");
var manip = brikz.ensure("manipulation");
var nil = brikz.ensure("root").nil;
/* Initialize a class in its class hierarchy. Handle both classes and
metaclasses. */
st.init = function(klass) {
st.initClass(klass);
if(klass.klass && !klass.meta) {
st.initClass(klass.klass);
}
};
st.initClass = function(klass) {
if(klass.wrapped) {
copySuperclass(klass);
}
if(klass === st.Object || klass.wrapped) {
dnu.installHandlers(klass);
}
};
<<<<<<<
st.addPackage = function(pkgName, properties) {
if(!pkgName) {return nil;}
if(!(st.packages[pkgName])) {
st.packages[pkgName] = pkg({
pkgName: pkgName,
properties: properties
});
} else {
if(properties) {
st.packages[pkgName].properties = properties;
}
=======
st.initClass = function(klass) {
if(klass.wrapped) {
copySuperclass(klass);
}
if(klass === st.Object || klass.wrapped) {
installDnuHandlers(klass);
>>>>>>>
st.addPackage = function(pkgName, properties) {
if(!pkgName) {return nil;}
if(!(st.packages[pkgName])) {
st.packages[pkgName] = pkg({
pkgName: pkgName,
properties: properties
});
} else {
if(properties) {
st.packages[pkgName].properties = properties;
}
<<<<<<<
/* Add a class to the smalltalk object, creating a new one if needed.
A Package is lazily created if it does not exist with given name. */
st.addClass = function(className, superclass, iVarNames, pkgName) {
if (superclass == nil) { superclass = null; }
rawAddClass(pkgName, className, superclass, iVarNames, false, null);
};
function rawAddClass(pkgName, className, superclass, iVarNames, wrapped, fn) {
var pkg = st.addPackage(pkgName);
if(st[className] && st[className].superclass == superclass) {
// st[className].superclass = superclass;
st[className].iVarNames = iVarNames || [];
if (pkg) st[className].pkg = pkg;
} else {
if(st[className]) {
st.removeClass(st[className]);
=======
function wireKlass(klass) {
Object.defineProperty(klass.fn.prototype, "klass", {
value: klass,
enumerable: false, configurable: true, writable: true
});
}
function copySuperclass(klass, superclass) {
var inheritedMethods = {};
deinstallAllMethods(klass);
for (superclass = superclass || klass.superclass;
superclass && superclass !== nil;
superclass = superclass.superclass) {
for (var keys = Object.keys(superclass.methods), i = 0; i < keys.length; i++) {
inheritMethodIfAbsent(superclass.methods[keys[i]]);
>>>>>>>
/* Add a class to the smalltalk object, creating a new one if needed.
A Package is lazily created if it does not exist with given name. */
st.addClass = function(className, superclass, iVarNames, pkgName) {
if (superclass == nil) { superclass = null; }
rawAddClass(pkgName, className, superclass, iVarNames, false, null);
};
function rawAddClass(pkgName, className, superclass, iVarNames, wrapped, fn) {
var pkg = st.addPackage(pkgName);
if(st[className] && st[className].superclass == superclass) {
// st[className].superclass = superclass;
st[className].iVarNames = iVarNames || [];
if (pkg) st[className].pkg = pkg;
} else {
if(st[className]) {
st.removeClass(st[className]);
<<<<<<<
=======
reinstallMethods(klass);
function inheritMethodIfAbsent(method) {
var selector = method.selector;
//TODO: prepare klass methods into inheritedMethods to only test once
//TODO: Object.create(null) to ditch hasOwnProperty call (very slow)
if(klass.methods.hasOwnProperty(selector) || inheritedMethods.hasOwnProperty(selector)) {
return;
}
installMethod(method, klass);
inheritedMethods[method.selector] = true;
}
}
>>>>>>>
<<<<<<<
var nil = brikz.ensure("root").nil;
=======
propagateMethodChange(klass);
>>>>>>>
var nil = brikz.ensure("root").nil;
<<<<<<<
// Fallbacks
SmalltalkMethodContext.prototype.locals = {};
SmalltalkMethodContext.prototype.receiver = null;
SmalltalkMethodContext.prototype.selector = null;
SmalltalkMethodContext.prototype.lookupClass = null;
=======
st.removeMethod = function(method, klass) {
if (klass !== method.methodClass) {
throw new Error(
"Refusing to remove method "
+ method.methodClass.className+">>"+method.selector
+ " from different class "
+ klass.className);
}
>>>>>>>
// Fallbacks
SmalltalkMethodContext.prototype.locals = {};
SmalltalkMethodContext.prototype.receiver = null;
SmalltalkMethodContext.prototype.selector = null;
SmalltalkMethodContext.prototype.lookupClass = null;
<<<<<<<
this.__init__ = function () {
st.wrapClassName("MethodContext", "Kernel-Methods", SmalltalkMethodContext, st.Object, false);
=======
st.initClass(klass);
propagateMethodChange(klass);
// Do *not* delete protocols from here.
// This is handled by #removeCompiledMethod
>>>>>>>
this.__init__ = function () {
st.wrapClassName("MethodContext", "Kernel-Methods", SmalltalkMethodContext, st.Object, false); |
<<<<<<<
smalltalk.addMethod(
unescape('_%5C%5C'),
smalltalk.method({
selector: unescape('%5C%5C'),
category: 'arithmetic',
fn: function (aNumber){
var self=this;
return self % aNumber;
return self;},
args: ["aNumber"],
source: unescape('%5C%5C%20aNumber%0A%09%3Creturn%20self%20%25%20aNumber%3E'),
messageSends: [],
referencedClasses: []
}),
smalltalk.Number);
=======
smalltalk.addMethod(
unescape('_sqrt'),
smalltalk.method({
selector: unescape('sqrt'),
category: 'arithmetic',
fn: function (){
var self=this;
return Math.sqrt(self);
return self;},
args: [],
source: unescape('sqrt%0A%09%3Creturn%20Math.sqrt%28self%29%3E'),
messageSends: [],
referencedClasses: []
}),
smalltalk.Number);
smalltalk.addMethod(
unescape('_squared'),
smalltalk.method({
selector: unescape('squared'),
category: 'arithmetic',
fn: function (){
var self=this;
return self * self;
return self;},
args: [],
source: unescape('squared%0A%09%5Eself%20*%20self'),
messageSends: [unescape("*")],
referencedClasses: []
}),
smalltalk.Number);
>>>>>>>
smalltalk.addMethod(
unescape('_%5C%5C'),
smalltalk.method({
selector: unescape('%5C%5C'),
category: 'arithmetic',
fn: function (aNumber){
var self=this;
return self % aNumber;
return self;},
args: ["aNumber"],
source: unescape('%5C%5C%20aNumber%0A%09%3Creturn%20self%20%25%20aNumber%3E'),
messageSends: [],
referencedClasses: []
}),
smalltalk.Number);
smalltalk.addMethod(
unescape('_sqrt'),
smalltalk.method({
selector: unescape('sqrt'),
category: 'arithmetic',
fn: function (){
var self=this;
return Math.sqrt(self);
return self;},
args: [],
source: unescape('sqrt%0A%09%3Creturn%20Math.sqrt%28self%29%3E'),
messageSends: [],
referencedClasses: []
}),
smalltalk.Number);
smalltalk.addMethod(
unescape('_squared'),
smalltalk.method({
selector: unescape('squared'),
category: 'arithmetic',
fn: function (){
var self=this;
return self * self;
return self;},
args: [],
source: unescape('squared%0A%09%5Eself%20*%20self'),
messageSends: [unescape("*")],
referencedClasses: []
}),
smalltalk.Number); |
<<<<<<<
fn: function (aBlock,anotherBlock){
var self=this;
return smalltalk.withContext(function($ctx1) {
try{result = aBlock()} catch(e) {result = anotherBlock(e)};
return result;;
;
return self}, self, "try:catch:", [aBlock,anotherBlock], smalltalk.Object)}
=======
fn: function (aBlock,anotherBlock){
var self=this;
try{return aBlock()} catch(e) {return anotherBlock(e)};
;
return self}
>>>>>>>
fn: function (aBlock,anotherBlock){
var self=this;
return smalltalk.withContext(function($ctx1) {
try{return aBlock()} catch(e) {return anotherBlock(e)};
;
return self}, self, "try:catch:", [aBlock,anotherBlock], smalltalk.Object)} |
<<<<<<<
selector: "testDNURegression1057",
protocol: 'tests',
fn: function (){
var self=this;
var jsObject;
function $Error(){return globals.Error||(typeof Error=="undefined"?nil:Error)}
return smalltalk.withContext(function($ctx1) {
var $1;
jsObject=[];
_st(jsObject)._basicAt_put_("allowJavaScriptCalls",true);
$ctx1.sendIdx["basicAt:put:"]=1;
_st(jsObject)._basicAt_put_("foo",(3));
self._shouldnt_raise_((function(){
return smalltalk.withContext(function($ctx2) {
return _st(jsObject)._foo();
$ctx2.sendIdx["foo"]=1;
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}),$Error());
$ctx1.sendIdx["shouldnt:raise:"]=1;
$1=_st(jsObject)._foo();
$ctx1.sendIdx["foo"]=2;
self._assert_equals_($1,(3));
$ctx1.sendIdx["assert:equals:"]=1;
self._shouldnt_raise_((function(){
return smalltalk.withContext(function($ctx2) {
return _st(jsObject)._foo_((4));
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}),$Error());
self._assert_equals_(_st(jsObject)._foo(),(4));
return self}, function($ctx1) {$ctx1.fill(self,"testDNURegression1057",{jsObject:jsObject},globals.JSObjectProxyTest)})},
args: [],
source: "testDNURegression1057\x0a\x09| jsObject |\x0a\x09jsObject := #().\x0a\x09jsObject basicAt: 'allowJavaScriptCalls' put: true.\x0a\x09jsObject basicAt: 'foo' put: 3.\x0a\x09self shouldnt: [ jsObject foo ] raise: Error.\x0a\x09self assert: jsObject foo equals: 3.\x0a\x09self shouldnt: [ jsObject foo: 4 ] raise: Error.\x0a\x09self assert: jsObject foo equals: 4",
messageSends: ["basicAt:put:", "shouldnt:raise:", "foo", "assert:equals:", "foo:"],
referencedClasses: ["Error"]
}),
globals.JSObjectProxyTest);
smalltalk.addMethod(
smalltalk.method({
=======
selector: "testDNURegression1059",
protocol: 'tests',
fn: function (){
var self=this;
var jsObject;
function $Error(){return globals.Error||(typeof Error=="undefined"?nil:Error)}
return smalltalk.withContext(function($ctx1) {
jsObject=[];
_st(jsObject)._basicAt_put_("allowJavaScriptCalls",true);
$ctx1.sendIdx["basicAt:put:"]=1;
_st(jsObject)._basicAt_put_("x",(3));
$ctx1.sendIdx["basicAt:put:"]=2;
_st(jsObject)._basicAt_put_("x:",(function(){
return smalltalk.withContext(function($ctx2) {
return self._error();
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
self._shouldnt_raise_((function(){
return smalltalk.withContext(function($ctx2) {
return _st(jsObject)._x_((4));
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}),$Error());
self._assert_equals_(_st(jsObject)._x(),(4));
return self}, function($ctx1) {$ctx1.fill(self,"testDNURegression1059",{jsObject:jsObject},globals.JSObjectProxyTest)})},
args: [],
source: "testDNURegression1059\x0a\x09| jsObject |\x0a\x09jsObject := #().\x0a\x09jsObject basicAt: 'allowJavaScriptCalls' put: true.\x0a\x09jsObject basicAt: 'x' put: 3.\x0a\x09jsObject basicAt: 'x:' put: [ self error ].\x0a\x09self shouldnt: [ jsObject x: 4 ] raise: Error.\x0a\x09self assert: jsObject x equals: 4\x0a\x09",
messageSends: ["basicAt:put:", "error", "shouldnt:raise:", "x:", "assert:equals:", "x"],
referencedClasses: ["Error"]
}),
globals.JSObjectProxyTest);
smalltalk.addMethod(
smalltalk.method({
>>>>>>>
selector: "testDNURegression1057",
protocol: 'tests',
fn: function (){
var self=this;
var jsObject;
function $Error(){return globals.Error||(typeof Error=="undefined"?nil:Error)}
return smalltalk.withContext(function($ctx1) {
var $1;
jsObject=[];
_st(jsObject)._basicAt_put_("allowJavaScriptCalls",true);
$ctx1.sendIdx["basicAt:put:"]=1;
_st(jsObject)._basicAt_put_("foo",(3));
self._shouldnt_raise_((function(){
return smalltalk.withContext(function($ctx2) {
return _st(jsObject)._foo();
$ctx2.sendIdx["foo"]=1;
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}),$Error());
$ctx1.sendIdx["shouldnt:raise:"]=1;
$1=_st(jsObject)._foo();
$ctx1.sendIdx["foo"]=2;
self._assert_equals_($1,(3));
$ctx1.sendIdx["assert:equals:"]=1;
self._shouldnt_raise_((function(){
return smalltalk.withContext(function($ctx2) {
return _st(jsObject)._foo_((4));
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}),$Error());
self._assert_equals_(_st(jsObject)._foo(),(4));
return self}, function($ctx1) {$ctx1.fill(self,"testDNURegression1057",{jsObject:jsObject},globals.JSObjectProxyTest)})},
args: [],
source: "testDNURegression1057\x0a\x09| jsObject |\x0a\x09jsObject := #().\x0a\x09jsObject basicAt: 'allowJavaScriptCalls' put: true.\x0a\x09jsObject basicAt: 'foo' put: 3.\x0a\x09self shouldnt: [ jsObject foo ] raise: Error.\x0a\x09self assert: jsObject foo equals: 3.\x0a\x09self shouldnt: [ jsObject foo: 4 ] raise: Error.\x0a\x09self assert: jsObject foo equals: 4",
messageSends: ["basicAt:put:", "shouldnt:raise:", "foo", "assert:equals:", "foo:"],
referencedClasses: ["Error"]
}),
globals.JSObjectProxyTest);
smalltalk.addMethod(
smalltalk.method({
selector: "testDNURegression1059",
protocol: 'tests',
fn: function (){
var self=this;
var jsObject;
function $Error(){return globals.Error||(typeof Error=="undefined"?nil:Error)}
return smalltalk.withContext(function($ctx1) {
jsObject=[];
_st(jsObject)._basicAt_put_("allowJavaScriptCalls",true);
$ctx1.sendIdx["basicAt:put:"]=1;
_st(jsObject)._basicAt_put_("x",(3));
$ctx1.sendIdx["basicAt:put:"]=2;
_st(jsObject)._basicAt_put_("x:",(function(){
return smalltalk.withContext(function($ctx2) {
return self._error();
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
self._shouldnt_raise_((function(){
return smalltalk.withContext(function($ctx2) {
return _st(jsObject)._x_((4));
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,2)})}),$Error());
self._assert_equals_(_st(jsObject)._x(),(4));
return self}, function($ctx1) {$ctx1.fill(self,"testDNURegression1059",{jsObject:jsObject},globals.JSObjectProxyTest)})},
args: [],
source: "testDNURegression1059\x0a\x09| jsObject |\x0a\x09jsObject := #().\x0a\x09jsObject basicAt: 'allowJavaScriptCalls' put: true.\x0a\x09jsObject basicAt: 'x' put: 3.\x0a\x09jsObject basicAt: 'x:' put: [ self error ].\x0a\x09self shouldnt: [ jsObject x: 4 ] raise: Error.\x0a\x09self assert: jsObject x equals: 4\x0a\x09",
messageSends: ["basicAt:put:", "error", "shouldnt:raise:", "x:", "assert:equals:", "x"],
referencedClasses: ["Error"]
}),
globals.JSObjectProxyTest);
smalltalk.addMethod(
smalltalk.method({ |
<<<<<<<
'Compiler-IR', 'Compiler-Inlining', 'Compiler-Semantic', 'Compiler-Interpreter', 'parser',
'SUnit', 'Importer-Exporter',
=======
'Compiler-IR', 'Compiler-Inlining', 'Compiler-Semantic', 'Compiler-Interpreter', '@parser',
'SUnit',
>>>>>>>
'Compiler-IR', 'Compiler-Inlining', 'Compiler-Semantic', 'Compiler-Interpreter', '@parser',
'SUnit', 'Importer-Exporter', |
<<<<<<<
return smalltalk.HLNavigationListWidget.fn.prototype._activateListItem_.apply(_st(self), [anItem]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
=======
return smalltalk.HLToolListWidget.superclass.fn.prototype._activateListItem_.apply(_st(self), [anItem]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
>>>>>>>
return smalltalk.HLToolListWidget.superclass.fn.prototype._activateListItem_.apply(_st(self), [anItem]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
<<<<<<<
return smalltalk.HLNavigationListWidget.fn.prototype._activateNextListItem.apply(_st(self), []);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
=======
return smalltalk.HLToolListWidget.superclass.fn.prototype._activateNextListItem.apply(_st(self), []);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
>>>>>>>
return smalltalk.HLToolListWidget.superclass.fn.prototype._activateNextListItem.apply(_st(self), []);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
<<<<<<<
return smalltalk.HLNavigationListWidget.fn.prototype._activatePreviousListItem.apply(_st(self), []);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
=======
return smalltalk.HLToolListWidget.superclass.fn.prototype._activatePreviousListItem.apply(_st(self), []);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
>>>>>>>
return smalltalk.HLToolListWidget.superclass.fn.prototype._activatePreviousListItem.apply(_st(self), []);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})})); |
<<<<<<<
return smalltalk.HLNavigationListWidget.fn.prototype._activateListItem_.apply(_st(self), [anItem]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
=======
return smalltalk.HLToolListWidget.superclass.fn.prototype._activateListItem_.apply(_st(self), [anItem]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
>>>>>>>
return smalltalk.HLToolListWidget.superclass.fn.prototype._activateListItem_.apply(_st(self), [anItem]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
<<<<<<<
return smalltalk.HLNavigationListWidget.fn.prototype._activateNextListItem.apply(_st(self), []);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
=======
return smalltalk.HLToolListWidget.superclass.fn.prototype._activateNextListItem.apply(_st(self), []);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
>>>>>>>
return smalltalk.HLToolListWidget.superclass.fn.prototype._activateNextListItem.apply(_st(self), []);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
<<<<<<<
return smalltalk.HLNavigationListWidget.fn.prototype._activatePreviousListItem.apply(_st(self), []);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
=======
return smalltalk.HLToolListWidget.superclass.fn.prototype._activatePreviousListItem.apply(_st(self), []);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
>>>>>>>
return smalltalk.HLToolListWidget.superclass.fn.prototype._activatePreviousListItem.apply(_st(self), []);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})})); |
<<<<<<<
this.kernel_libraries = ['@boot', 'Kernel-Objects', 'Kernel-Classes', 'Kernel-Methods',
'Kernel-Collections', 'Kernel-Exceptions', 'Kernel-Transcript',
'Kernel-Announcements'];
this.compiler_libraries = this.kernel_libraries.concat(['@parser', 'Importer-Exporter', 'Compiler-Exceptions',
'Compiler-Core', 'Compiler-AST', 'Compiler-IR', 'Compiler-Inlining', 'Compiler-Semantic']);
=======
this.kernel_libraries = ['boot', '@smalltalk', '@nil', '@_st', 'Kernel-Objects', 'Kernel-Classes', 'Kernel-Methods',
'Kernel-Collections', 'Kernel-Exceptions', 'Kernel-Transcript',
'Kernel-Announcements'];
this.compiler_libraries = this.kernel_libraries.concat(['parser', 'Importer-Exporter',
'Compiler-Core', 'Compiler-AST', 'Compiler-Exceptions', 'Compiler-IR', 'Compiler-Inlining', 'Compiler-Semantic']);
>>>>>>>
this.kernel_libraries = ['@boot', '@smalltalk', '@nil', '@_st', 'Kernel-Objects', 'Kernel-Classes', 'Kernel-Methods',
'Kernel-Collections', 'Kernel-Exceptions', 'Kernel-Transcript',
'Kernel-Announcements'];
this.compiler_libraries = this.kernel_libraries.concat(['@parser', 'Importer-Exporter',
'Compiler-Core', 'Compiler-AST', 'Compiler-Exceptions', 'Compiler-IR', 'Compiler-Inlining', 'Compiler-Semantic']);
<<<<<<<
'init': path.join(amber_dir, 'support', 'init.js'),
=======
// 'init': path.join(amber_dir, 'js', 'init.js'),
>>>>>>>
// 'init': path.join(amber_dir, 'support', 'init.js'),
<<<<<<<
var special = filename[0] == "@";
if (special) { filename = filename.slice(1); }
=======
var special = filename[0] == "@";
if (special) { filename = filename.slice(1); }
>>>>>>>
var special = filename[0] == "@";
if (special) { filename = filename.slice(1); }
<<<<<<<
var amberJsFile = path.join(this.amber_dir, special?'support':'js', jsFile);
=======
var amberJsFile = path.join(this.amber_dir, special?'js/lib':'js', jsFile);
>>>>>>>
var amberJsFile = path.join(this.amber_dir, special?'support':'js', jsFile); |
<<<<<<<
smalltalk.packages["Kernel-Tests"].transport = {"type":"amd","amdNamespace":"amber"};
=======
>>>>>>>
smalltalk.packages["Kernel-Tests"].transport = {"type":"amd","amdNamespace":"amber"};
<<<<<<<
});
=======
})(global_smalltalk,global_nil,global__st);
>>>>>>>
}); |
<<<<<<<
function metaclass(spec) {
spec = spec || {};
var that = new SmalltalkMetaclass();
inherits(
that.fn = function() {},
spec.superclass ? spec.superclass.klass.fn : SmalltalkClass
);
setupClass(that);
that.instanceClass = new that.fn();
return that;
=======
function metaclass() {
var meta = setupClass(new SmalltalkMetaclass(), {})
meta.instanceClass = new meta.fn;
return meta;
>>>>>>>
function metaclass(spec) {
spec = spec || {};
var that = new SmalltalkMetaclass();
inherits(
that.fn = function() {},
spec.superclass ? spec.superclass.klass.fn : SmalltalkClass
);
that.instanceClass = new that.fn();
setupClass(that);
return that;
<<<<<<<
klass.organization = new SmalltalkOrganizer();
Object.defineProperty(klass, "methods", {
value: {},
enumerable: false, configurable: true, writable: true
=======
that.organization = new SmalltalkOrganizer();
that.pkg = spec.pkg;
Object.defineProperties(that.fn.prototype, {
methods: { value: {}, enumerable: false, configurable: true, writable: true },
inheritedMethods: { value: {}, enumerable: false, configurable: true, writable: true },
klass: { value: that, enumerable: false, configurable: true, writable: true }
>>>>>>>
klass.organization = new SmalltalkOrganizer();
Object.defineProperty(klass, "methods", {
value: {},
enumerable: false, configurable: true, writable: true
<<<<<<<
if(boolean.klass === st.Boolean) {
return boolean;
} else {
st.NonBooleanReceiver._new()._object_(boolean)._signal();
//TODO return sane value
}
};
=======
if ((undefined !== boolean) && (boolean.klass === smalltalk.Boolean)) {
return boolean;
} else {
smalltalk.NonBooleanReceiver._new()._object_(boolean)._signal();
}
}
};
>>>>>>>
if ((undefined !== boolean) && (boolean.klass === smalltalk.Boolean)) {
return boolean;
} else {
st.NonBooleanReceiver._new()._object_(boolean)._signal();
}
};
<<<<<<<
// TODO: adapt.
// this.resume = function() {
// //Brutally set the receiver as thisContext, then re-enter the function
// smalltalk.thisContext = this;
// return this.method.apply(receiver, temps);
// };
}
inherits(SmalltalkMethodContext, SmalltalkObject);
=======
};
>>>>>>>
}
inherits(SmalltalkMethodContext, SmalltalkObject);
<<<<<<<
=======
SmalltalkMethodContext.prototype.resume = function() {
//Brutally set the receiver as thisContext, then re-enter the function
smalltalk.thisContext = this;
return this.method.apply(receiver, temps);
};
/* Global Smalltalk objects. */
var nil = new SmalltalkNil();
var smalltalk = new Smalltalk();
>>>>>>>
SmalltalkMethodContext.prototype.resume = function() {
//Brutally set the receiver as thisContext, then re-enter the function
smalltalk.thisContext = this;
return this.method.apply(receiver, temps);
};
/* Global Smalltalk objects. */
var nil = new SmalltalkNil();
var smalltalk = new Smalltalk(); |
<<<<<<<
return smalltalk.IRVisitor.fn.prototype._visitIRClosure_.apply(_st(self), [anIRClosure]);
}, function($ctx3) {$ctx3.fillBlock({},$ctx2,3)})}));
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}),_st(anIRClosure)._arguments());
=======
return smalltalk.IRJSTranslator.superclass.fn.prototype._visitIRClosure_.apply(_st(self), [anIRClosure]);
}, function($ctx3) {$ctx3.fillBlock({},$ctx2)})}));
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}),_st(anIRClosure)._arguments());
>>>>>>>
return smalltalk.IRJSTranslator.superclass.fn.prototype._visitIRClosure_.apply(_st(self), [anIRClosure]);
}, function($ctx3) {$ctx3.fillBlock({},$ctx2,3)})}));
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}),_st(anIRClosure)._arguments());
<<<<<<<
return smalltalk.IRVisitor.fn.prototype._visitIRMethod_.apply(_st(self), [anIRMethod]);
}, function($ctx5) {$ctx5.fillBlock({},$ctx4,9)})}));
=======
return smalltalk.IRJSTranslator.superclass.fn.prototype._visitIRMethod_.apply(_st(self), [anIRMethod]);
}, function($ctx5) {$ctx5.fillBlock({},$ctx4)})}));
>>>>>>>
return smalltalk.IRJSTranslator.superclass.fn.prototype._visitIRMethod_.apply(_st(self), [anIRMethod]);
}, function($ctx5) {$ctx5.fillBlock({},$ctx4,9)})}));
<<<<<<<
return smalltalk.IRVisitor.fn.prototype._visitIRNonLocalReturn_.apply(_st(self), [anIRNonLocalReturn]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
=======
return smalltalk.IRJSTranslator.superclass.fn.prototype._visitIRNonLocalReturn_.apply(_st(self), [anIRNonLocalReturn]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
>>>>>>>
return smalltalk.IRJSTranslator.superclass.fn.prototype._visitIRNonLocalReturn_.apply(_st(self), [anIRNonLocalReturn]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
<<<<<<<
return smalltalk.IRVisitor.fn.prototype._visitIRReturn_.apply(_st(self), [anIRReturn]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
=======
return smalltalk.IRJSTranslator.superclass.fn.prototype._visitIRReturn_.apply(_st(self), [anIRReturn]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
>>>>>>>
return smalltalk.IRJSTranslator.superclass.fn.prototype._visitIRReturn_.apply(_st(self), [anIRReturn]);
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
<<<<<<<
source: "visitSuperSend: anIRSend\x0a\x09self stream\x0a\x09\x09nextPutAll: anIRSend classSend asJavascript, '.fn.prototype.';\x0a\x09\x09nextPutAll: anIRSend selector asSelector, '.apply(';\x0a\x09\x09nextPutAll: '_st('.\x0a\x09self visit: anIRSend instructions first.\x0a\x09self stream nextPutAll: '), ['.\x0a\x09anIRSend instructions allButFirst\x0a\x09\x09do: [ :each | self visit: each ]\x0a\x09\x09separatedBy: [ self stream nextPutAll: ',' ].\x0a\x09self stream nextPutAll: '])'",
messageSends: ["nextPutAll:", "stream", ",", "asJavascript", "classSend", "asSelector", "selector", "visit:", "first", "instructions", "do:separatedBy:", "allButFirst"],
=======
source: "visitSuperSend: anIRSend\x0a\x09self stream\x0a\x09\x09nextPutAll: self currentClass asJavascript;\x0a\x09\x09nextPutAll: '.superclass.fn.prototype.';\x0a\x09\x09nextPutAll: anIRSend selector asSelector, '.apply(';\x0a\x09\x09nextPutAll: '_st('.\x0a\x09self visit: anIRSend instructions first.\x0a\x09self stream nextPutAll: '), ['.\x0a\x09anIRSend instructions allButFirst\x0a\x09\x09do: [ :each | self visit: each ]\x0a\x09\x09separatedBy: [ self stream nextPutAll: ',' ].\x0a\x09self stream nextPutAll: '])'",
messageSends: ["nextPutAll:", "asJavascript", "currentClass", "stream", ",", "asSelector", "selector", "visit:", "first", "instructions", "do:separatedBy:", "allButFirst"],
>>>>>>>
source: "visitSuperSend: anIRSend\x0a\x09self stream\x0a\x09\x09nextPutAll: self currentClass asJavascript;\x0a\x09\x09nextPutAll: '.superclass.fn.prototype.';\x0a\x09\x09nextPutAll: anIRSend selector asSelector, '.apply(';\x0a\x09\x09nextPutAll: '_st('.\x0a\x09self visit: anIRSend instructions first.\x0a\x09self stream nextPutAll: '), ['.\x0a\x09anIRSend instructions allButFirst\x0a\x09\x09do: [ :each | self visit: each ]\x0a\x09\x09separatedBy: [ self stream nextPutAll: ',' ].\x0a\x09self stream nextPutAll: '])'",
messageSends: ["nextPutAll:", "stream", "asJavascript", "currentClass", ",", "asSelector", "selector", "visit:", "first", "instructions", "do:separatedBy:", "allButFirst"], |
<<<<<<<
smalltalk.packages["Spaces"].transport = {"type":"amd","amdNamespace":"amber"};
=======
>>>>>>>
smalltalk.packages["Spaces"].transport = {"type":"amd","amdNamespace":"amber"};
<<<<<<<
});
=======
})(global_smalltalk,global_nil,global__st);
>>>>>>>
}); |
<<<<<<<
source: unescape('try%3A%20aBlock%20catch%3A%20anotherBlock%0A%09%3Ctry%7BaBlock%28%29%7D%20catch%28e%29%20%7BanotherBlock%28e%29%7D%3E'),
=======
args: ["aBlock", "anotherBlock"],
source: unescape('try%3A%20aBlock%20catch%3A%20anotherBlock%0A%09%3Ctry%7BaBlock%28%29%7D%20catch%28e%29%20%7BanotherBlock%28e%29%7D%3E%20'),
>>>>>>>
args: ["aBlock", "anotherBlock"],
source: unescape('try%3A%20aBlock%20catch%3A%20anotherBlock%0A%09%3Ctry%7BaBlock%28%29%7D%20catch%28e%29%20%7BanotherBlock%28e%29%7D%3E%20'),
<<<<<<<
source: unescape('log%3A%20aString%20block%3A%20aBlock%0A%0A%09%7C%20result%20%7C%0A%09console%20log%3A%20%20aString%2C%20%20%27%20time%3A%20%27%2C%20%28Date%20millisecondsToRun%3A%20%5Bresult%20%3A%3D%20aBlock%20value%5D%29%20printString.%0A%09%5Eresult'),
=======
args: ["aString", "aBlock"],
source: unescape('log%3A%20aString%20block%3A%20aBlock%0A%0A%09%7C%20result%20%7C%0A%09console%20log%3A%20%20aString%2C%20%20%27%20time%3A%20%27%2C%20%28Date%20millisecondsToRun%3A%20%5Bresult%20%3A%3D%20aBlock%20value%5D%29%20printString.%0A%09%5Eresult%0A%0A'),
>>>>>>>
args: ["aString", "aBlock"],
source: unescape('log%3A%20aString%20block%3A%20aBlock%0A%0A%09%7C%20result%20%7C%0A%09console%20log%3A%20%20aString%2C%20%20%27%20time%3A%20%27%2C%20%28Date%20millisecondsToRun%3A%20%5Bresult%20%3A%3D%20aBlock%20value%5D%29%20printString.%0A%09%5Eresult%0A%0A'),
<<<<<<<
source: unescape('parseError%3A%20anException%20parsing%3A%20aString%0A%09%7C%20row%20col%20message%20lines%20badLine%20code%20%7C%0A%09%3Crow%20%3D%20anException.line%3B%0A%09col%20%3D%20anException.column%3B%0A%09message%20%3D%20anException.message%3B%3E.%0A%09lines%20%3A%3D%20aString%20lines.%0A%09badLine%20%3A%3D%20lines%20at%3A%20row.%0A%09badLine%20%3A%3D%20%28badLine%20copyFrom%3A%201%20to%3A%20col%20-%201%29%2C%20%27%20%3D%3D%3D%3E%27%2C%20%28badLine%20copyFrom%3A%20%20col%20to%3A%20badLine%20size%29.%0A%09lines%20at%3A%20row%20put%3A%20badLine.%0A%09code%20%3A%3D%20String%20streamContents%3A%20%5B%3As%20%7C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20lines%20withIndexDo%3A%20%5B%3Al%20%3Ai%20%7C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20s%20nextPutAll%3A%20i%20asString%2C%20%27%3A%20%27%2C%20l%2C%20String%20lf%5D%5D.%0A%09%5E%20Error%20new%20messageText%3A%20%28%27Parse%20error%20on%20line%20%27%20%2C%20row%20%2C%20%27%20column%20%27%20%2C%20col%20%2C%20%27%20%3A%20%27%20%2C%20message%20%2C%20%27%20Below%20is%20code%20with%20line%20numbers%20and%20%3D%3D%3D%3E%20marker%20inserted%3A%27%20%2C%20String%20lf%2C%20code%29'),
=======
args: ["anException", "aString"],
source: unescape('parseError%3A%20anException%20parsing%3A%20aString%0A%09%7C%20row%20col%20message%20lines%20badLine%20code%20%7C%0A%09%3Crow%20%3D%20anException.line%3B%0A%09col%20%3D%20anException.column%3B%0A%09message%20%3D%20anException.message%3B%3E.%0A%09lines%20%3A%3D%20aString%20lines.%0A%09badLine%20%3A%3D%20lines%20at%3A%20row.%0A%09badLine%20%3A%3D%20%28badLine%20copyFrom%3A%201%20to%3A%20col%20-%201%29%2C%20%27%20%3D%3D%3D%3E%27%2C%20%28badLine%20copyFrom%3A%20%20col%20to%3A%20badLine%20size%29.%0A%09lines%20at%3A%20row%20put%3A%20badLine.%0A%09code%20%3A%3D%20String%20streamContents%3A%20%5B%3As%20%7C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20lines%20withIndexDo%3A%20%5B%3Al%20%3Ai%20%7C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20s%20nextPutAll%3A%20i%20asString%2C%20%27%3A%20%27%2C%20l%2C%20String%20lf%5D%5D.%0A%09%5E%20Error%20new%20messageText%3A%20%28%27Parse%20error%20on%20line%20%27%20%2C%20row%20%2C%20%27%20column%20%27%20%2C%20col%20%2C%20%27%20%3A%20%27%20%2C%20message%20%2C%20%27%20Below%20is%20code%20with%20line%20numbers%20and%20%3D%3D%3D%3E%20marker%20inserted%3A%27%20%2C%20String%20lf%2C%20code%29'),
>>>>>>>
args: ["anException", "aString"],
source: unescape('parseError%3A%20anException%20parsing%3A%20aString%0A%09%7C%20row%20col%20message%20lines%20badLine%20code%20%7C%0A%09%3Crow%20%3D%20anException.line%3B%0A%09col%20%3D%20anException.column%3B%0A%09message%20%3D%20anException.message%3B%3E.%0A%09lines%20%3A%3D%20aString%20lines.%0A%09badLine%20%3A%3D%20lines%20at%3A%20row.%0A%09badLine%20%3A%3D%20%28badLine%20copyFrom%3A%201%20to%3A%20col%20-%201%29%2C%20%27%20%3D%3D%3D%3E%27%2C%20%28badLine%20copyFrom%3A%20%20col%20to%3A%20badLine%20size%29.%0A%09lines%20at%3A%20row%20put%3A%20badLine.%0A%09code%20%3A%3D%20String%20streamContents%3A%20%5B%3As%20%7C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20lines%20withIndexDo%3A%20%5B%3Al%20%3Ai%20%7C%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20s%20nextPutAll%3A%20i%20asString%2C%20%27%3A%20%27%2C%20l%2C%20String%20lf%5D%5D.%0A%09%5E%20Error%20new%20messageText%3A%20%28%27Parse%20error%20on%20line%20%27%20%2C%20row%20%2C%20%27%20column%20%27%20%2C%20col%20%2C%20%27%20%3A%20%27%20%2C%20message%20%2C%20%27%20Below%20is%20code%20with%20line%20numbers%20and%20%3D%3D%3D%3E%20marker%20inserted%3A%27%20%2C%20String%20lf%2C%20code%29'),
<<<<<<<
source: unescape('subclass%3A%20aString%20instanceVariableNames%3A%20anotherString%0A%09%22Kept%20for%20compatibility.%22%0A%09%5Eself%20subclass%3A%20aString%20instanceVariableNames%3A%20anotherString%20module%3A%20nil'),
messageSends: ["subclass:instanceVariableNames:module:"],
=======
args: ["aString", "anotherString"],
source: unescape('subclass%3A%20aString%20instanceVariableNames%3A%20anotherString%0A%09%5Eself%20subclass%3A%20aString%20instanceVariableNames%3A%20anotherString%20category%3A%20nil'),
messageSends: ["subclass:instanceVariableNames:category:"],
>>>>>>>
args: ["aString", "anotherString"],
source: unescape('subclass%3A%20aString%20instanceVariableNames%3A%20anotherString%0A%09%22Kept%20for%20compatibility.%22%0A%09%5Eself%20subclass%3A%20aString%20instanceVariableNames%3A%20anotherString%20module%3A%20nil'),
messageSends: ["subclass:instanceVariableNames:module:"],
<<<<<<<
source: unescape('subclass%3A%20aString%20instanceVariableNames%3A%20aString2%20category%3A%20aString3%0A%09%22Kept%20for%20compatibility.%22%0A%09%5Eself%20subclass%3A%20aString%20instanceVariableNames%3A%20aString2%20module%3A%20aString3'),
messageSends: ["subclass:instanceVariableNames:module:"],
referencedClasses: []
=======
args: ["aString", "aString2", "aString3"],
source: unescape('subclass%3A%20aString%20instanceVariableNames%3A%20aString2%20category%3A%20aString3%0A%09%5EClassBuilder%20new%0A%09%20%20%20%20superclass%3A%20self%20subclass%3A%20aString%20instanceVariableNames%3A%20aString2%20category%3A%20aString3'),
messageSends: ["superclass:subclass:instanceVariableNames:category:", "new"],
referencedClasses: [smalltalk.nil]
>>>>>>>
args: ["aString", "aString2", "aString3"],
source: unescape('subclass%3A%20aString%20instanceVariableNames%3A%20aString2%20category%3A%20aString3%0A%09%22Kept%20for%20compatibility.%22%0A%09%5Eself%20subclass%3A%20aString%20instanceVariableNames%3A%20aString2%20module%3A%20aString3'),
messageSends: ["subclass:instanceVariableNames:module:"],
referencedClasses: []
<<<<<<<
source: unescape('module%0A%09%3Creturn%20self.module%3E'),
messageSends: [],
=======
args: ["aString", "aString2", "classVars", "pools", "aString3"],
source: unescape('subclass%3A%20aString%20instanceVariableNames%3A%20aString2%20classVariableNames%3A%20classVars%20poolDictionaries%3A%20pools%20category%3A%20aString3%0A%09%22Just%20ignore%20class%20variables%20and%20pools.%20Added%20for%20compatibility.%22%0A%09%5Eself%20subclass%3A%20aString%20instanceVariableNames%3A%20aString2%20category%3A%20aString3'),
messageSends: ["subclass:instanceVariableNames:category:"],
>>>>>>>
source: unescape('module%0A%09%3Creturn%20self.module%3E'),
messageSends: [],
<<<<<<<
source: unescape('subclass%3A%20aString%20instanceVariableNames%3A%20anotherString%0A%09%5Eself%20subclass%3A%20aString%20instanceVariableNames%3A%20anotherString%20module%3A%20nil'),
messageSends: ["subclass:instanceVariableNames:module:"],
=======
args: ["aString", "anotherString"],
source: unescape('subclass%3A%20aString%20instanceVariableNames%3A%20anotherString%0A%09%5Eself%20subclass%3A%20aString%20instanceVariableNames%3A%20anotherString%20category%3A%20nil'),
messageSends: ["subclass:instanceVariableNames:category:"],
>>>>>>>
args: ["aString", "anotherString"],
source: unescape('subclass%3A%20aString%20instanceVariableNames%3A%20anotherString%0A%09%5Eself%20subclass%3A%20aString%20instanceVariableNames%3A%20anotherString%20module%3A%20nil'),
messageSends: ["subclass:instanceVariableNames:module:"],
<<<<<<<
source: unescape('subclass%3A%20aString%20instanceVariableNames%3A%20aString2%20category%3A%20aString3%0A%09%22Kept%20for%20compatibility.%22%0A%09%5Eself%20subclass%3A%20aString%20instanceVariableNames%3A%20aString2%20module%3A%20aString3'),
messageSends: ["subclass:instanceVariableNames:module:"],
referencedClasses: []
=======
args: ["aString", "aString2", "aString3"],
source: unescape('subclass%3A%20aString%20instanceVariableNames%3A%20aString2%20category%3A%20aString3%0A%09%5EClassBuilder%20new%0A%09%20%20%20%20superclass%3A%20self%20subclass%3A%20aString%20instanceVariableNames%3A%20aString2%20category%3A%20aString3'),
messageSends: ["superclass:subclass:instanceVariableNames:category:", "new"],
referencedClasses: [smalltalk.nil]
>>>>>>>
args: ["aString", "aString2", "aString3"],
source: unescape('subclass%3A%20aString%20instanceVariableNames%3A%20aString2%20category%3A%20aString3%0A%09%22Kept%20for%20compatibility.%22%0A%09%5Eself%20subclass%3A%20aString%20instanceVariableNames%3A%20aString2%20module%3A%20aString3'),
messageSends: ["subclass:instanceVariableNames:module:"],
referencedClasses: []
<<<<<<<
source: unescape('superclass%3A%20aClass%20subclass%3A%20aString%0A%09%5Eself%20superclass%3A%20aClass%20subclass%3A%20aString%20instanceVariableNames%3A%20%27%27%20module%3A%20nil'),
messageSends: ["superclass:subclass:instanceVariableNames:module:"],
=======
args: ["aClass", "aString"],
source: unescape('superclass%3A%20aClass%20subclass%3A%20aString%0A%09self%20superclass%3A%20aClass%20subclass%3A%20aString%20instanceVariableNames%3A%20%27%27%20category%3A%20nil'),
messageSends: ["superclass:subclass:instanceVariableNames:category:"],
referencedClasses: []
}),
smalltalk.ClassBuilder);
smalltalk.addMethod(
'_superclass_subclass_instanceVariableNames_category_',
smalltalk.method({
selector: 'superclass:subclass:instanceVariableNames:category:',
category: 'class creation',
fn: function (aClass, aString, aString2, aString3){
var self=this;
var newClass=nil;
newClass=smalltalk.send(self, "_addSubclassOf_named_instanceVariableNames_", [aClass, aString, smalltalk.send(self, "_instanceVariableNamesFor_", [aString2])]);
smalltalk.send(self, "_setupClass_", [newClass]);
smalltalk.send(newClass, "_category_", [(($receiver = aString3) == nil || $receiver == undefined) ? (function(){return "unclassified";})() : $receiver]);
return self;},
args: ["aClass", "aString", "aString2", "aString3"],
source: unescape('superclass%3A%20aClass%20subclass%3A%20aString%20instanceVariableNames%3A%20aString2%20category%3A%20aString3%0A%09%7C%20newClass%20%7C%0A%09newClass%20%3A%3D%20self%20addSubclassOf%3A%20aClass%20named%3A%20aString%20instanceVariableNames%3A%20%28self%20instanceVariableNamesFor%3A%20aString2%29.%0A%09self%20setupClass%3A%20newClass.%0A%09newClass%20category%3A%20%28aString3%20ifNil%3A%20%5B%27unclassified%27%5D%29'),
messageSends: ["addSubclassOf:named:instanceVariableNames:", "instanceVariableNamesFor:", "setupClass:", "category:", "ifNil:"],
>>>>>>>
args: ["aClass", "aString"],
source: unescape('superclass%3A%20aClass%20subclass%3A%20aString%0A%09%5Eself%20superclass%3A%20aClass%20subclass%3A%20aString%20instanceVariableNames%3A%20%27%27%20module%3A%20nil'),
messageSends: ["superclass:subclass:instanceVariableNames:module:"], |
<<<<<<<
=======
unescape('_export_'),
smalltalk.method({
selector: unescape('export%3A'),
category: 'fileOut',
fn: function (aClass){
var self=this;
return smalltalk.send((smalltalk.String || String), "_streamContents_", [(function(stream){smalltalk.send(self, "_exportDefinitionOf_on_", [aClass, stream]);smalltalk.send(self, "_exportMethodsOf_on_", [aClass, stream]);smalltalk.send(self, "_exportMetaDefinitionOf_on_", [aClass, stream]);return smalltalk.send(self, "_exportMethodsOf_on_", [smalltalk.send(aClass, "_class", []), stream]);})]);
return self;},
args: ["aClass"],
source: unescape('export%3A%20aClass%0A%09%22Export%20a%20single%20class.%20Subclasses%20override%20these%20methods.%22%0A%0A%09%5EString%20streamContents%3A%20%5B%3Astream%20%7C%0A%09%09self%20exportDefinitionOf%3A%20aClass%20on%3A%20stream.%0A%09%09self%20exportMethodsOf%3A%20aClass%20on%3A%20stream.%0A%09%09self%20exportMetaDefinitionOf%3A%20aClass%20on%3A%20stream.%0A%09%09self%20exportMethodsOf%3A%20aClass%20class%20on%3A%20stream%5D'),
messageSends: ["streamContents:", "exportDefinitionOf:on:", "exportMethodsOf:on:", "exportMetaDefinitionOf:on:", "class"],
referencedClasses: ["String"]
}),
smalltalk.Exporter);
smalltalk.addMethod(
>>>>>>>
<<<<<<<
args: ["package", "aStream"],
source: unescape('exportPackageExtensionsOf%3A%20package%20on%3A%20aStream%0A%09%22We%20need%20to%20override%20this%20one%20too%20since%20we%20need%20to%20group%0A%09all%20methods%20in%20a%20given%20protocol%20under%20a%20leading%20methodsFor%3A%20chunk%0A%09for%20that%20class.%22%0A%0A%09%7C%20name%20%7C%0A%09name%20%3A%3D%20package%20name.%0A%09Smalltalk%20current%20classes%2C%20%28Smalltalk%20current%20classes%20collect%3A%20%5B%3Aeach%20%7C%20each%20class%5D%29%20do%3A%20%5B%3Aeach%20%7C%0A%09%09each%20protocolsDo%3A%20%5B%3Acategory%20%3Amethods%20%7C%0A%09%09%09category%20%3D%20%28%27*%27%2C%20name%29%20ifTrue%3A%20%5B%0A%09%09%09%09self%20exportMethods%3A%20methods%20category%3A%20category%20of%3A%20each%20on%3A%20aStream%5D%5D%5D'),
messageSends: ["name", "do:", unescape("%2C"), "classes", "current", "collect:", "class", "protocolsDo:", "ifTrue:", unescape("%3D"), "exportMethods:category:of:on:"],
referencedClasses: [smalltalk.Smalltalk]
=======
args: ["aString", "aStream"],
source: unescape('exportPackageExtensions%3A%20aString%20on%3A%20aStream%0A%09%22We%20need%20to%20override%20this%20one%20too%20since%20we%20need%20to%20group%0A%09all%20methods%20in%20a%20given%20protocol%20under%20a%20leading%20methodsFor%3A%20chunk%0A%09for%20that%20class.%22%0A%0A%09Smalltalk%20current%20classes%2C%20%28Smalltalk%20current%20classes%20collect%3A%20%5B%3Aeach%20%7C%20each%20class%5D%29%20do%3A%20%5B%3Aeach%20%7C%0A%09%09each%20protocolsDo%3A%20%5B%3Acategory%20%3Amethods%20%7C%0A%09%09%09category%20%3D%20%28%27*%27%2C%20aString%29%20ifTrue%3A%20%5B%0A%09%09%09%09self%20exportMethods%3A%20methods%20category%3A%20category%20of%3A%20each%20on%3A%20aStream%5D%5D%5D'),
messageSends: ["do:", unescape("%2C"), "classes", "current", "collect:", "class", "protocolsDo:", "ifTrue:", unescape("%3D"), "exportMethods:category:of:on:"],
referencedClasses: ["Smalltalk"]
>>>>>>>
args: ["package", "aStream"],
source: unescape('exportPackageExtensionsOf%3A%20package%20on%3A%20aStream%0A%09%22We%20need%20to%20override%20this%20one%20too%20since%20we%20need%20to%20group%0A%09all%20methods%20in%20a%20given%20protocol%20under%20a%20leading%20methodsFor%3A%20chunk%0A%09for%20that%20class.%22%0A%0A%09%7C%20name%20%7C%0A%09name%20%3A%3D%20package%20name.%0A%09Smalltalk%20current%20classes%2C%20%28Smalltalk%20current%20classes%20collect%3A%20%5B%3Aeach%20%7C%20each%20class%5D%29%20do%3A%20%5B%3Aeach%20%7C%0A%09%09each%20protocolsDo%3A%20%5B%3Acategory%20%3Amethods%20%7C%0A%09%09%09category%20%3D%20%28%27*%27%2C%20name%29%20ifTrue%3A%20%5B%0A%09%09%09%09self%20exportMethods%3A%20methods%20category%3A%20category%20of%3A%20each%20on%3A%20aStream%5D%5D%5D'),
messageSends: ["name", "do:", unescape("%2C"), "classes", "current", "collect:", "class", "protocolsDo:", "ifTrue:", unescape("%3D"), "exportMethods:category:of:on:"],
referencedClasses: ["Smalltalk"]
<<<<<<<
referencedClasses: [smalltalk.Smalltalk,smalltalk.Transcript]
=======
referencedClasses: ["Smalltalk", "Transcript"]
>>>>>>>
referencedClasses: ["Smalltalk", "Transcript"] |
<<<<<<<
=======
/* Global Smalltalk objects. */
// The globals below all begin with `global_' prefix.
// This prefix is to advice developers to avoid their usage,
// instead using local versions smalltalk, nil, _st that are
// provided by appropriate wrappers to each package.
// The plan is to use different module loader (and slightly change the wrappers)
// so that these globals are hidden completely inside the exports/imports of the module loader.
// DO NOT USE DIRECTLY! CAN DISAPPEAR AT ANY TIME.
var global_smalltalk, global_nil, global__st;
>>>>>>>
<<<<<<<
var nil = new SmalltalkNil();
=======
function Smalltalk() {}
inherits(Smalltalk, SmalltalkObject);
>>>>>>>
function Smalltalk() {}
inherits(Smalltalk, SmalltalkObject);
<<<<<<<
function SmalltalkMethodContext(home, setup) {
this.homeContext = home;
this.setup = setup || function() {};
this.pc = 0;
}
// Fallbacks
SmalltalkMethodContext.prototype.locals = {};
SmalltalkMethodContext.prototype.receiver = null;
SmalltalkMethodContext.prototype.selector = null;
SmalltalkMethodContext.prototype.lookupClass = null;
inherits(SmalltalkMethodContext, SmalltalkObject);
var smalltalk = new Smalltalk();
SmalltalkMethodContext.prototype.fill = function(receiver, selector, locals, lookupClass) {
this.receiver = receiver;
this.selector = selector;
this.locals = locals || {};
this.lookupClass = lookupClass;
};
SmalltalkMethodContext.prototype.fillBlock = function(locals, ctx) {
this.locals = locals || {};
this.outerContext = ctx;
};
=======
/* Making smalltalk that can load */
>>>>>>>
/* Making smalltalk that can load */ |
<<<<<<<
messageSends: ["ifTrue:ifFalse:", "=", "length", "jQuery:", "open", "is:", "close", "current"]}),
=======
messageSends: ["ifTrue:ifFalse:", "open", "close", "current", "is:", "asJQuery", "=", "length"]}),
>>>>>>>
messageSends: ["ifTrue:ifFalse:", "=", "length", "asJQuery", "open", "is:", "close", "current"]}),
<<<<<<<
messageSends: ["val", "ifNil:", "category", "new", "source:", "parse:", "ifTrue:", "isParseFailure", "alert:", ",", "reason", "asString", "position", "currentClass:", "eval:", "compileNode:", "do:", "unknownVariables", "at:", "confirm:", "addInstanceVariableNamed:toClass:", "compileMethodDefinitionFor:", "installMethod:forClass:category:", "updateMethodsList", "selectMethod:"]}),
=======
messageSends: ["val", "ifNil:", "category", "new", "source:", "parse:", "ifTrue:", "alert:", ",", "asString", "position", "reason", "isParseFailure", "currentClass:", "eval:", "compileNode:", "do:", "ifFalse:", "addInstanceVariableNamed:toClass:", "compileMethodDefinitionFor:", "confirm:", "existsGlobal:", "unknownVariables", "installMethod:forClass:category:", "updateMethodsList", "selectMethod:"]}),
>>>>>>>
messageSends: ["val", "ifNil:", "category", "new", "source:", "parse:", "ifTrue:", "isParseFailure", "alert:", ",", "reason", "asString", "position", "currentClass:", "eval:", "compileNode:", "do:", "unknownVariables", "ifFalse:", "existsGlobal:", "confirm:", "addInstanceVariableNamed:toClass:", "compileMethodDefinitionFor:", "installMethod:forClass:category:", "updateMethodsList", "selectMethod:"]}), |
<<<<<<<
function addScriptTag(src) {
var scriptString = '<script src="' + src + '" type="text/javascript"></script>';
document.write(scriptString);
}
function loadDependencies() {
=======
function loadDependencies() {
>>>>>>>
function addScriptTag(src) {
var scriptString = '<script src="' + src + '" type="text/javascript"></script>';
document.write(scriptString);
}
function loadDependencies() {
<<<<<<<
if ((typeof jQuery == 'undefined') || (typeof jQuery.ui == 'undefined')) {
addScriptTag(buildJSURL('lib/jQuery/jquery-ui-1.8.16.custom.min.js'));
=======
if ((typeof jQuery == 'undefined') || (typeof jQuery.ui == 'undefined')) {
loadJS('lib/jQuery/jquery-ui-1.8.16.custom.min.js');
>>>>>>>
if ((typeof jQuery == 'undefined') || (typeof jQuery.ui == 'undefined')) {
addScriptTag(buildJSURL('lib/jQuery/jquery-ui-1.8.16.custom.min.js'));
<<<<<<<
for (var i=0; i < localStorageSource.length; i++) {
eval(localStorageSource[i]);
}
=======
>>>>>>>
<<<<<<<
/*
* When loaded using AJAX, scripts order not guaranteed.
* Load JS in the order they have been added
* using loadJS.
*/
function getScript(url) {
$.getScript(url,
function(){
jsToLoad.shift();
if (jsToLoad.length > 0)
getScript(jsToLoad[0]);
});
}
function populateLocalPackages(){
var localStorageRE = /^smalltalk\.packages\.(.*)$/;
localPackages = {};
var match, key;
for(var i=0; i < localStorage.length; i++) {
key = localStorage.key(i);
if (match = key.match(localStorageRE)) {
localPackages[match[1]] = localStorage[key];
}
}
return localPackages;
};
function clearLocalPackages() {
for (var name in localPackages) {
log('Removing ' + name + ' from local storage');
localStorage.removeItem('smalltalk.packages.' + name);
}
};
=======
>>>>>>>
/*
* When loaded using AJAX, scripts order not guaranteed.
* Load JS in the order they have been added
* using loadJS.
*/
function getScript(url) {
$.getScript(url,
function(){
jsToLoad.shift();
if (jsToLoad.length > 0)
getScript(jsToLoad[0]);
});
}
function populateLocalPackages(){
var localStorageRE = /^smalltalk\.packages\.(.*)$/;
localPackages = {};
var match, key;
for(var i=0; i < localStorage.length; i++) {
key = localStorage.key(i);
if (match = key.match(localStorageRE)) {
localPackages[match[1]] = localStorage[key];
}
}
return localPackages;
};
function clearLocalPackages() {
for (var name in localPackages) {
log('Removing ' + name + ' from local storage');
localStorage.removeItem('smalltalk.packages.' + name);
}
}; |
<<<<<<<
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
_st($1)._whileKeyPressed_do_((40),(function(){
=======
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
_st($1)._whileKeyDown_do_((40),(function(){
>>>>>>>
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
_st($1)._whileKeyDown_do_((40),(function(){
<<<<<<<
source: "setupKeyBindings \x0a\x09(HLRepeatingKeyBindingHandler forWidget: self)\x0a\x09\x09whileKeyPressed: 38 do: [ self activatePreviousListItem ];\x0a\x09\x09whileKeyPressed: 40 do: [ self activateNextListItem ];\x0a\x09\x09rebindKeys",
messageSends: ["whileKeyPressed:do:", "forWidget:", "activatePreviousListItem", "activateNextListItem", "rebindKeys"],
referencedClasses: ["HLRepeatingKeyBindingHandler"]
=======
source: "setupKeyBindings \x0a\x09(HLRepeatedKeyDownHandler on: self)\x0a\x09\x09whileKeyDown: 38 do: [ self activatePreviousListItem ];\x0a\x09\x09whileKeyDown: 40 do: [ self activateNextListItem ];\x0a\x09\x09rebindKeys",
messageSends: ["whileKeyDown:do:", "activatePreviousListItem", "on:", "activateNextListItem", "rebindKeys"],
referencedClasses: ["HLRepeatedKeyDownHandler"]
>>>>>>>
source: "setupKeyBindings \x0a\x09(HLRepeatedKeyDownHandler on: self)\x0a\x09\x09whileKeyDown: 38 do: [ self activatePreviousListItem ];\x0a\x09\x09whileKeyDown: 40 do: [ self activateNextListItem ];\x0a\x09\x09rebindKeys",
messageSends: ["whileKeyDown:do:", "on:", "activatePreviousListItem", "activateNextListItem", "rebindKeys"],
referencedClasses: ["HLRepeatedKeyDownHandler"]
<<<<<<<
source: "confirm: aString ifFalse: aBlock\x0a\x09(HLConfirmationWidget new\x0a\x09\x09confirmationString: aString;\x0a\x09\x09cancelBlock: aBlock;\x0a\x09\x09yourself)\x0a\x09\x09\x09appendToJQuery: 'body' asJQuery",
messageSends: ["appendToJQuery:", "confirmationString:", "new", "cancelBlock:", "yourself", "asJQuery"],
=======
source: "confirm: aString ifFalse: aBlock\x0a\x09HLConfirmationWidget new\x0a\x09\x09confirmationString: aString;\x0a\x09\x09cancelBlock: aBlock;\x0a\x09\x09show",
messageSends: ["confirmationString:", "new", "cancelBlock:", "show"],
>>>>>>>
source: "confirm: aString ifFalse: aBlock\x0a\x09HLConfirmationWidget new\x0a\x09\x09confirmationString: aString;\x0a\x09\x09cancelBlock: aBlock;\x0a\x09\x09show",
messageSends: ["confirmationString:", "new", "cancelBlock:", "show"],
<<<<<<<
source: "confirm: aString ifTrue: aBlock\x0a\x09(HLConfirmationWidget new\x0a\x09\x09confirmationString: aString;\x0a\x09\x09actionBlock: aBlock;\x0a\x09\x09yourself)\x0a\x09\x09\x09appendToJQuery: 'body' asJQuery",
messageSends: ["appendToJQuery:", "confirmationString:", "new", "actionBlock:", "yourself", "asJQuery"],
=======
source: "confirm: aString ifTrue: aBlock\x0a\x09HLConfirmationWidget new\x0a\x09\x09confirmationString: aString;\x0a\x09\x09actionBlock: aBlock;\x0a\x09\x09show",
messageSends: ["confirmationString:", "new", "actionBlock:", "show"],
>>>>>>>
source: "confirm: aString ifTrue: aBlock\x0a\x09HLConfirmationWidget new\x0a\x09\x09confirmationString: aString;\x0a\x09\x09actionBlock: aBlock;\x0a\x09\x09show",
messageSends: ["confirmationString:", "new", "actionBlock:", "show"],
<<<<<<<
source: "request: aString value: valueString do: aBlock\x0a\x09(HLRequestWidget new\x0a\x09\x09confirmationString: aString;\x0a\x09\x09actionBlock: aBlock;\x0a\x09\x09value: valueString;\x0a\x09\x09yourself)\x0a\x09\x09\x09appendToJQuery: 'body' asJQuery",
messageSends: ["appendToJQuery:", "confirmationString:", "new", "actionBlock:", "value:", "yourself", "asJQuery"],
=======
source: "request: aString value: valueString do: aBlock\x0a\x09HLRequestWidget new\x0a\x09\x09confirmationString: aString;\x0a\x09\x09actionBlock: aBlock;\x0a\x09\x09value: valueString;\x0a\x09\x09show",
messageSends: ["confirmationString:", "new", "actionBlock:", "value:", "show"],
>>>>>>>
source: "request: aString value: valueString do: aBlock\x0a\x09HLRequestWidget new\x0a\x09\x09confirmationString: aString;\x0a\x09\x09actionBlock: aBlock;\x0a\x09\x09value: valueString;\x0a\x09\x09show",
messageSends: ["confirmationString:", "new", "actionBlock:", "value:", "show"],
<<<<<<<
$3=self;
_st($3)._renderMainOn_(html);
$4=_st($3)._renderButtonsOn_(html);
return $4;
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
=======
self._renderMainOn_(html);
$3=self._hasButtons();
if(smalltalk.assert($3)){
return self._renderButtonsOn_(html);
};
}, function($ctx2) {$ctx2.fillBlock({},$ctx1)})}));
>>>>>>>
self._renderMainOn_(html);
$3=self._hasButtons();
if(smalltalk.assert($3)){
return self._renderButtonsOn_(html);
};
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
<<<<<<<
source: "setupKeyBindings\x0a\x09'.dialog' asJQuery keyup: [ :e |\x0a\x09\x09e keyCode = 27 ifTrue: [ self cancel ] ]",
messageSends: ["keyup:", "asJQuery", "ifTrue:", "=", "keyCode", "cancel"],
=======
source: "setupKeyBindings\x0a\x09'.dialog' asJQuery keyup: [ :e |\x0a\x09\x09e keyCode = String esc asciiValue ifTrue: [ self cancel ] ]",
messageSends: ["keyup:", "ifTrue:", "cancel", "=", "asciiValue", "esc", "keyCode", "asJQuery"],
referencedClasses: ["String"]
}),
smalltalk.HLModalWidget);
smalltalk.addMethod(
smalltalk.method({
selector: "show",
category: 'actions',
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
self._appendToJQuery_("body"._asJQuery());
return self}, function($ctx1) {$ctx1.fill(self,"show",{},smalltalk.HLModalWidget)})},
args: [],
source: "show\x0a\x09self appendToJQuery: 'body' asJQuery",
messageSends: ["appendToJQuery:", "asJQuery"],
>>>>>>>
source: "setupKeyBindings\x0a\x09'.dialog' asJQuery keyup: [ :e |\x0a\x09\x09e keyCode = String esc asciiValue ifTrue: [ self cancel ] ]",
messageSends: ["keyup:", "asJQuery", "ifTrue:", "=", "keyCode", "asciiValue", "esc", "cancel"],
referencedClasses: ["String"]
}),
smalltalk.HLModalWidget);
smalltalk.addMethod(
smalltalk.method({
selector: "show",
category: 'actions',
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
self._appendToJQuery_("body"._asJQuery());
return self}, function($ctx1) {$ctx1.fill(self,"show",{},smalltalk.HLModalWidget)})},
args: [],
source: "show\x0a\x09self appendToJQuery: 'body' asJQuery",
messageSends: ["appendToJQuery:", "asJQuery"],
<<<<<<<
selector: "remove",
category: 'actions',
fn: function (){
var self=this;
return smalltalk.withContext(function($ctx1) {
_st(".dialog"._asJQuery())._removeClass_("active");
_st((function(){
return smalltalk.withContext(function($ctx2) {
_st("#overlay"._asJQuery())._remove();
return _st(".dialog"._asJQuery())._remove();
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}))._valueWithTimeout_((300));
return self}, function($ctx1) {$ctx1.fill(self,"remove",{},smalltalk.HLConfirmationWidget)})},
args: [],
source: "remove\x0a\x09'.dialog' asJQuery removeClass: 'active'.\x0a\x09[ \x0a\x09\x09'#overlay' asJQuery remove.\x0a\x09\x09'.dialog' asJQuery remove\x0a\x09] valueWithTimeout: 300",
messageSends: ["removeClass:", "asJQuery", "valueWithTimeout:", "remove"],
referencedClasses: []
}),
smalltalk.HLConfirmationWidget);
smalltalk.addMethod(
smalltalk.method({
selector: "renderButtonsOn:",
category: 'rendering',
fn: function (html){
var self=this;
var confirmButton;
return smalltalk.withContext(function($ctx1) {
var $1,$3,$4,$5,$6,$2;
$1=_st(html)._div();
_st($1)._class_("buttons");
$2=_st($1)._with_((function(){
return smalltalk.withContext(function($ctx2) {
$3=_st(html)._button();
_st($3)._class_("button");
_st($3)._with_("Cancel");
$4=_st($3)._onClick_((function(){
return smalltalk.withContext(function($ctx3) {
return self._cancel();
}, function($ctx3) {$ctx3.fillBlock({},$ctx2,2)})}));
$4;
$5=_st(html)._button();
_st($5)._class_("button default");
_st($5)._with_("Confirm");
$6=_st($5)._onClick_((function(){
return smalltalk.withContext(function($ctx3) {
return self._confirm();
}, function($ctx3) {$ctx3.fillBlock({},$ctx2,3)})}));
confirmButton=$6;
return confirmButton;
}, function($ctx2) {$ctx2.fillBlock({},$ctx1,1)})}));
_st(_st(confirmButton)._asJQuery())._focus();
return self}, function($ctx1) {$ctx1.fill(self,"renderButtonsOn:",{html:html,confirmButton:confirmButton},smalltalk.HLConfirmationWidget)})},
args: ["html"],
source: "renderButtonsOn: html\x0a\x09| confirmButton |\x0a\x09\x0a\x09html div \x0a\x09\x09class: 'buttons';\x0a\x09\x09with: [\x0a\x09\x09\x09html button\x0a\x09\x09\x09\x09class: 'button';\x0a\x09\x09\x09\x09with: 'Cancel';\x0a\x09\x09\x09\x09onClick: [ self cancel ].\x0a\x09\x09\x09confirmButton := html button\x0a\x09\x09\x09\x09class: 'button default';\x0a\x09\x09\x09\x09with: 'Confirm';\x0a\x09\x09\x09\x09onClick: [ self confirm ] ].\x0a\x0a\x09confirmButton asJQuery focus",
messageSends: ["class:", "div", "with:", "button", "onClick:", "cancel", "confirm", "focus", "asJQuery"],
referencedClasses: []
}),
smalltalk.HLConfirmationWidget);
smalltalk.addMethod(
smalltalk.method({
=======
>>>>>>>
<<<<<<<
source: "confirm\x0a\x09self actionBlock value: input asJQuery val.\x0a\x09self remove",
messageSends: ["value:", "actionBlock", "val", "asJQuery", "remove"],
=======
source: "confirm\x0a\x09super confirm.\x0a\x09self actionBlock value: input asJQuery val",
messageSends: ["confirm", "value:", "val", "asJQuery", "actionBlock"],
>>>>>>>
source: "confirm\x0a\x09super confirm.\x0a\x09self actionBlock value: input asJQuery val",
messageSends: ["confirm", "value:", "actionBlock", "val", "asJQuery"],
<<<<<<<
source: "show\x0a\x09self isVisible ifFalse: [\x0a\x09\x09visible := true.\x0a\x09\x09self appendToJQuery: 'body' asJQuery ]",
messageSends: ["ifFalse:", "isVisible", "appendToJQuery:", "asJQuery"],
=======
source: "show\x0a\x09self isVisible ifFalse: [\x0a\x09\x09visible := true.\x0a\x09\x09super show ]",
messageSends: ["ifFalse:", "show", "isVisible"],
>>>>>>>
source: "show\x0a\x09self isVisible ifFalse: [\x0a\x09\x09visible := true.\x0a\x09\x09super show ]",
messageSends: ["ifFalse:", "isVisible", "show"], |
<<<<<<<
add: function () {
var self = this,
id = this.items;
this.items++;
return function () {
self.check(id, arguments);
};
},
check: function (id, arguments) {
this.results[id] = Array.prototype.slice.call(arguments);
this.items--;
if (this.items == 0) {
this.callback.apply(this, this.results);
}
}
=======
add: function () {
var self = this,
id = this.items;
this.items++;
return function () {
self.check(id, arguments);
};
},
check: function (id, arguments) {
this.results[id] = Array.prototype.slice.call(arguments);
this.items--;
if (this.items == 0) {
this.callback.apply(this, this.results);
}
}
>>>>>>>
add: function () {
var self = this,
id = this.items;
this.items++;
return function () {
self.check(id, arguments);
};
},
check: function (id, arguments) {
this.results[id] = Array.prototype.slice.call(arguments);
this.items--;
if (this.items == 0) {
this.callback.apply(this, this.results);
}
}
<<<<<<<
this.kernel_libraries = ['@boot', '@smalltalk', '@nil', '@_st', 'Kernel-Objects', 'Kernel-Classes', 'Kernel-Methods',
'Kernel-Collections', 'Kernel-Exceptions', 'Kernel-Transcript',
'Kernel-Announcements'];
this.compiler_libraries = this.kernel_libraries.concat(['@parser', 'Importer-Exporter',
'Compiler-Core', 'Compiler-AST', 'Compiler-Exceptions', 'Compiler-IR', 'Compiler-Inlining', 'Compiler-Semantic']);
=======
this.kernel_libraries = ['@boot', 'Kernel-Objects', 'Kernel-Classes', 'Kernel-Methods',
'Kernel-Collections', 'Kernel-Exceptions', 'Kernel-Transcript',
'Kernel-Announcements'];
this.compiler_libraries = this.kernel_libraries.concat(['@parser', 'Importer-Exporter', 'Compiler-Exceptions',
'Compiler-Core', 'Compiler-AST', 'Compiler-IR', 'Compiler-Inlining', 'Compiler-Semantic']);
>>>>>>>
this.kernel_libraries = ['@boot', '@smalltalk', '@nil', '@_st', 'Kernel-Objects', 'Kernel-Classes', 'Kernel-Methods',
'Kernel-Collections', 'Kernel-Exceptions', 'Kernel-Transcript',
'Kernel-Announcements'];
this.compiler_libraries = this.kernel_libraries.concat(['@parser', 'Importer-Exporter', 'Compiler-Exceptions',
'Compiler-Core', 'Compiler-AST', 'Compiler-Exceptions', 'Compiler-IR', 'Compiler-Inlining', 'Compiler-Semantic']);
<<<<<<<
var smalltalk = defaults.smalltalk;
var pluggableExporter = smalltalk.PluggableExporter;
var packageObject = smalltalk.Package._named_(category);
packageObject._amdNamespace_(defaults.amd_namespace);
fs.writeFile(jsFile, smalltalk.String._streamContents_(function (stream) {
pluggableExporter._newUsing_(smalltalk.Exporter._amdRecipe())._exportPackage_on_(packageObject, stream); }), function(err) {
=======
var smalltalk = defaults.smalltalk;
var pluggableExporter = smalltalk.PluggableExporter;
var packageObject = smalltalk.Package._named_(category);
fs.writeFile(jsFile, smalltalk.String._streamContents_(function (stream) {
pluggableExporter._newUsing_(smalltalk.Exporter._recipe())._exportPackage_on_(packageObject, stream); }), function(err) {
>>>>>>>
var smalltalk = defaults.smalltalk;
var pluggableExporter = smalltalk.PluggableExporter;
var packageObject = smalltalk.Package._named_(category);
packageObject._amdNamespace_(defaults.amd_namespace);
fs.writeFile(jsFile, smalltalk.String._streamContents_(function (stream) {
pluggableExporter._newUsing_(smalltalk.Exporter._amdRecipe())._exportPackage_on_(packageObject, stream); }), function(err) {
<<<<<<<
fs.writeFile(jsFileDeploy, smalltalk.String._streamContents_(function (stream) {
pluggableExporter._newUsing_(smalltalk.StrippedExporter._amdRecipe())._exportPackage_on_(packageObject, stream); }), callback);
=======
fs.writeFile(jsFileDeploy, smalltalk.String._streamContents_(function (stream) {
pluggableExporter._newUsing_(smalltalk.StrippedExporter._recipe())._exportPackage_on_(packageObject, stream); }), callback);
>>>>>>>
fs.writeFile(jsFileDeploy, smalltalk.String._streamContents_(function (stream) {
pluggableExporter._newUsing_(smalltalk.StrippedExporter._amdRecipe())._exportPackage_on_(packageObject, stream); }), callback); |
<<<<<<<
return smalltalk.withContext(function($ctx1) {
smalltalk.Object.fn.prototype._initialize.apply(_st(self), []);
self["@chunkParser"]=_st((smalltalk.ChunkParser || ChunkParser))._new();
return self}, function($ctx1) {$ctx1.fill(self,"initialize",{}, smalltalk.ClassCategoryReader)})},
=======
smalltalk.send(self,"_initialize",[],smalltalk.Object);
return self},
>>>>>>>
return smalltalk.withContext(function($ctx1) {
smalltalk.Object.fn.prototype._initialize.apply(_st(self), []);
return self}, function($ctx1) {$ctx1.fill(self,"initialize",{}, smalltalk.ClassCategoryReader)})},
<<<<<<<
return smalltalk.withContext(function($ctx1) {
smalltalk.Object.fn.prototype._initialize.apply(_st(self), []);
self["@chunkParser"]=_st((smalltalk.ChunkParser || ChunkParser))._new();
return self}, function($ctx1) {$ctx1.fill(self,"initialize",{}, smalltalk.ClassCommentReader)})},
=======
smalltalk.send(self,"_initialize",[],smalltalk.Object);
return self},
>>>>>>>
return smalltalk.withContext(function($ctx1) {
smalltalk.Object.fn.prototype._initialize.apply(_st(self), []);
return self}, function($ctx1) {$ctx1.fill(self,"initialize",{}, smalltalk.ClassCommentReader)})}, |
<<<<<<<
fn: function (aNumber){
var self=this;
return smalltalk.withContext(function($ctx1) {
return setInterval(self, aNumber);
;
return self}, self, "valueWithInterval:", [aNumber], smalltalk.BlockClosure)},
=======
fn: function (aNumber){
var self=this;
var interval = setInterval(self, aNumber);
return smalltalk.Timeout._on_(interval);
;
;
return self},
>>>>>>>
fn: function (aNumber){
var self=this;
return smalltalk.withContext(function($ctx1) {
var interval = setInterval(self, aNumber);
return smalltalk.Timeout._on_(interval);
;
return self}, self, "valueWithInterval:", [aNumber], smalltalk.BlockClosure)},
<<<<<<<
fn: function (aNumber){
var self=this;
return smalltalk.withContext(function($ctx1) {
return setTimeout(self, aNumber);
;
return self}, self, "valueWithTimeout:", [aNumber], smalltalk.BlockClosure)},
=======
fn: function (aNumber){
var self=this;
var timeout = setTimeout(self, aNumber);
return smalltalk.Timeout._on_(timeout);
;
;
return self},
>>>>>>>
fn: function (aNumber){
var self=this;
return smalltalk.withContext(function($ctx1) {
var timeout = setTimeout(self, aNumber);
return smalltalk.Timeout._on_(timeout);
;
return self}, self, "valueWithTimeout:", [aNumber], smalltalk.BlockClosure)},
<<<<<<<
return smalltalk.withContext(function($ctx1) {
var $1;
$1=_st(self["@poolSize"]).__lt(self["@maxPoolSize"]);
=======
var $1;
$1=smalltalk.send(self["@poolSize"],"__lt",[smalltalk.send(self,"_maxPoolSize",[])]);
>>>>>>>
return smalltalk.withContext(function($ctx1) {
var $1;
$1=_st(self["@poolSize"]).__lt(_st(self)._maxPoolSize());
<<<<<<<
self["@maxPoolSize"]=_st(_st(self)._class())._defaultMaxPoolSize();
self["@queue"]=_st((smalltalk.Queue || Queue))._new();
self["@worker"]=_st(self)._makeWorker();
return self}, self, "initialize", [], smalltalk.ForkPool)},
=======
self["@queue"]=smalltalk.send((smalltalk.Queue || Queue),"_new",[]);
self["@worker"]=smalltalk.send(self,"_makeWorker",[]);
return self},
>>>>>>>
self["@queue"]=_st((smalltalk.Queue || Queue))._new();
self["@worker"]=_st(self)._makeWorker();
return self}, self, "initialize", [], smalltalk.ForkPool)}, |
<<<<<<<
"image_debug",
"cv_utils",
"gl-matrix"],
=======
"image_debug"],
>>>>>>>
"image_debug",
"gl-matrix"],
<<<<<<<
ImageDebug,
CVUtils,
glMatrix) {
=======
ImageDebug) {
>>>>>>>
ImageDebug,
glMatrix) {
<<<<<<<
if (typeof document !== "undefined") {
var $viewport = document.querySelector("#interactive.viewport");
_canvasContainer.dom.image = document.querySelector("canvas.imgBuffer");
if (!_canvasContainer.dom.image) {
_canvasContainer.dom.image = document.createElement("canvas");
_canvasContainer.dom.image.className = "imgBuffer";
if ($viewport && _config.inputStream.type == "ImageStream") {
$viewport.appendChild(_canvasContainer.dom.image);
}
=======
var $viewport = document.querySelector("#interactive.viewport");
_canvasContainer.dom.image = document.querySelector("canvas.imgBuffer");
if (!_canvasContainer.dom.image) {
_canvasContainer.dom.image = document.createElement("canvas");
_canvasContainer.dom.image.className = "imgBuffer";
if($viewport && _config.inputStream.type == "ImageStream") {
$viewport.appendChild(_canvasContainer.dom.image);
}
}
_canvasContainer.ctx.image = _canvasContainer.dom.image.getContext("2d");
_canvasContainer.dom.image.width = _inputStream.getCanvasSize().x;
_canvasContainer.dom.image.height = _inputStream.getCanvasSize().y;
_canvasContainer.dom.overlay = document.querySelector("canvas.drawingBuffer");
if (!_canvasContainer.dom.overlay) {
_canvasContainer.dom.overlay = document.createElement("canvas");
_canvasContainer.dom.overlay.className = "drawingBuffer";
if($viewport) {
$viewport.appendChild(_canvasContainer.dom.overlay);
>>>>>>>
if (typeof document !== "undefined") {
var $viewport = document.querySelector("#interactive.viewport");
_canvasContainer.dom.image = document.querySelector("canvas.imgBuffer");
if (!_canvasContainer.dom.image) {
_canvasContainer.dom.image = document.createElement("canvas");
_canvasContainer.dom.image.className = "imgBuffer";
if ($viewport && _config.inputStream.type == "ImageStream") {
$viewport.appendChild(_canvasContainer.dom.image);
} |
<<<<<<<
"image_debug",
"cv_utils",
"gl-matrix"],
=======
"image_debug"],
>>>>>>>
"image_debug",
"gl-matrix"],
<<<<<<<
ImageDebug,
CVUtils,
glMatrix) {
=======
ImageDebug) {
>>>>>>>
ImageDebug,
glMatrix) {
<<<<<<<
if (typeof document !== "undefined") {
var $viewport = document.querySelector("#interactive.viewport");
_canvasContainer.dom.image = document.querySelector("canvas.imgBuffer");
if (!_canvasContainer.dom.image) {
_canvasContainer.dom.image = document.createElement("canvas");
_canvasContainer.dom.image.className = "imgBuffer";
if ($viewport && _config.inputStream.type == "ImageStream") {
$viewport.appendChild(_canvasContainer.dom.image);
}
}
_canvasContainer.ctx.image = _canvasContainer.dom.image.getContext("2d");
_canvasContainer.dom.image.width = _inputStream.getWidth();
_canvasContainer.dom.image.height = _inputStream.getHeight();
_canvasContainer.dom.overlay = document.querySelector("canvas.drawingBuffer");
if (!_canvasContainer.dom.overlay) {
_canvasContainer.dom.overlay = document.createElement("canvas");
_canvasContainer.dom.overlay.className = "drawingBuffer";
if ($viewport) {
$viewport.appendChild(_canvasContainer.dom.overlay);
}
var clearFix = document.createElement("br");
clearFix.setAttribute("clear", "all");
if ($viewport) {
$viewport.appendChild(clearFix);
}
}
_canvasContainer.ctx.overlay = _canvasContainer.dom.overlay.getContext("2d");
_canvasContainer.dom.overlay.width = _inputStream.getWidth();
_canvasContainer.dom.overlay.height = _inputStream.getHeight();
}
=======
var $viewport = document.querySelector("#interactive.viewport");
_canvasContainer.dom.image = document.querySelector("canvas.imgBuffer");
if (!_canvasContainer.dom.image) {
_canvasContainer.dom.image = document.createElement("canvas");
_canvasContainer.dom.image.className = "imgBuffer";
if($viewport && _config.inputStream.type == "ImageStream") {
$viewport.appendChild(_canvasContainer.dom.image);
}
}
_canvasContainer.ctx.image = _canvasContainer.dom.image.getContext("2d");
_canvasContainer.dom.image.width = _inputStream.getCanvasSize().x;
_canvasContainer.dom.image.height = _inputStream.getCanvasSize().y;
_canvasContainer.dom.overlay = document.querySelector("canvas.drawingBuffer");
if (!_canvasContainer.dom.overlay) {
_canvasContainer.dom.overlay = document.createElement("canvas");
_canvasContainer.dom.overlay.className = "drawingBuffer";
if($viewport) {
$viewport.appendChild(_canvasContainer.dom.overlay);
}
var clearFix = document.createElement("br");
clearFix.setAttribute("clear", "all");
if($viewport) {
$viewport.appendChild(clearFix);
}
}
_canvasContainer.ctx.overlay = _canvasContainer.dom.overlay.getContext("2d");
_canvasContainer.dom.overlay.width = _inputStream.getCanvasSize().x;
_canvasContainer.dom.overlay.height = _inputStream.getCanvasSize().y;
>>>>>>>
if (typeof document !== "undefined") {
var $viewport = document.querySelector("#interactive.viewport");
_canvasContainer.dom.image = document.querySelector("canvas.imgBuffer");
if (!_canvasContainer.dom.image) {
_canvasContainer.dom.image = document.createElement("canvas");
_canvasContainer.dom.image.className = "imgBuffer";
if ($viewport && _config.inputStream.type == "ImageStream") {
$viewport.appendChild(_canvasContainer.dom.image);
}
}
_canvasContainer.ctx.image = _canvasContainer.dom.image.getContext("2d");
_canvasContainer.dom.image.width = _inputStream.getCanvasSize().x;
_canvasContainer.dom.image.height = _inputStream.getCanvasSize().y;
_canvasContainer.dom.overlay = document.querySelector("canvas.drawingBuffer");
if (!_canvasContainer.dom.overlay) {
_canvasContainer.dom.overlay = document.createElement("canvas");
_canvasContainer.dom.overlay.className = "drawingBuffer";
if ($viewport) {
$viewport.appendChild(_canvasContainer.dom.overlay);
}
var clearFix = document.createElement("br");
clearFix.setAttribute("clear", "all");
if ($viewport) {
$viewport.appendChild(clearFix);
}
}
_canvasContainer.ctx.overlay = _canvasContainer.dom.overlay.getContext("2d");
_canvasContainer.dom.overlay.width = _inputStream.getCanvasSize().x;
_canvasContainer.dom.overlay.height = _inputStream.getCanvasSize().y;
} |
<<<<<<<
$.each(this.options.events, function(k, event) {
if((parseInt(event.start) < end) && (parseInt(event.end) > start)) {
=======
$.each(options.events, function(k, event) {
if((parseInt(event.start) <= end) && (parseInt(event.end) >= start)) {
>>>>>>>
$.each(this.options.events, function(k, event) {
if((parseInt(event.start) <= end) && (parseInt(event.end) >= start)) {
<<<<<<<
$.each(this.options.events, function(k, event) {
if((parseInt(event.start) < end) && (parseInt(event.end) > start)) {
=======
$.each(options.events, function(k, event) {
if((parseInt(event.start) <= end) && (parseInt(event.end) >= start)) {
>>>>>>>
$.each(this.options.events, function(k, event) {
if((parseInt(event.start) <= end) && (parseInt(event.end) >= start)) {
<<<<<<<
$.each(this.options.events, function(k, event) {
if((parseInt(event.start) < end) && (parseInt(event.end) > start)) {
=======
$.each(options.events, function(k, event) {
if((parseInt(event.start) <= end) && (parseInt(event.end) >= start)) {
>>>>>>>
$.each(this.options.events, function(k, event) {
if((parseInt(event.start) <= end) && (parseInt(event.end) >= start)) {
<<<<<<<
$.each(this.options.events, function(k, event) {
if((parseInt(event.start) < end) && (parseInt(event.end) > start)) {
=======
$.each(options.events, function(k, event) {
if((parseInt(event.start) <= end) && (parseInt(event.end) >= start)) {
>>>>>>>
$.each(this.options.events, function(k, event) {
if((parseInt(event.start) < end) && (parseInt(event.end) > start)) { |
<<<<<<<
=======
}
onSwitch = type => {
const { onTabChange } = this.props;
this.setState({
type,
});
onTabChange(type);
>>>>>>>
<<<<<<<
const { form, onSubmit } = this.props;
form.validateFields(activeFileds, { force: true }, (err, values) => {
onSubmit(err, values);
=======
form.validateFields(activeFileds, { force: true }, (err, values) => {
onSubmit(err, values);
>>>>>>>
form.validateFields(activeFileds, { force: true }, (err, values) => {
onSubmit(err, values); |
<<<<<<<
shapeShiftTxList: configManager.getShapeShiftTxList(),
=======
currentFiat: configManager.getCurrentFiat(),
conversionRate: configManager.getConversionRate(),
conversionDate: configManager.getConversionDate(),
>>>>>>>
shapeShiftTxList: configManager.getShapeShiftTxList(),
currentFiat: configManager.getCurrentFiat(),
conversionRate: configManager.getConversionRate(),
conversionDate: configManager.getConversionDate(), |
<<<<<<<
componentDidUpdate(preProps) {
if (JSON.stringify(preProps.data) !== JSON.stringify(this.props.data)) {
this.renderChart(this.props);
=======
componentWillReceiveProps(nextProps) {
const { data } = this.props;
if (JSON.stringify(nextProps.data) !== JSON.stringify(data)) {
this.renderChart(nextProps);
>>>>>>>
componentDidUpdate(preProps) {
const { data } = this.props;
if (JSON.stringify(preProps.data) !== JSON.stringify(data)) {
this.renderChart(this.props); |
<<<<<<<
componentDidUpdate(preProps) {
if (this.props.data !== preProps.data) {
this.getLegendData();
=======
componentWillReceiveProps(nextProps) {
const { data } = this.props;
if (data !== nextProps.data) {
this.getLengendData();
>>>>>>>
componentDidUpdate(preProps) {
const { data } = this.props;
if (data !== preProps.data) {
this.getLegendData(); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.