conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
$proto.memReadIO = function(address) {
switch (address - this.IOStart) {
case 0: return emulator.tickCount | 0;
=======
$proto.memReadIO = function(wordIndex) {
switch (wordIndex * 4 - this.IOStart) {
case 0: return emulator.getTickCount();
>>>>>>>
$proto.memReadIO = function(address) {
switch (address - this.IOStart) {
case 0: return emulator.getTickCount();
<<<<<<<
$proto.memWriteVideo = function(address, val) {
this.mainMemory[address / 4 | 0] = val;
let offset = (address - this.DisplayStart) / 4;
emulator.registerVideoChange(offset, val);
=======
$proto.memWriteVideo = function(wordIndex, word) {
this.mainMemory[wordIndex] = word;
var offset = wordIndex - this.DisplayStart / 4;
emulator.registerVideoChange(offset, word);
>>>>>>>
$proto.memWriteVideo = function(address, val) {
this.mainMemory[address / 4 | 0] = val;
let offset = (address - this.DisplayStart) / 4;
emulator.registerVideoChange(offset, val); |
<<<<<<<
var blocks = {}; // key: filename, value: blocks
var crypto = require('crypto');
function clean(text) {
return String(text).replace(/^\s*$/gm, '') // 清除空行
.replace(/\n{2,}/gm, '\n'); // 清除连接的空行
}
/*
* 保证目录存在
* @param{String} dir 目录
*/
function forceDirSync(dir) {
if (!fs.existsSync(dir)) {
forceDirSync(path.dirname(dir));
fs.mkdirSync(dir);
}
}
/**
* 计算 md5
* @param{String} content 内容
* @return 返回内容的 md5 值，以十六进制小写输出
*/
function md5(content) {
var hash = crypto.createHash('md5');
hash.update(content);
return hash.digest('hex');
}
var htmlDecodeDict = {
'quot': '"',
'lt': '<',
'gt': '>',
'amp': '&',
'nbsp': ' '
};
/**
* HTML解码
* @param {String} html
*/
function decodeHTML(html) {
return String(html).replace(
/&((quot|lt|gt|amp|nbsp)|#x([a-f\d]+)|#(\d+));/ig,
function(all, group, key, hex, dec) {
return key ? htmlDecodeDict[key.toLowerCase()] :
hex ? String.fromCharCode(parseInt(hex, 16)) :
String.fromCharCode(+dec);
}
);
}
var htmlEncodeDict = {
'"': 'quot',
'<': 'lt',
'>': 'gt',
'&': 'amp',
' ': 'nbsp'
};
/**
* HTML编码
* @param {String} text 文本
*/
function encodeHTML(text) {
return String(text).replace(/["<>& ]/g, function(all) {
return '&' + htmlEncodeDict[all] + ';';
});
}
/**
* 获取属性对象
* @param{String} tag 标签
* @param{String} attrText 属性文本
* @param{String} dirname 文件目录名
* @return 返回属性对象，如果出现文件则计算绝对路径
*/
var getAttrs = function(tag, attrText, dirname) {
var result = {};
if (/^(\s+[\w\/\\\-\.]+)*$/.test(attrText)) { // a b c
var index = 0;
attrText.replace(/[\w\/\\\-\.]+/g, function(value) {
value = decodeHTML(value);
result[index] = value;
var key;
if (/^(replace|include)$/.test(tag)) {
key = ['file', 'block', 'encoding', 'trigger'][index];
} else if (tag === 'remove') {
key = ['trigger'][index];
} else {
key = ['type', 'trigger'][index];
}
if (key) {
result[key] = value;
}
index++;
return '';
});
} else { // a="v1" b="v2" c="v3"
attrText.replace(/\s*([\w-_.]+)\s*=\s*"([^"]+)"/g, function(all, key, value) {
result[key] = decodeHTML(value);
return '';
});
}
if (result.trigger) {
result.trigger = result.trigger.split(',');
}
if (/^(\*|&)$/.test(result.file)) { // file="&" 当前文件
result.file = '';
}
if (result.file) {
result['@filename'] = path.resolve(dirname, result.file); // 计算绝对路径
}
if (tag === 'script' && result.src &&
/^[^:]+$/.test(result.src)) {
result['@filename'] = path.resolve(dirname, result.src); // 计算绝对路径
}
if (tag === 'link' && result.href &&
/^[^:]+$/.test(result.href)) {
result['@filename'] = path.resolve(dirname, result.href); // 计算绝对路径
}
return result;
};
=======
var blocks; // key: filename, value: blocks
var variants = {}; // key: name, value: content
>>>>>>>
var blocks = {}; // key: filename, value: blocks
var variants = {}; // key: name, value: content
<<<<<<<
if (!isBinary) { // 非二进制文件再次编译
content = buildBlock(content, readBlock, true);
}
content = processor(content, attrs, dirname, options, tag, readBlock, buildFile, filename);
=======
content = processor({
content: content, // 内容
attrs: attrs, // 属性
dirname: blockfile ? path.dirname(blockfile) : dirname, // 当前内容所在目录
blockfile: blockfile, // 块文件名
blockname: blockname, // 块名
options: options, // 选项
tag: tag, // 标签
buildBlock: buildBlock, // 编译一个块
readBlock: readBlock, // 读取模块的函数
getValue: getValue, // 获取变量的函数
filename: filename, // 输入文件
jdists: exports // jdists 本身
});
>>>>>>>
if (!isBinary) { // 非二进制文件再次编译
content = buildBlock(content, readBlock, true);
}
content = processor({
content: content, // 内容
attrs: attrs, // 属性
dirname: blockfile ? path.dirname(blockfile) : dirname, // 当前内容所在目录
blockfile: blockfile, // 块文件名
blockname: blockname, // 块名
options: options, // 选项
tag: tag, // 标签
buildBlock: buildBlock, // 编译一个块
readBlock: readBlock, // 读取模块的函数
getValue: getValue, // 获取变量的函数
filename: filename, // 输入文件
jdists: exports // jdists 本身
});
}
if (attrs.slice) {
var params = attrs.slice.split(',');
content = content.slice(params[0], params[1]); |
<<<<<<<
import BandwidthBar from './BandwidthBar';
import Timer from './timer';
=======
import BandwidthBar from './BandwidthBar';
import Battery from './battery';
>>>>>>>
import BandwidthBar from './BandwidthBar';
import Timer from './timer';
import Battery from './battery';
<<<<<<<
Timer,
=======
Battery,
>>>>>>>
Timer,
Battery, |
<<<<<<<
function createWithdrawDelegationReward(txContext, address, memo, rewards) {
const txSkeleton = createSkeletonCyber(txContext);
txSkeleton.value.msg = [];
Object.keys(rewards).forEach(key => {
txSkeleton.value.msg.push({
type: 'cosmos-sdk/MsgWithdrawDelegationReward',
value: {
delegator_address: address,
validator_address: rewards[key].validator_address,
},
});
});
txSkeleton.value.memo = memo || '';
return txSkeleton;
}
=======
function createRedelegateCyber(
txContext,
validatorSourceBech32,
validatorDestBech32,
uatomAmount,
memo
) {
const txSkeleton = createSkeletonCyber(txContext);
const txMsg = {
type: 'cosmos-sdk/MsgBeginRedelegate',
value: {
amount: {
amount: uatomAmount.toString(),
denom: DENOM_CYBER,
},
delegator_address: txContext.bech32,
validator_dst_address: validatorDestBech32,
validator_src_address: validatorSourceBech32,
},
};
txSkeleton.value.msg = [txMsg];
txSkeleton.value.memo = memo || '';
return txSkeleton;
}
>>>>>>>
function createWithdrawDelegationReward(txContext, address, memo, rewards) {
const txSkeleton = createSkeletonCyber(txContext);
txSkeleton.value.msg = [];
Object.keys(rewards).forEach(key => {
txSkeleton.value.msg.push({
type: 'cosmos-sdk/MsgWithdrawDelegationReward',
value: {
delegator_address: address,
validator_address: rewards[key].validator_address,
},
});
});
}
function createRedelegateCyber(
txContext,
validatorSourceBech32,
validatorDestBech32,
uatomAmount,
memo
) {
const txSkeleton = createSkeletonCyber(txContext);
const txMsg = {
type: 'cosmos-sdk/MsgBeginRedelegate',
value: {
amount: {
amount: uatomAmount.toString(),
denom: DENOM_CYBER,
},
delegator_address: txContext.bech32,
validator_dst_address: validatorDestBech32,
validator_src_address: validatorSourceBech32,
},
};
txSkeleton.value.msg = [txMsg];
txSkeleton.value.memo = memo || '';
return txSkeleton;
}
<<<<<<<
createWithdrawDelegationReward,
=======
createRedelegateCyber,
>>>>>>>
createWithdrawDelegationReward,
createRedelegateCyber, |
<<<<<<<
ContributeATOMs,
ErrorTx,
=======
ReDelegate,
TransactionError,
>>>>>>>
ContributeATOMs,
ReDelegate,
TransactionError, |
<<<<<<<
assert.equal(render_cache.createKey(req.params), 'windshaft_test:test_table::png:point:select *:::');
=======
assert.equal(render_cache.createKey(req.params), 'windshaft_test::test_table:png:point:select *::::');
>>>>>>>
assert.equal(render_cache.createKey(req.params), 'windshaft_test:test_table::png:point:select *::::');
<<<<<<<
assert.equal(render_cache.createKey(req.params), 'windshaft_test:test_table::png:point:::#test_table{}:');
=======
assert.equal(render_cache.createKey(req.params), 'windshaft_test::test_table:png:point::::#test_table{}:');
>>>>>>>
assert.equal(render_cache.createKey(req.params), 'windshaft_test:test_table::png:point::::#test_table{}:');
<<<<<<<
assert.equal(render_cache.createKey(req.params), 'windshaft_test:test_table::png:point:::#test_table{}:2.1.0');
=======
assert.equal(render_cache.createKey(req.params), 'windshaft_test::test_table:png:point::::#test_table{}:2.1.0');
>>>>>>>
assert.equal(render_cache.createKey(req.params), 'windshaft_test:test_table::png:point::::#test_table{}:2.1.0'); |
<<<<<<<
suite('renderer_plain_factory_getRenderer', function() {
function rendererOptions(layer) {
return {
layer: layer
};
}
=======
describe('renderer_http_factory_getRenderer', function() {
>>>>>>>
describe('renderer_http_factory_getRenderer', function() {
function rendererOptions(layer) {
return {
layer: layer
};
} |
<<<<<<<
app.dumpCacheStats = function() {
render_cache.dumpStats();
};
=======
// Create a multilayer map, returning a token
app.post(app.base_url_notable + '/layergroup', function(req, res){
var mml_builder;
var response = {}
var mapconfig;
app.doCORS(res);
Step(
function setupParams(){
app.req2params(req, this);
},
function initLayergroup(err, data){
var next = this;
if (err) throw err;
if ( req.headers['content-type'] != 'application/json' )
throw new Error('layergroup POST data must be of type application/json');
var cfg = mapconfig = req.body;
//console.log('Configuration:'); console.dir(cfg);
var version = cfg.version || '1.0.0';
if (version != '1.0.0') {
throw new Error("Unsupported layergroup configuration version " + version);
}
var sql = [];
var style = [];
var style_version = [];
if ( ! cfg.hasOwnProperty('layers') )
throw new Error("Missing layers array from layergroup config");
for ( var i=0; i<cfg.layers.length; ++i ) {
var lyr = cfg.layers[i];
if ( ! lyr.hasOwnProperty('options') )
throw new Error("Missing options from layer " + i + " of layergroup config");
var lyropt = lyr.options;
if ( ! lyropt.hasOwnProperty('sql') )
throw new Error("Missing sql for layer " + i + " options");
// Wrap SQL requests in mapnik format if sent
sql.push( "(" + lyropt.sql.replace(/;\s*$/, '') + ") as cdbq");
if ( ! lyropt.hasOwnProperty('cartocss') )
throw new Error("Missing cartocss for layer " + i + " options");
style.push(lyropt.cartocss);
style_version.push(lyropt.cartocss_version); // optional
}
var opts = _.clone(req.params);
opts.sql = sql;
opts.style = style;
opts.style_version = style_version;
//console.log("Opts: "); console.dir(opts);
mml_builder = mml_store.mml_builder(opts, function(err) {
if (err) { next(err); return; }
next(null, mml_builder.getToken());
});
},
function tryFetchTile(err, token){
if (err) throw err;
response.layergroupid = token;
// TODO: try to fetch the tile !
return null;
},
function posLayerCreate(err) {
if (err) throw err;
app.afterLayergroupCreate(mapconfig, response, this);
},
// TODO: postLayergroupCreate
function finish(err){
var statusCode = 200;
if (err){
response.errors = err.message.split('\n');
statusCode = 400;
// TODO: Find an appropriate statusCode
}
res.send(JSON.stringify(response), statusCode);
}
);
});
// Gets a tile for a given token and set of tile ZXY coords. (OSM style)
app.get(app.base_url_notable + '/layergroup/:token/:z/:x/:y.png', function(req, res) {
app.doCORS(res);
app.getTileOrGrid(req, res);
});
// Gets a grid for a given token, layer and set of tile ZXY coords. (OSM style)
app.get(app.base_url_notable + '/layergroup/:token/:layer/:z/:x/:y.grid.json', function(req, res) {
req.params.format = 'grid.json';
app.doCORS(res);
app.getTileOrGrid(req, res);
});
>>>>>>>
app.dumpCacheStats = function() {
render_cache.dumpStats();
};
// Create a multilayer map, returning a token
app.post(app.base_url_notable + '/layergroup', function(req, res){
var mml_builder;
var response = {}
var mapconfig;
app.doCORS(res);
Step(
function setupParams(){
app.req2params(req, this);
},
function initLayergroup(err, data){
var next = this;
if (err) throw err;
if ( req.headers['content-type'] != 'application/json' )
throw new Error('layergroup POST data must be of type application/json');
var cfg = mapconfig = req.body;
//console.log('Configuration:'); console.dir(cfg);
var version = cfg.version || '1.0.0';
if (version != '1.0.0') {
throw new Error("Unsupported layergroup configuration version " + version);
}
var sql = [];
var style = [];
var style_version = [];
if ( ! cfg.hasOwnProperty('layers') )
throw new Error("Missing layers array from layergroup config");
for ( var i=0; i<cfg.layers.length; ++i ) {
var lyr = cfg.layers[i];
if ( ! lyr.hasOwnProperty('options') )
throw new Error("Missing options from layer " + i + " of layergroup config");
var lyropt = lyr.options;
if ( ! lyropt.hasOwnProperty('sql') )
throw new Error("Missing sql for layer " + i + " options");
// Wrap SQL requests in mapnik format if sent
sql.push( "(" + lyropt.sql.replace(/;\s*$/, '') + ") as cdbq");
if ( ! lyropt.hasOwnProperty('cartocss') )
throw new Error("Missing cartocss for layer " + i + " options");
style.push(lyropt.cartocss);
style_version.push(lyropt.cartocss_version); // optional
}
var opts = _.clone(req.params);
opts.sql = sql;
opts.style = style;
opts.style_version = style_version;
//console.log("Opts: "); console.dir(opts);
mml_builder = mml_store.mml_builder(opts, function(err) {
if (err) { next(err); return; }
next(null, mml_builder.getToken());
});
},
function tryFetchTile(err, token){
if (err) throw err;
response.layergroupid = token;
// TODO: try to fetch the tile !
return null;
},
function posLayerCreate(err) {
if (err) throw err;
app.afterLayergroupCreate(mapconfig, response, this);
},
// TODO: postLayergroupCreate
function finish(err){
var statusCode = 200;
if (err){
response.errors = err.message.split('\n');
statusCode = 400;
// TODO: Find an appropriate statusCode
}
res.send(JSON.stringify(response), statusCode);
}
);
});
// Gets a tile for a given token and set of tile ZXY coords. (OSM style)
app.get(app.base_url_notable + '/layergroup/:token/:z/:x/:y.png', function(req, res) {
app.doCORS(res);
app.getTileOrGrid(req, res);
});
// Gets a grid for a given token, layer and set of tile ZXY coords. (OSM style)
app.get(app.base_url_notable + '/layergroup/:token/:layer/:z/:x/:y.grid.json', function(req, res) {
req.params.format = 'grid.json';
app.doCORS(res);
app.getTileOrGrid(req, res);
}); |
<<<<<<<
minMeetingNameLength,
maxUsersPerRoom,
adobeTrackingUrl,
ATPrimaryCategory,
ATSiteIdentifier,
ATFunctionDept,
=======
mediaMode,
>>>>>>>
minMeetingNameLength,
maxUsersPerRoom,
adobeTrackingUrl,
ATPrimaryCategory,
ATSiteIdentifier,
ATFunctionDept,
mediaMode,
<<<<<<<
getRoomRawInfo,
=======
>>>>>>>
getRoomRawInfo, |
<<<<<<<
// See http://github.com/CartoDB/Windshaft/issues/191
test("mapnik layer with custom geom_column",
function(done) {
var layergroup = {
version: '1.0.1',
layers: [
{ options: {
sql: 'select 1 as i, ST_SetSRID(ST_MakePoint(0,0),4326) as g',
cartocss: '#layer { marker-fill:red; marker-width:100; }',
cartocss_version: '2.0.1',
geom_column: 'g'
} }
]
};
var token1;
Step(
function do_post_1()
{
var next = this;
assert.response(server, {
url: '/database/windshaft_test/layergroup',
method: 'POST',
headers: {'Content-Type': 'application/json' },
data: JSON.stringify(layergroup)
}, {}, function(res, err) { next(err,res); });
},
function check_post_1(err, res) {
if ( err ) throw err;
assert.equal(res.statusCode, 200, res.statusCode + ': ' + res.body);
var parsedBody = JSON.parse(res.body);
token1 = parsedBody.layergroupid;
return null;
},
function do_get_tile(err)
{
if ( err ) throw err;
var next = this;
assert.response(server, {
url: '/database/windshaft_test/layergroup/' + token1 + '/0/0/0.png',
method: 'GET',
encoding: 'binary'
}, {}, function(res) {
assert.equal(res.statusCode, 200, res.body);
assert.equal(res.headers['content-type'], "image/png");
checkCORSHeaders(res);
assert.imageEqualsFile(res.body, './test/fixtures/test_bigpoint_red.png', IMAGE_EQUALS_TOLERANCE_PER_MIL, function(err) {
next(err);
});
});
},
function finish(err) {
var errors = [];
if ( err ) errors.push('' + err);
redis_client.keys('map_cfg|*', function(err, matches) {
if ( err ) errors.push(err.message);
try {
assert.equal(matches.length, 1);
assert.ok(_.indexOf(matches, 'map_cfg|'+token1) > -1,
"Missing expected token " + token1 + " from redis");
} catch (e) {
errors.push('' + e);
}
var cb = function(err, deleted) {
if ( err ) errors.push(err.message);
if ( errors.length ) done(new Error(errors));
else done(null);
};
redis_client.del(matches, cb);
});
}
);
});
=======
test('error 400 on json syntax error', function(done) {
var layergroup = {
version: '1.0.1',
layers: [
{
options: {
sql: 'select the_geom from test_table limit 1',
cartocss: '#layer { marker-fill:red }'
}
}
]
};
assert.response(server,
{
url: '/database/windshaft_test/layergroup',
method: 'POST',
headers: {'Content-Type': 'application/json; charset=utf-8' },
data: '{' + JSON.stringify(layergroup)
},
{
status: 400
},
function(res) {
var parsedBody = JSON.parse(res.body);
assert.equal(parsedBody.error, 'SyntaxError');
assert.equal(parsedBody.msg, 'Unexpected token {');
done();
}
);
});
>>>>>>>
// See http://github.com/CartoDB/Windshaft/issues/191
test("mapnik layer with custom geom_column",
function(done) {
var layergroup = {
version: '1.0.1',
layers: [
{ options: {
sql: 'select 1 as i, ST_SetSRID(ST_MakePoint(0,0),4326) as g',
cartocss: '#layer { marker-fill:red; marker-width:100; }',
cartocss_version: '2.0.1',
geom_column: 'g'
} }
]
};
var token1;
Step(
function do_post_1()
{
var next = this;
assert.response(server, {
url: '/database/windshaft_test/layergroup',
method: 'POST',
headers: {'Content-Type': 'application/json' },
data: JSON.stringify(layergroup)
}, {}, function(res, err) { next(err,res); });
},
function check_post_1(err, res) {
if ( err ) throw err;
assert.equal(res.statusCode, 200, res.statusCode + ': ' + res.body);
var parsedBody = JSON.parse(res.body);
token1 = parsedBody.layergroupid;
return null;
},
function do_get_tile(err)
{
if ( err ) throw err;
var next = this;
assert.response(server, {
url: '/database/windshaft_test/layergroup/' + token1 + '/0/0/0.png',
method: 'GET',
encoding: 'binary'
}, {}, function(res) {
assert.equal(res.statusCode, 200, res.body);
assert.equal(res.headers['content-type'], "image/png");
checkCORSHeaders(res);
assert.imageEqualsFile(res.body, './test/fixtures/test_bigpoint_red.png', IMAGE_EQUALS_TOLERANCE_PER_MIL, function(err) {
next(err);
});
});
},
function finish(err) {
var errors = [];
if ( err ) errors.push('' + err);
redis_client.keys('map_cfg|*', function(err, matches) {
if ( err ) errors.push(err.message);
try {
assert.equal(matches.length, 1);
assert.ok(_.indexOf(matches, 'map_cfg|'+token1) > -1,
"Missing expected token " + token1 + " from redis");
} catch (e) {
errors.push('' + e);
}
var cb = function(err, deleted) {
if ( err ) errors.push(err.message);
if ( errors.length ) done(new Error(errors));
else done(null);
};
redis_client.del(matches, cb);
});
}
);
});
test('error 400 on json syntax error', function(done) {
var layergroup = {
version: '1.0.1',
layers: [
{
options: {
sql: 'select the_geom from test_table limit 1',
cartocss: '#layer { marker-fill:red }'
}
}
]
};
assert.response(server,
{
url: '/database/windshaft_test/layergroup',
method: 'POST',
headers: {'Content-Type': 'application/json; charset=utf-8' },
data: '{' + JSON.stringify(layergroup)
},
{
status: 400
},
function(res) {
var parsedBody = JSON.parse(res.body);
assert.equal(parsedBody.error, 'SyntaxError');
assert.equal(parsedBody.msg, 'Unexpected token {');
done();
}
);
}); |
<<<<<<<
{readOnly ? <div className={styles.label}>Read Only Mode</div> : <div>Editing Allowed</div>}
=======
<div>
<button onClick={function() { signals.toggleSequenceCase(); }}>
Toggle Sequence Case
</button>
<button onClick={function () {
signals.setEditState();}}>Set Edit</button>
<button onClick={function () {
signals.testSignal();}}>Test Edit</button>
</div>
>>>>>>>
{readOnly ? <div className={styles.label}>Read Only Mode</div> : <div>Editing Allowed</div>}
<div>
<button onClick={function() { signals.toggleSequenceCase(); }}>
Toggle Sequence Case
</button>
<button onClick={function () {
signals.setEditState();}}>Set Edit</button>
<button onClick={function () {
signals.testSignal();}}>Test Edit</button>
</div> |
<<<<<<<
=======
>
Joined Feature Spans:
</div>
<div style={{ marginLeft: 50 }}>
{!locations.length && (
<div style={{ marginBottom: 10 }}>
No sub-locations. Click "Add Location" to add sub-locations
for this feature.{" "}
</div>
)}
{fields.map((member, index) => {
//the locations will have already been converted to 1 based ranges
return (
<div style={{}} key={index}>
<div style={{ display: "flex", marginBottom: 10 }}>
<NumericInputField
containerStyle={{ marginBottom: 0, marginRight: 10 }}
inlineLabel
tooltipError
min={1}
max={sequenceLength || 1}
name={`${member}.start`}
label="Start:"
/>
<NumericInputField
containerStyle={{ marginBottom: 0, marginRight: 10 }}
inlineLabel
tooltipError
min={1}
max={sequenceLength || 1}
name={`${member}.end`}
label="End:"
/>
<Button
onClick={() => {
if (locations.length === 2) {
fields.remove(0);
fields.remove(1);
} else {
fields.remove(index);
}
}}
minimal
icon="trash"
/>
</div>
</div>
);
})}
</div>
</div>
)}
<Button
style={{ marginBottom: 10, left: "50%" }}
// intent="primary"
onClick={() => {
if (locations && locations.length) {
fields.push({
start: locations[locations.length - 1].end + 1,
end: locations[locations.length - 1].end + 2
});
} else {
const end1 = Math.max(start, end - 10);
fields.push({
start,
end: end1
});
fields.push({
start: end1 + 3,
end: end1 + 10
});
}
}}
icon="add"
>
Add Joined Feature Span
</Button>
</div>
);
};
render() {
const {
hideModal,
sequenceData = { sequence: "" },
handleSubmit,
locations,
upsertFeature
} = this.props;
const sequenceLength = sequenceData.sequence.length;
return (
<div
className={classNames(
Classes.DIALOG_BODY,
"tg-min-width-dialog",
"tg-upsert-feature"
)}
>
<InputField
inlineLabel
tooltipError
autoFocus
placeholder="Untitled Feature"
validate={required}
name="name"
label="Name:"
/>
<RadioGroupField
inlineLabel
tooltipError
options={[
{ label: "Positive", value: "true" },
{ label: "Negative", value: "false" }
]}
normalize={value => value === "true" || false}
format={value => (value ? "true" : "false")}
name="forward"
label="Strand:"
defaultValue={true}
/>
<ReactSelectField
inlineLabel
tooltipError
defaultValue="misc_feature"
options={featureTypes.map(type => {
return {
label: (
<div
style={{
display: "flex",
alignItems: "center",
marginRight: 10
}}
>
<div
style={{
background: featureColors[type],
height: 15,
width: 15,
marginRight: 5
}}
/>
{type}
</div>
),
value: type
};
})}
name="type"
label="Type:"
/>
{(!locations || locations.length < 2) && (
<React.Fragment>
<NumericInputField
inlineLabel
tooltipError
defaultValue={1}
min={1}
max={sequenceLength || 1}
name="start"
label="Start:"
>>>>>>>
<<<<<<<
{type}
</div>
),
value: type
};
})}
name="type"
label="Type:"
/>
);
export default AddOrEditAnnotationDialog({
formName: "AddOrEditFeatureDialog",
dialogProps: {
=======
<NumericInputField
inlineLabel
tooltipError
defaultValue={1}
min={1}
max={sequenceLength || 1}
name="end"
label="End:"
/>
</React.Fragment>
)}
<FieldArray component={this.renderLocations} name="locations" />
<TextareaField
inlineLabel
tooltipError
name="notes"
label="Notes:"
format={v => {
let toReturn = v;
if (typeof v !== "string" && v) {
toReturn = "";
Object.keys(v).forEach(key => {
let stringVal;
try {
stringVal = JSON.stringify(v[key]);
} catch (e) {
stringVal = v[key];
}
toReturn += `- ${key}: ${stringVal} \n`;
});
}
return toReturn;
}}
placeholder="Enter notes here.."
/>
<div
style={{ display: "flex", justifyContent: "flex-end" }}
className="width100"
>
<Button
style={{ marginRight: 15 }}
onMouseDown={e => {
//use onMouseDown to prevent issues with redux form errors popping in and stopping the dialog from closing
e.preventDefault();
e.stopPropagation();
hideModal();
}}
>
Cancel
</Button>
<Button
onClick={handleSubmit(data => {
let updatedData;
if (data.forward === true && data.strand !== 1) {
updatedData = { ...data, strand: 1 };
} else if (data.forward === false && data.strand !== -1) {
updatedData = { ...data, strand: -1 };
} else {
updatedData = data;
}
const hasJoinedLocations =
updatedData.locations && updatedData.locations.length > 1;
const newFeat = tidyUpAnnotation(
convertRangeTo0Based({
...updatedData,
locations: undefined, //by default clear locations
...(hasJoinedLocations && {
//only add locations if there are locations
start: updatedData.locations[0].start, //override the start and end to use the start and end of the joined locations
end:
updatedData.locations[updatedData.locations.length - 1]
.end,
locations: updatedData.locations.map(convertRangeTo0Based)
})
}),
{
sequenceData,
annotationType: "features"
}
);
upsertFeature(newFeat);
hideModal();
})}
intent={Intent.PRIMARY}
>
Save
</Button>
</div>
</div>
);
}
}
function required(val) {
if (!val) return "Required";
}
export default compose(
withDialog({
isDraggable: true,
>>>>>>>
{type}
</div>
),
value: type
};
})}
name="type"
label="Type:"
/>
);
export default AddOrEditAnnotationDialog({
formName: "AddOrEditFeatureDialog",
dialogProps: { |
<<<<<<<
=======
=======
// edit only actions
>>>>>>>
// edit only actions
<<<<<<<
]),
=======
]),
toggleSequenceCase: [
a.toggleSequenceCase
],
>>>>>>>
]),
// sl: in progress
sequenceDataInserted: a.addEditModeOnly([
// a.getData('selectionLayer', 'sequenceLength', 'sequenceData'),
a.checkLayerIsSelected, {
selected: [a.deleteSequence],
notSelected: [a.getData('caretPosition')]
},
a.insertSequenceData,
// a.setData('caretPosition', 'sequenceData')
]),
toggleSequenceCase: [
a.toggleSequenceCase
], |
<<<<<<<
window.tgCreateMenu = showContextMenu;
=======
require("typeface-ubuntu-mono");
window.tgCreateMenu = createMenu;
>>>>>>>
window.tgCreateMenu = showContextMenu;
require("typeface-ubuntu-mono"); |
<<<<<<<
from: {
min: 1,
max: divideBy3(props.sequenceLength, props.sequenceData.isProtein)
},
to: {
min: 1,
max: divideBy3(props.sequenceLength, props.sequenceData.isProtein)
}
=======
from: { min: 1, max: props.sequenceLength || 1 },
to: { min: 1, max: props.sequenceLength || 1 }
>>>>>>>
from: {
min: 1,
max: divideBy3(
props.sequenceLength || 1,
props.sequenceData.isProtein || 1
)
},
to: {
min: 1,
max: divideBy3(
props.sequenceLength || 1,
props.sequenceData.isProtein || 1
)
}
<<<<<<<
isHidden: props => props.readOnly || props.sequenceData.isProtein,
=======
isHidden: props => props.readOnly,
>>>>>>>
isHidden: props => props.readOnly || props.sequenceData.isProtein,
<<<<<<<
isHidden: props => props.readOnly || props.sequenceData.isProtein,
isDisabled: props => props.readOnly && readOnlyDisabledTooltip,
=======
isHidden: props => props.readOnly,
isDisabled: props =>
(props.readOnly && readOnlyDisabledTooltip) || props.sequenceLength === 0,
>>>>>>>
isHidden: props => props.readOnly || props.sequenceData.isProtein,
isDisabled: props =>
(props.readOnly && readOnlyDisabledTooltip) || props.sequenceLength === 0, |
<<<<<<<
import _EnzymesDialog from "../helperComponents/EnzymesDialog";
const EnzymesDialog = withDialog({
title: "Manage Enzymes",
// isOpen: true,
isDraggable: true,
height: 500,
width: 500
})(_EnzymesDialog);
// const ManageEnzymes = withDialog({
// title: "Manage Enzymes",
=======
import { userDefinedHandlersAndOpts } from "../Editor/userDefinedHandlersAndOpts";
import { pick } from "lodash";
>>>>>>>
import { userDefinedHandlersAndOpts } from "../Editor/userDefinedHandlersAndOpts";
import { pick } from "lodash";
import _EnzymesDialog from "../helperComponents/EnzymesDialog";
const EnzymesDialog = withDialog({
title: "Manage Enzymes",
// isOpen: true,
isDraggable: true,
height: 500,
width: 500
})(_EnzymesDialog); |
<<<<<<<
name: "Manage Enzymes",
handler: props => {
props.createYourOwnEnzymeReset();
props.showManageEnzymesDialog({
=======
name: "Add Additional Enzymes",
handler: (props) =>
props.addAdditionalEnzymesReset({
>>>>>>>
name: "Manage Enzymes",
handler: (props) => {
props.createYourOwnEnzymeReset();
props.showManageEnzymesDialog({
<<<<<<<
: ""
});
},
isHidden: props => isProtein(props)
},
openFilterCutsites: {
name: "Filter Cutsites",
handler: props => {
props.openToolbarItemUpdate("cutsiteTool");
},
isHidden: props => isProtein(props)
=======
: "",
isOpen: true
}),
isHidden: (props) => isProtein(props)
>>>>>>>
: ""
});
},
isHidden: (props) => isProtein(props)
},
openFilterCutsites: {
name: "Filter Cutsites",
handler: (props) => {
props.openToolbarItemUpdate("cutsiteTool");
},
isHidden: (props) => isProtein(props) |
<<<<<<<
export { default as ResponsiveArticle } from './ResponsiveArticle'
=======
export { default as BootstrapCardDataTable } from './BootstrapCardDataTable'
>>>>>>>
export { default as ResponsiveArticle } from './ResponsiveArticle'
export { default as BootstrapCardDataTable } from './BootstrapCardDataTable' |
<<<<<<<
db: {
uri: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean',
options: {
user: '',
pass: ''
}
},
log: {
// Can specify one of 'combined', 'common', 'dev', 'short', 'tiny'
format: 'combined',
// Stream defaults to process.stdout
// Uncomment to enable logging to a log on the file system
options: {
stream: 'access.log'
}
},
assets: {
lib: {
css: [
'public/lib/bootstrap/dist/css/bootstrap.min.css',
'public/lib/bootstrap/dist/css/bootstrap-theme.min.css',
],
js: [
'public/lib/angular/angular.min.js',
'public/lib/angular-resource/angular-resource.min.js',
'public/lib/angular-animate/angular-animate.min.js',
'public/lib/angular-ui-router/release/angular-ui-router.min.js',
'public/lib/angular-ui-utils/ui-utils.min.js',
'public/lib/angular-bootstrap/ui-bootstrap-tpls.min.js'
]
},
css: 'public/dist/application.min.css',
js: 'public/dist/application.min.js'
},
facebook: {
clientID: process.env.FACEBOOK_ID || 'APP_ID',
clientSecret: process.env.FACEBOOK_SECRET || 'APP_SECRET',
callbackURL: '/auth/facebook/callback'
},
twitter: {
clientID: process.env.TWITTER_KEY || 'CONSUMER_KEY',
clientSecret: process.env.TWITTER_SECRET || 'CONSUMER_SECRET',
callbackURL: '/auth/twitter/callback'
},
google: {
clientID: process.env.GOOGLE_ID || 'APP_ID',
clientSecret: process.env.GOOGLE_SECRET || 'APP_SECRET',
callbackURL: '/auth/google/callback'
},
linkedin: {
clientID: process.env.LINKEDIN_ID || 'APP_ID',
clientSecret: process.env.LINKEDIN_SECRET || 'APP_SECRET',
callbackURL: '/auth/linkedin/callback'
},
github: {
clientID: process.env.GITHUB_ID || 'APP_ID',
clientSecret: process.env.GITHUB_SECRET || 'APP_SECRET',
callbackURL: '/auth/github/callback'
},
mailer: {
from: process.env.MAILER_FROM || 'MAILER_FROM',
options: {
service: process.env.MAILER_SERVICE_PROVIDER || 'MAILER_SERVICE_PROVIDER',
auth: {
user: process.env.MAILER_EMAIL_ID || 'MAILER_EMAIL_ID',
pass: process.env.MAILER_PASSWORD || 'MAILER_PASSWORD'
}
}
}
=======
secure: true,
port: process.env.PORT || 8443,
db: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean',
facebook: {
clientID: process.env.FACEBOOK_ID || 'APP_ID',
clientSecret: process.env.FACEBOOK_SECRET || 'APP_SECRET',
callbackURL: '/api/auth/facebook/callback'
},
twitter: {
clientID: process.env.TWITTER_KEY || 'CONSUMER_KEY',
clientSecret: process.env.TWITTER_SECRET || 'CONSUMER_SECRET',
callbackURL: '/api/auth/twitter/callback'
},
google: {
clientID: process.env.GOOGLE_ID || 'APP_ID',
clientSecret: process.env.GOOGLE_SECRET || 'APP_SECRET',
callbackURL: '/api/auth/google/callback'
},
linkedin: {
clientID: process.env.LINKEDIN_ID || 'APP_ID',
clientSecret: process.env.LINKEDIN_SECRET || 'APP_SECRET',
callbackURL: '/api/auth/linkedin/callback'
},
github: {
clientID: process.env.GITHUB_ID || 'APP_ID',
clientSecret: process.env.GITHUB_SECRET || 'APP_SECRET',
callbackURL: '/api/auth/github/callback'
},
mailer: {
from: process.env.MAILER_FROM || 'MAILER_FROM',
options: {
service: process.env.MAILER_SERVICE_PROVIDER || 'MAILER_SERVICE_PROVIDER',
auth: {
user: process.env.MAILER_EMAIL_ID || 'MAILER_EMAIL_ID',
pass: process.env.MAILER_PASSWORD || 'MAILER_PASSWORD'
}
}
}
>>>>>>>
secure: true,
port: process.env.PORT || 8443,
db: {
uri: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean',
options: {
user: '',
pass: ''
}
},
log: {
// Can specify one of 'combined', 'common', 'dev', 'short', 'tiny'
format: 'combined',
// Stream defaults to process.stdout
// Uncomment to enable logging to a log on the file system
options: {
stream: 'access.log'
}
},
assets: {
lib: {
css: [
'public/lib/bootstrap/dist/css/bootstrap.min.css',
'public/lib/bootstrap/dist/css/bootstrap-theme.min.css',
],
js: [
'public/lib/angular/angular.min.js',
'public/lib/angular-resource/angular-resource.min.js',
'public/lib/angular-animate/angular-animate.min.js',
'public/lib/angular-ui-router/release/angular-ui-router.min.js',
'public/lib/angular-ui-utils/ui-utils.min.js',
'public/lib/angular-bootstrap/ui-bootstrap-tpls.min.js'
]
},
css: 'public/dist/application.min.css',
js: 'public/dist/application.min.js'
},
facebook: {
clientID: process.env.FACEBOOK_ID || 'APP_ID',
clientSecret: process.env.FACEBOOK_SECRET || 'APP_SECRET',
callbackURL: '/api/auth/facebook/callback'
},
twitter: {
clientID: process.env.TWITTER_KEY || 'CONSUMER_KEY',
clientSecret: process.env.TWITTER_SECRET || 'CONSUMER_SECRET',
callbackURL: '/api/auth/twitter/callback'
},
google: {
clientID: process.env.GOOGLE_ID || 'APP_ID',
clientSecret: process.env.GOOGLE_SECRET || 'APP_SECRET',
callbackURL: '/api/auth/google/callback'
},
linkedin: {
clientID: process.env.LINKEDIN_ID || 'APP_ID',
clientSecret: process.env.LINKEDIN_SECRET || 'APP_SECRET',
callbackURL: '/api/auth/linkedin/callback'
},
github: {
clientID: process.env.GITHUB_ID || 'APP_ID',
clientSecret: process.env.GITHUB_SECRET || 'APP_SECRET',
callbackURL: '/api/auth/github/callback'
},
mailer: {
from: process.env.MAILER_FROM || 'MAILER_FROM',
options: {
service: process.env.MAILER_SERVICE_PROVIDER || 'MAILER_SERVICE_PROVIDER',
auth: {
user: process.env.MAILER_EMAIL_ID || 'MAILER_EMAIL_ID',
pass: process.env.MAILER_PASSWORD || 'MAILER_PASSWORD'
}
}
} |
<<<<<<<
},
mailer: {
from: process.env.MAILER_FROM || 'MAILER_FROM',
options: {
service: process.env.MAILER_SERVICE_PROVIDER || 'MAILER_SERVICE_PROVIDER',
auth: {
user: process.env.MAILER_EMAIL_ID || 'MAILER_EMAIL_ID',
pass: process.env.MAILER_PASSWORD || 'MAILER_PASSWORD'
}
}
}
=======
},
github: {
clientID: process.env.GITHUB_ID || 'APP_ID',
clientSecret: process.env.GITHUB_SECRET || 'APP_SECRET',
callbackURL: 'http://localhost:3000/auth/github/callback'
}
>>>>>>>
},
github: {
clientID: process.env.GITHUB_ID || 'APP_ID',
clientSecret: process.env.GITHUB_SECRET || 'APP_SECRET',
callbackURL: 'http://localhost:3000/auth/github/callback'
},
mailer: {
from: process.env.MAILER_FROM || 'MAILER_FROM',
options: {
service: process.env.MAILER_SERVICE_PROVIDER || 'MAILER_SERVICE_PROVIDER',
auth: {
user: process.env.MAILER_EMAIL_ID || 'MAILER_EMAIL_ID',
pass: process.env.MAILER_PASSWORD || 'MAILER_PASSWORD'
}
}
} |
<<<<<<<
testSQLite('promise', [
'CREATE TABLE users(id INTEGER PRIMARY KEY AUTOINCREMENT, login TEXT, email TEXT, created_at TEXT)',
'INSERT INTO users(login, email, created_at) VALUES("phil", "[email protected]", "2014-01-05"), ("michl", "[email protected]", "2014-01-10"), ("admin", "[email protected]", "2014-01-01")'
]);
=======
testSQLite('select', [
'CREATE TABLE users(id INTEGER PRIMARY KEY AUTOINCREMENT, login TEXT, email TEXT, created_at TEXT)',
'CREATE TABLE posts(id INTEGER PRIMARY KEY AUTOINCREMENT, user_id INTEGER, thread_id INTEGER, message TEXT)',
'CREATE TABLE threads(id INTEGER PRIMARY KEY AUTOINCREMENT, user_id INTEGER, title TEXT)',
'INSERT INTO users(login, email, created_at) VALUES("phil", "[email protected]", "2014-01-05"), ("michl", "[email protected]", "2014-01-10"), ("admin", "[email protected]", "2014-01-01"), ("administrator", "[email protected]", "2014-01-01")',
'INSERT INTO posts(user_id, thread_id, message) VALUES(1, 1, "first message"), (1, 1, "second"), (1, 2, "third"), (2, 1, "michls post")',
'INSERT INTO threads(user_id, title) VALUES(2, "first thread"), (1, "second thread")'
]);
>>>>>>>
testSQLite('promise', [
'CREATE TABLE users(id INTEGER PRIMARY KEY AUTOINCREMENT, login TEXT, email TEXT, created_at TEXT)',
'INSERT INTO users(login, email, created_at) VALUES("phil", "[email protected]", "2014-01-05"), ("michl", "[email protected]", "2014-01-10"), ("admin", "[email protected]", "2014-01-01")'
]);
testSQLite('select', [
'CREATE TABLE users(id INTEGER PRIMARY KEY AUTOINCREMENT, login TEXT, email TEXT, created_at TEXT)',
'CREATE TABLE posts(id INTEGER PRIMARY KEY AUTOINCREMENT, user_id INTEGER, thread_id INTEGER, message TEXT)',
'CREATE TABLE threads(id INTEGER PRIMARY KEY AUTOINCREMENT, user_id INTEGER, title TEXT)',
'INSERT INTO users(login, email, created_at) VALUES("phil", "[email protected]", "2014-01-05"), ("michl", "[email protected]", "2014-01-10"), ("admin", "[email protected]", "2014-01-01"), ("administrator", "[email protected]", "2014-01-01")',
'INSERT INTO posts(user_id, thread_id, message) VALUES(1, 1, "first message"), (1, 1, "second"), (1, 2, "third"), (2, 1, "michls post")',
'INSERT INTO threads(user_id, title) VALUES(2, "first thread"), (1, "second thread")'
]); |
<<<<<<<
className,
=======
scrollable,
>>>>>>>
className,
scrollable, |
<<<<<<<
searchAttributes: process.env.HMD_LDAP_SEARCHATTRIBUTES,
usernameField: process.env.HMD_LDAP_USERNAMEFIELD,
=======
searchAttributes: toArrayConfig(process.env.HMD_LDAP_SEARCHATTRIBUTES),
>>>>>>>
searchAttributes: toArrayConfig(process.env.HMD_LDAP_SEARCHATTRIBUTES),
usernameField: process.env.HMD_LDAP_USERNAMEFIELD, |
<<<<<<<
const externals = await getExternals(config)
const manifest = await getManifest(env, config, externals)
=======
>>>>>>> |
<<<<<<<
// pull in source items if one exists
if (metaData.source) {
const source = await walkSource(config.temp, hoistedItem.path, metaData)
const sourceHydrated = await _recursive(source, hydratedItem)
// don't inherit these items from the source
delete sourceHydrated.path
delete sourceHydrated.title
// replace current item data with the source data
Object.assign(hydratedItem, sourceHydrated)
// don't register the url when there is a source (since item gets replaced)
} else {
// url is now taken, like most women
urls[hydratedItem.url] = hoistedItem.path
}
=======
// url is now taken, like most women
urls[hydratedItem.url] = hoistedItem.path
// add url to the sitemap
const fullUrl = `${config.domain}${hydratedItem.url}`
sitemap.addUrl(fullUrl, metaData.sitemap)
hydratedItem.input = metaData.input || hoistedItem.path
hydratedItem.outputDir = syspath.join(
config.output,
hydratedItem.url,
)
>>>>>>>
// pull in source items if one exists
if (metaData.source) {
const source = await walkSource(config.temp, hoistedItem.path, metaData)
const sourceHydrated = await _recursive(source, hydratedItem)
// don't inherit these items from the source
delete sourceHydrated.path
delete sourceHydrated.title
// replace current item data with the source data
Object.assign(hydratedItem, sourceHydrated)
// don't register the url when there is a source (since item gets replaced)
} else {
// url is now taken, like most women
urls[hydratedItem.url] = hoistedItem.path
// add url to the sitemap
const fullUrl = `${config.domain}${hydratedItem.url}`
sitemap.addUrl(fullUrl, metaData.sitemap)
} |
<<<<<<<
=======
this.state = {
selected: this.props.value || 'tab-1'
};
>>>>>>>
<<<<<<<
if (value !== undefined) {
this.setState({
selected: value
});
}
=======
this.setState({
selected: value
});
>>>>>>>
if (value !== undefined) {
this.setState({
selected: value
});
} |
<<<<<<<
dismissModal,
showModal,
setUnreadPost,
=======
>>>>>>>
setUnreadPost, |
<<<<<<<
$ViewDirective.$inject = ['$state', '$view', '$injector', '$uiViewScroll'];
function $ViewDirective( $state, $view, $injector, $uiViewScroll) {
var views = {};
=======
$ViewDirective.$inject = ['$state', '$injector', '$uiViewScroll', '$interpolate'];
function $ViewDirective( $state, $injector, $uiViewScroll, $interpolate) {
>>>>>>>
$ViewDirective.$inject = ['$state', '$view', '$injector', '$uiViewScroll', '$interpolate'];
function $ViewDirective( $state, $view, $injector, $uiViewScroll, $interpolate) {
var views = {};
<<<<<<<
name = getUiViewName(attrs, $element.inheritedData('$uiView')),
previousLocals = viewConfig && viewConfig.locals;
=======
name = getUiViewName(scope, attrs, $element, $interpolate),
previousLocals = name && $state.$current && $state.$current.locals[name];
>>>>>>>
name = getUiViewName(scope, attrs, $element, $interpolate),
previousLocals = viewConfig && viewConfig.locals;
<<<<<<<
=======
return function (scope, $element, attrs) {
var current = $state.$current,
name = getUiViewName(scope, attrs, $element, $interpolate),
locals = current && current.locals[name];
>>>>>>> |
<<<<<<<
{ test: /\.(eot|woff|woff2|ttf|svg|gif|ico|png|jpe?g)$/, loader: 'file-loader?name=img/[name].[ext]' },
{ test: /(browserconfig.xml|manifest.json)$/, loader: 'file-loader?name=img/[name].[ext]' }, // favicon related items
{ test: /\.md$/, loader: "raw-loader" }
=======
{ test: /\.(eot|woff|woff2|ttf|svg|gif|png|jpe?g)$/, loader: 'file-loader?name=img/[name].[ext]' },
{ test: /\.md|\.json$/, loader: "raw-loader" }
>>>>>>>
{ test: /\.(eot|woff|woff2|ttf|svg|gif|ico|png|jpe?g)$/, loader: 'file-loader?name=img/[name].[ext]' },
{ test: /(browserconfig.xml|manifest.json)$/, loader: 'file-loader?name=img/[name].[ext]' }, // favicon related items
{ test: /\.md|\.json$/, loader: "raw-loader" } |
<<<<<<<
quiet: false,
stats: {
assets: true,
colors: true,
version: false,
hash: false,
timings: false,
chunks: false,
chunkModules: false
},
// Set to false to display a list of each file that is being bundled.
noInfo: true
=======
// // pretty colored output
// stats: { colors: true },
// // Set to false to display a list of each file that is being bundled.
// noInfo: true
noInfo: false,
quiet: false,
stats: {
assets: false,
colors: true,
version: false,
hash: false,
timings: false,
chunks: false,
chunkModules: false
}
>>>>>>>
noInfo: true,
quiet: false,
stats: {
assets: true,
colors: true,
version: false,
hash: false,
timings: false,
chunks: false,
chunkModules: false
} |
<<<<<<<
state = disableMeasuring(state, action);
=======
action.delayClickEnable = false;
>>>>>>>
action.delayClickEnable = false;
state = disableMeasuring(state, action); |
<<<<<<<
export const CATS_TILE_OL = 'catsTile_OL';
export const CATS_TILE_CS = 'catsTile_CS';
=======
export const BASIC_INTERCEPT = 'BASIC_INTERCEPT';
// drawing shape types
export const SHAPE_POINT = 'Point';
export const SHAPE_CIRCLE = 'Circle';
export const SHAPE_LINE_STRING = 'LineString';
>>>>>>>
export const CATS_TILE_OL = 'catsTile_OL';
export const CATS_TILE_CS = 'catsTile_CS';
// drawing shape types
export const SHAPE_POINT = 'Point';
export const SHAPE_CIRCLE = 'Circle';
export const SHAPE_LINE_STRING = 'LineString'; |
<<<<<<<
module.exports = function testSchema(exportCasesHere, schema) {
=======
function clearAndCreate(model, data, callback) {
var createdItems = [];
model.destroyAll(function () {
nextItem(null, null);
});
var itemIndex = 0;
function nextItem(err, lastItem) {
if (lastItem !== null) {
createdItems.push(lastItem);
}
if (itemIndex >= data.length) {
callback(createdItems);
return;
}
model.create(data[itemIndex], nextItem);
itemIndex++;
}
}
function performTestFor(schemaName) {
testPerformed = true;
context(schemaName, function () {
var schema = new Schema(schemaName, schemas[schemaName] || {});
>>>>>>>
module.exports = function testSchema(exportCasesHere, schema) {
<<<<<<<
=======
if (
!schema.name.match(/redis/) &&
schema.name !== 'memory' &&
schema.name !== 'neo4j' &&
schema.name !== 'cradle' &&
schema.name !== 'mongodb'
)
>>>>>>> |
<<<<<<<
// A regular expression that can be used to match and validate an email address
var REGEX_EMAIL = /^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/;
=======
// Regex used to validate a url
var urlRegex = /^(https?|s?ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i;
>>>>>>>
// A regular expression that can be used to match and validate an email address
var REGEX_EMAIL = /^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/;
// Regex used to validate a url
var REGEX_URL = /^(https?|s?ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i;
<<<<<<<
/**
* Check whether a provided string is a valid email
*
* @param {String} email The string to check
* @return {Boolean} `true` when the email is valid, `false` otherwise
*/
var isValidEmail = function(email) {
if (!email) {
return false;
}
return REGEX_EMAIL.test(email);
};
=======
/**
* Check whether a provided string is a valid host
*
* @param {String} host The host to check
* @return {Boolean} `true` when the host is valid, `false` otherwise
*/
var isValidHost = function(host) {
if (!host) {
return false;
}
// Since a host shouldn't include include the scheme, prepend a scheme and simply run
// it against the URL validator
return urlRegex.test('http://' + host);
};
>>>>>>>
/**
* Check whether a provided string is a valid email
*
* @param {String} email The string to check
* @return {Boolean} `true` when the email is valid, `false` otherwise
*/
var isValidEmail = function(email) {
if (!email) {
return false;
}
return REGEX_EMAIL.test(email);
};
/**
* Check whether a provided string is a valid host
*
* @param {String} host The host to check
* @return {Boolean} `true` when the host is valid, `false` otherwise
*/
var isValidHost = function(host) {
if (!host) {
return false;
}
// Since a host shouldn't include include the scheme, prepend a scheme and simply run
// it against the URL validator
return REGEX_URL.test('http://' + host);
};
<<<<<<<
'isValidEmail': isValidEmail,
=======
'isValidHost': isValidHost,
>>>>>>>
'isValidEmail': isValidEmail,
'isValidHost': isValidHost,
<<<<<<<
// If there are no search results and the query is an email address, present an
// option for the user to have the email address as an option
if (options.allowEmail && isValidEmail && _.isEmpty(data.results)) {
data.results.push({
'id': query,
'displayName': query,
'query': query,
'resourceType': 'email'
});
}
=======
>>>>>>>
// If there are no search results and the query is an email address, present an
// option for the user to have the email address as an option
if (options.allowEmail && isValidEmail && _.isEmpty(data.results)) {
data.results.push({
'id': query,
'displayName': query,
'query': query,
'resourceType': 'email'
});
} |
<<<<<<<
oae.api.user.getPendingEmailVerification(function(err, email) {
// Ignore issues checking for a pending email verification, as there being no
// pending verification is the 99.999% use-case and we wouldn't want to annoy
// uninterested users with an error notification or anything
unverifiedEmail = email;
// Render the form elements
oae.api.util.template().render($('#editprofile-template', $rootel), {
'unverifiedEmail': unverifiedEmail
}, $('#editprofile-container', $rootel));
// Initialize jQuery validate on the form
var validateOpts = {
'submitHandler': editProfile
};
oae.api.util.validation().validate($('#editprofile-form', $rootel), validateOpts);
});
=======
// Render the form elements
oae.api.util.template().render($('#editprofile-template', $rootel), null, $('.modal-body', $rootel));
// Initialize jQuery validate on the form
var validateOpts = {
'submitHandler': editProfile,
'methods': {
'displayname': {
'method': oae.api.util.validation().isValidDisplayName,
'text': oae.api.i18n.translate('__MSG__PLEASE_ENTER_A_VALID_NAME__')
}
}
};
oae.api.util.validation().validate($('#editprofile-form', $rootel), validateOpts);
>>>>>>>
oae.api.user.getPendingEmailVerification(function(err, email) {
// Ignore issues checking for a pending email verification, as there being no
// pending verification is the 99.999% use-case and we wouldn't want to annoy
// uninterested users with an error notification or anything
unverifiedEmail = email;
// Render the form elements
oae.api.util.template().render($('#editprofile-template', $rootel), {
'unverifiedEmail': unverifiedEmail
}, $('#editprofile-container', $rootel));
// Initialize jQuery validate on the form
var validateOpts = {
'submitHandler': editProfile,
'methods': {
'displayname': {
'method': oae.api.util.validation().isValidDisplayName,
'text': oae.api.i18n.translate('__MSG__PLEASE_ENTER_A_VALID_NAME__')
}
}
};
oae.api.util.validation().validate($('#editprofile-form', $rootel), validateOpts);
}); |
<<<<<<<
$rootel.on('click', '.s3d-actions-delete', function() {
$('#contacts_contact_to_delete').text($(this).data('sakai-entityname'));
$('#contacts_delete_contact_confirm').data('sakai-entityid', $(this).data('sakai-entityid'));
=======
$(".s3d-actions-delete", $rootel).live("click", function(){
$("#contacts_contact_to_delete").text($(this).data("sakai-entityname"));
$('#contacts_delete_contact_confirm').attr('data-sakai-entityid', $(this).attr('data-sakai-entityid'));
>>>>>>>
$rootel.on('click', '.s3d-actions-delete', function() {
$('#contacts_contact_to_delete').text($(this).data('sakai-entityname'));
$('#contacts_delete_contact_confirm').attr('data-sakai-entityid', $(this).attr('data-sakai-entityid'));
<<<<<<<
$(document).on('click', '#contacts_delete_contact_confirm', function() {
removeRequest($(this).data('sakai-entityid'));
=======
$("#contacts_delete_contact_confirm").live("click", function(){
removeRequest($(this).attr('data-sakai-entityid'));
>>>>>>>
$(document).on('click', '#contacts_delete_contact_confirm', function() {
removeRequest($(this).attr('data-sakai-entityid')); |
<<<<<<<
let INFO = xml`
<plugin name="link-opener" version="2.3.2"
=======
let INFO =
<>
<plugin name="link-opener" version="2.4.0"
>>>>>>>
let INFO = xml`
<plugin name="link-opener" version="2.4.0" |
<<<<<<<
sharecontentEditPermissionsLink = $("#sharecontent_edit_permission");
sharecontentEditPermissionsLink.css("width", $(this).width() + 11 + "px");
sharecontentEditPermissionsLink.css("left",$(this).position().left + 2 + "px");
sharecontentEditPermissionsLink.css("top",$(this).position().top + 21 + "px");
sharecontentEditPermissionsLink.toggle();
});
=======
>>>>>>>
<<<<<<<
if (changeTo === "viewer") {
if ($sharecontentSelectedSharerSpan.html() !== $(sharecontentCanView).html()) {
if (sakai.content_profile.content_data.members.managers.length <= 1) {
// do not allow the last manager to become a viewer
sakai.api.Util.notification.show(
$sharecontentManagerCouldNotBeRemoved.text(),
$sharecontentThereShouldBeAtLeastOneManager.text());
} else {
// there is more than one manager; OK to become viewer
$sharecontentSelectedSharerSpan.html($(sharecontentCanView).html());
if (sharecontentSelectedSharer !== "") {
changePermission(sharecontentSelectedSharer, changeTo);
} else {
$(sharecontentNewMembersPermissions).val("viewer");
}
=======
if (changeTo === "viewer") {
if ($sharecontentSelectedSharerSpan.html() !== $(sharecontentCanView).html()) {
$sharecontentSelectedSharerSpan.html($(sharecontentCanView).html());
if (sharecontentSelectedSharer !== "") {
changePermission(sharecontentSelectedSharer, changeTo);
} else {
$(sharecontentNewMembersPermissions).val("viewer");
}
>>>>>>>
if (changeTo === "viewer") {
if ($sharecontentSelectedSharerSpan.html() !== $(sharecontentCanView).html()) {
if (sakai.content_profile.content_data.members.managers.length <= 1) {
// do not allow the last manager to become a viewer
sakai.api.Util.notification.show(
$sharecontentManagerCouldNotBeRemoved.text(),
$sharecontentThereShouldBeAtLeastOneManager.text());
} else {
// there is more than one manager; OK to become viewer
$sharecontentSelectedSharerSpan.html($(sharecontentCanView).html());
if (sharecontentSelectedSharer !== "") {
changePermission(sharecontentSelectedSharer, changeTo);
} else {
$(sharecontentNewMembersPermissions).val("viewer");
}
}
<<<<<<<
$(document).bind("click", function(e) {
var $target = $(e.target);
if (!$target.hasClass("sharecontent_permission_link") &&
!$target.hasClass("s3d-button-link-2-state-inner") &&
!$target.hasClass("sharecontent_permission")) {
if($(sharecontentEditPermissionsLink).is(":visible")) {
$(sharecontentEditPermissionsLink).hide();
=======
$(document).bind("click", function(e){
if (!$(e.target).is(".sharecontent_edit_permission") && !$(e.target).is(sharecontentPermissionsLink)) {
if($(sharecontentEditPermissionsLink).is(":visible")){
$(sharecontentEditPermissionsLink).toggle();
}
>>>>>>>
$(document).bind("click", function(e) {
var $target = $(e.target);
if (!$target.hasClass("sharecontent_permission_link") &&
!$target.hasClass("s3d-button-link-2-state-inner") &&
!$target.hasClass("sharecontent_permission")) {
if($(sharecontentEditPermissionsLink).is(":visible")) {
$(sharecontentEditPermissionsLink).hide();
} |
<<<<<<<
oae.api.admin.getTenants(function(err, tenants) {
allTenants = tenants;
// Check if we're currently on a user admin on the global admin tenant. In that
// case, the URL should be /tenant/<tenantAlias>
var tenantAlias = oae.api.util.url().segment(2);
if (tenantAlias) {
currentContext = allTenants[tenantAlias];
=======
// Check if we're currently on a user admin on the global admin tenant. In that
// case, the URL should be /tenant/<tenantAlias>
var tenantAlias = $.url().segment(2);
if (tenantAlias) {
oae.api.admin.getTenant(tenantAlias, function(err, data) {
currentContext = data;
>>>>>>>
// Check if we're currently on a user admin on the global admin tenant. In that
// case, the URL should be /tenant/<tenantAlias>
var tenantAlias = oae.api.util.url().segment(2);
if (tenantAlias) {
oae.api.admin.getTenant(tenantAlias, function(err, data) {
currentContext = data; |
<<<<<<<
"participants",
=======
"personinfo",
>>>>>>>
"participants",
"personinfo", |
<<<<<<<
comment.timeAgo = "about " + getTimeAgo(comment.date) + " "+sakai.api.i18n.General.getValueForKey("AGO");
comment.formatDate = formatDate(comment.date);
=======
comment.timeAgo = "about " + getTimeAgo(comment.date) + " ago";
comment.formatDate = sakai.api.l10n.transformDateTimeShort(comment.date);
>>>>>>>
comment.timeAgo = "about " + getTimeAgo(comment.date) + " "+sakai.api.i18n.General.getValueForKey("AGO");
comment.formatDate = sakai.api.l10n.transformDateTimeShort(comment.date); |
<<<<<<<
oae.api.content.deleteComment(contentProfile.id, commentId, function(err, deleted) {
=======
oae.api.content.deleteComment(contentProfile.contentId, commentId, function(err, softDeleted) {
>>>>>>>
oae.api.content.deleteComment(contentProfile.id, commentId, function(err, softDeleted) { |
<<<<<<<
var resultsToDisplay = 12;
var rootel = $("#" + tuid);
var refineBy = "";
=======
var $rootel = $("#" + tuid);
>>>>>>>
var $rootel = $("#" + tuid);
var refineBy = "";
<<<<<<<
var pager_click_handler = function(pageclickednumber){
$.bbq.pushState({
"q": $(searchConfig.global.text).val(),
"page": pageclickednumber,
"refine": refineBy
}, 0);
};
var renderResults = function(results, success){
var params = sakai_global.data.search.getQueryParams();
var finaljson = {};
finaljson.items = [];
if (success) {
// Adjust display global total
$(searchConfig.global.numberFound, rootel).text("" + results.total);
// Reset the pager.
$(searchConfig.global.pagerClass, rootel).pager({
pagenumber: params["page"],
pagecount: Math.ceil(Math.abs(results.total) / resultsToDisplay),
buttonClickCallback: pager_click_handler
});
var userArray = [];
var fetchUsers = false;
// If we have results we add them to the object.
if (results && results.results) {
finaljson = sakai_global.data.search.prepareCMforRender(results.results, finaljson);
finaljson = sakai_global.data.search.prepareGroupsForRender(results.results, finaljson);
finaljson = sakai_global.data.search.preparePeopleForRender(results.results, finaljson);
for (var item in finaljson.items) {
if (finaljson.items.hasOwnProperty(item)) {
// if the content has an owner we need to add their ID to an array,
// so we can lookup the users display name in a batch req
if (finaljson.items[item]["sakai:pool-content-created-for"]) {
userArray.push(finaljson.items[item]["sakai:pool-content-created-for"]);
fetchUsers = true;
}
}
}
}
// if we're searching tags we need to hide the pager since it doesnt work too well
if (!results.total) {
results.total = resultsToDisplay;
}
// We hide the pager if we don't have any results or
// they are less then the number we should display
results.total = Math.abs(results.total);
if (results.total > resultsToDisplay) {
$(searchConfig.global.pagerClass, rootel).show();
} else {
$(searchConfig.global.pagerClass, rootel).hide();
}
}
// Make the content items available to other widgets
sakai_global.searchall.content_items = finaljson.items;
// Render the results.
$(searchConfig.results.container).html(sakai.api.Util.TemplateRenderer(searchConfig.results.template, finaljson));
// Update dom with user display names
if (fetchUsers) {
sakai.api.User.getMultipleUsers(userArray, function(users){
for (u in users) {
if (users.hasOwnProperty(u)) {
setUsername(u, users);
}
}
=======
/**
* Take a list of search results retrieved by the server and process them so they are
* ready to be run through the template
* @param {Object} results List of results coming back from the infinite scroll plugin
* @param {Object} callback Callback function from the infinite scroll plugin to call
*/
var renderResults = function(results, callback){
// If we have results we add them to the object.
if (results && results.length) {
sakai_global.data.search.prepareCMforRender(results, function(_results){
results = _results;
results = sakai_global.data.search.prepareGroupsForRender(results);
results = sakai_global.data.search.preparePeopleForRender(results);
callback(results);
>>>>>>>
/**
* Take a list of search results retrieved by the server and process them so they are
* ready to be run through the template
* @param {Object} results List of results coming back from the infinite scroll plugin
* @param {Object} callback Callback function from the infinite scroll plugin to call
*/
var renderResults = function(results, callback){
// If we have results we add them to the object.
if (results && results.length) {
sakai_global.data.search.prepareCMforRender(results, function(_results){
results = _results;
results = sakai_global.data.search.prepareGroupsForRender(results);
results = sakai_global.data.search.preparePeopleForRender(results);
callback(results);
<<<<<<<
// Generate refine by tags
sakai_global.data.search.generateTagsRefineBy(results, params);
bindResultsEvents();
};
var setUsername = function(u, users) {
$(".searchcontent_result_username").each(function(index, val){
var userId = $(val).text();
if (userId === u){
$(val).html(sakai.api.User.getDisplayName(users[u]));
$(val).attr("title", sakai.api.User.getDisplayName(users[u]));
}
});
=======
>>>>>>>
<<<<<<<
"cat": "",
"page": 0,
"refine": ""
=======
"cat": ""
>>>>>>>
"cat": "",
"refine": ""
<<<<<<<
"q": $(searchConfig.global.text).val(),
"page": 0,
"refine": ""
=======
"q": $(searchConfig.global.text).val()
>>>>>>>
"q": $(searchConfig.global.text).val(),
"cat": "",
"refine": ""
<<<<<<<
"cat": "",
"page": 0,
"refine": ""
=======
"cat": ""
>>>>>>>
"cat": "",
"refine": "" |
<<<<<<<
casper.echo('Verify revisions modal', 'INFO');
contentUtil().createFile(null, null, null, function(contentURL) {
=======
casper.echo('# Verify revisions modal', 'INFO');
contentUtil().createFile(null, function(contentURL) {
>>>>>>>
casper.echo('# Verify revisions modal', 'INFO');
contentUtil().createFile(null, null, null, function(contentURL) {
<<<<<<<
casper.echo('Verify collabdoc revisions elements', 'INFO');
collabDocUtil().createCollabDoc(null, null, function(collabdoc) {
=======
casper.echo('# Verify collabdoc revisions elements', 'INFO');
collabDocUtil().createCollabDoc(function(collabdoc) {
>>>>>>>
casper.echo('# Verify collabdoc revisions elements', 'INFO');
collabDocUtil().createCollabDoc(null, null, function(collabdoc) { |
<<<<<<<
=======
tag_owned = $("#tag_owned").prop('checked');
show_friends_want = $("#show_friends_want").prop('checked');
tag_owned_color = $("#tag_owned_color").val();
show_friends_want_color = $("#show_friends_want_color").val();
>>>>>>>
<<<<<<<
=======
'show_carousel_descriptions': show_carousel_descriptions,
'tag_owned': tag_owned,
'show_friends_want': show_friends_want,
'tag_owned_color': tag_owned_color,
'show_friends_want_color': show_friends_want_color,
>>>>>>>
'show_carousel_descriptions': show_carousel_descriptions,
<<<<<<<
=======
if (settings.show_carousel_descriptions === undefined) { settings.show_carousel_descriptions = true; chrome.storage.sync.set({'show_carousel_descriptions': settings.show_carousel_descriptions}); }
if (settings.tag_owned === undefined) { settings.tag_owned = false; chrome.storage.sync.set({'tag_owned': settings.tag_owned}); }
if (settings.show_friends_want === undefined) { settings.show_friends_want = true; chrome.storage.sync.set({'show_friends_want': settings.show_friends_want}); }
if (settings.tag_owned_color === undefined) { settings.tag_owned_color = "#5c7836"; chrome.storage.sync.set({'tag_owned_color': settings.tag_owned_color}); }
if (settings.show_friends_want_color === undefined) { settings.show_friends_want_color = "#7E4060"; chrome.storage.sync.set({'show_friends_want_color': settings.show_friends_want_color}); }
>>>>>>>
if (settings.show_carousel_descriptions === undefined) { settings.show_carousel_descriptions = true; chrome.storage.sync.set({'show_carousel_descriptions': settings.show_carousel_descriptions}); }
<<<<<<<
=======
$("#tag_owned").attr('checked', settings.tag_owned);
$("#show_friends_want").attr('checked', settings.show_friends_want);
$("#tag_owned_color").attr('value', settings.tag_owned_color);
$("#show_friends_want_color").attr('value', settings.show_friends_want_color);
>>>>>>> |
<<<<<<<
title: sakai.api.i18n.getValueForKey(item.title)
})
=======
title: sakai.api.i18n.General.getValueForKey(item.title)
});
>>>>>>>
title: sakai.api.i18n.getValueForKey(item.title)
}); |
<<<<<<<
=======
StyleSheet
>>>>>>>
StyleSheet
<<<<<<<
getPadding() {
var { p, pl, pr, pt, pb, smp, mdp, lgp, xlp,
smpl, smpr, smpt, smpb, mdpl, mdpr, mdpt, mdpb, lgpl, lgpr, lgpt, lgpb,
xlpr, xlpl, xlpt, xlpb } = this.props
const sm = 0.02
smp = smp ? sm : null
smpl = smpl ? sm : null
smpr = smpr ? sm : null
smpb = smpb ? sm : null
smpt = smpt ? sm : null
const md = 0.05
mdp = mdp ? md : null
mdpl = mdpl ? md : null
mdpr = mdpr ? md : null
mdpb = mdpb ? md : null
mdpt = mdpt ? md : null
const lg = 0.07
lgp = lgp ? lg : null
lgpl = lgpl ? lg : null
lgpr = lgpr ? lg : null
lgpb = lgpb ? lg : null
lgpt = lgpt ? lg : null
const xl = 0.1
xlp = xlp ? xl : null
xlpl = xlpl ? xl : null
xlpr = xlpr ? xl : null
xlpb = xlpb ? xl : null
xlpt = xlpt ? xl : null
var padding = smp || mdp || lgp || xlp || p
var style = {
padding,
paddingTop: pt || smpt || mdpt || lgpt || xlpt || padding,
paddingBottom: pb || smpb || mdpb || lgpb || xlpb || padding,
paddingLeft: pl || smpl || mdpl || lgpl || xlpl || padding,
paddingRight: pr || smpr || mdpr || lgpr || xlpr || padding
}
return style
}
getItemsAlignment() {
const { row, vstart, vend, hstart, hend, spread, push } = this.props
var style = { flexDirection: row ? 'row' : "column" }
var vprop = row ? 'alignItems' : "justifyContent"
style[vprop] = "center"
if (vstart) {
style[vprop] = "flex-start"
}
if (vend) {
style[vprop] = "flex-end"
}
var hprop = row ? "justifyContent" : 'alignItems'
style[hprop] = "center"
if (hstart) {
style[hprop] = "flex-start"
}
if (hend) {
style[hprop] = "flex-end"
}
if (spread) {
style['justifyContent'] = "space-around"
}
if (push) {
style['justifyContent'] = "space-between"
}
return style
}
getBorderStyle() {
const { border } = this.props
var style = {}
if (border) {
style = {
borderColor: border.color,
borderWidth: border.width,
borderTopWidth: border.top || border.width,
borderBottomWidth: border.bottom || border.width,
borderLeftWidth: border.left || border.width,
borderRightWidth: border.right || border.width
}
}
return style
}
=======
>>>>>>>
getPadding() {
var { p, pl, pr, pt, pb, smp, mdp, lgp, xlp,
smpl, smpr, smpt, smpb, mdpl, mdpr, mdpt, mdpb, lgpl, lgpr, lgpt, lgpb,
xlpr, xlpl, xlpt, xlpb } = this.props
const sm = 0.02
smp = smp ? sm : null
smpl = smpl ? sm : null
smpr = smpr ? sm : null
smpb = smpb ? sm : null
smpt = smpt ? sm : null
const md = 0.05
mdp = mdp ? md : null
mdpl = mdpl ? md : null
mdpr = mdpr ? md : null
mdpb = mdpb ? md : null
mdpt = mdpt ? md : null
const lg = 0.07
lgp = lgp ? lg : null
lgpl = lgpl ? lg : null
lgpr = lgpr ? lg : null
lgpb = lgpb ? lg : null
lgpt = lgpt ? lg : null
const xl = 0.1
xlp = xlp ? xl : null
xlpl = xlpl ? xl : null
xlpr = xlpr ? xl : null
xlpb = xlpb ? xl : null
xlpt = xlpt ? xl : null
var padding = smp || mdp || lgp || xlp || p
var style = {
padding,
paddingTop: pt || smpt || mdpt || lgpt || xlpt || padding,
paddingBottom: pb || smpb || mdpb || lgpb || xlpb || padding,
paddingLeft: pl || smpl || mdpl || lgpl || xlpl || padding,
paddingRight: pr || smpr || mdpr || lgpr || xlpr || padding
}
return style
}
getItemsAlignment() {
const { row, vstart, vend, hstart, hend, spread, push } = this.props
var style = { flexDirection: row ? 'row' : "column" }
var vprop = row ? 'alignItems' : "justifyContent"
style[vprop] = "center"
if (vstart) {
style[vprop] = "flex-start"
}
if (vend) {
style[vprop] = "flex-end"
}
var hprop = row ? "justifyContent" : 'alignItems'
style[hprop] = "center"
if (hstart) {
style[hprop] = "flex-start"
}
if (hend) {
style[hprop] = "flex-end"
}
if (spread) {
style['justifyContent'] = "space-around"
}
if (push) {
style['justifyContent'] = "space-between"
}
return style
}
getBorderStyle() {
const { border } = this.props
var style = {}
if (border) {
style = {
borderColor: border.color,
borderWidth: border.width,
borderTopWidth: border.top || border.width,
borderBottomWidth: border.bottom || border.width,
borderLeftWidth: border.left || border.width,
borderRightWidth: border.right || border.width
}
}
return style
}
<<<<<<<
const { hover, hoverColor, bg } = this.props
const { currentBackgroundColor } = this.state
// TODO have setters for height and width
=======
const {hover} = this.props;
const {activeBorderColor, inactiveBorderColor, currentBorderColor} = this.state;
console.log(currentBorderColor)
>>>>>>>
const { hover, hoverColor, bg } = this.props
const { currentBackgroundColor } = this.state
// TODO have setters for height and width
<<<<<<<
<View style={{
width: 1,
display: 'flex',
flex: 1,
// Hardcoding for now
margin: 0.02,
minHeight: 0.5,
maxWidth: 2,
backgroundColor: currentBackgroundColor,
...this.getBorderStyle(),
...this.getItemsAlignment(),
...this.getPadding(),
}}
onEnter={hover ? () => this.setState({ hovered: true, currentBackgroundColor: hoverColor || DEFAULT_HOVER_COLOR }) : null}
onExit={hover ? () => this.setState({ hovered: false, currentBackgroundColor: bg || DEFAULT_BACKGROUND_COLOR }) : null}>
=======
//Note changing row to column
<View style={[styles.base, {borderColor: currentBorderColor } ]}
onEnter={hover ? () => this.setState({ hovered: true, currentBorderColor: activeBorderColor }) : null}
onExit={hover ? () => this.setState({ hovered: false, currentBorderColor: inactiveBorderColor}) : null}>
>>>>>>>
<View style={{
...styles.base,
backgroundColor: currentBackgroundColor,
...this.getBorderStyle(),
...this.getItemsAlignment(),
...this.getPadding(),
}}
onEnter={hover ? () => this.setState({ hovered: true, currentBackgroundColor: hoverColor || DEFAULT_HOVER_COLOR }) : null}
onExit={hover ? () => this.setState({ hovered: false, currentBackgroundColor: bg || DEFAULT_BACKGROUND_COLOR }) : null}> |
<<<<<<<
"newsharecontent",
=======
"newaddcontent",
>>>>>>>
"newsharecontent",
"newaddcontent", |
<<<<<<<
'title': oae.api.i18n.translate('__MSG__DISCUSSION__'),
'icon': 'fa fa-comments',
=======
'title': discussionProfile.displayName,
'icon': 'icon-comments',
>>>>>>>
'title': discussionProfile.displayName,
'icon': 'fa fa-comments', |
<<<<<<<
user: contextName
}, $('#mylibrary_title_container', $rootel));
=======
user: sakai.api.Util.Security.safeOutput(contextName)
}, $("#mylibrary_title_container", $rootel));
>>>>>>>
user: sakai.api.Util.Security.safeOutput(contextName)
}, $('#mylibrary_title_container', $rootel)); |
<<<<<<<
if (contentItem["sakai:description"]) {
var descWidth = 750;
if (threeDotsWidths && threeDotsWidths.descriptionWidth) {
descWidth = threeDotsWidths.descriptionWidth;
}
contentItem["sakai:description-shorter"] = sakai_util.applyThreeDots(contentItem["sakai:description"], 150, {
=======
if (contentItem['sakai:description']) {
contentItem['sakai:description-shorter'] = sakai_util.applyThreeDots(contentItem['sakai:description'], 150, {
>>>>>>>
if (contentItem['sakai:description']) {
var descWidth = 750;
if (threeDotsWidths && threeDotsWidths.descriptionWidth) {
descWidth = threeDotsWidths.descriptionWidth;
}
contentItem['sakai:description-shorter'] = sakai_util.applyThreeDots(contentItem['sakai:description'], 150, {
<<<<<<<
}, "");
contentItem["sakai:description"] = sakai_util.applyThreeDots(contentItem["sakai:description"], descWidth, {
=======
}, '');
contentItem['sakai:description'] = sakai_util.applyThreeDots(contentItem['sakai:description'], 580, {
>>>>>>>
}, '');
contentItem['sakai:description'] = sakai_util.applyThreeDots(contentItem['sakai:description'], descWidth, {
<<<<<<<
if (contentItem["sakai:pooled-content-file-name"]) {
var fileNameWidth = 560;
if (threeDotsWidths && threeDotsWidths.titleWidth) {
fileNameWidth = threeDotsWidths.titleWidth;
}
contentItem["sakai:pooled-content-file-name-short"] = sakai_util.applyThreeDots(contentItem["sakai:pooled-content-file-name"], fileNameWidth, {
=======
if (contentItem['sakai:pooled-content-file-name']) {
contentItem['sakai:pooled-content-file-name-short'] = sakai_util.applyThreeDots(contentItem['sakai:pooled-content-file-name'], 560, {
>>>>>>>
if (contentItem['sakai:pooled-content-file-name']) {
var fileNameWidth = 560;
if (threeDotsWidths && threeDotsWidths.titleWidth) {
fileNameWidth = threeDotsWidths.titleWidth;
}
contentItem['sakai:pooled-content-file-name-short'] = sakai_util.applyThreeDots(contentItem['sakai:pooled-content-file-name'], fileNameWidth, {
<<<<<<<
sakai_user.getMultipleUsers(userArray, function(users){
var displayNameWidth = 580;
if (threeDotsWidths && threeDotsWidths.displayNameWidth) {
displayNameWidth = threeDotsWidths.displayNameWidth;
}
$.each(results, function(index, item){
=======
sakai_user.getMultipleUsers(userArray, function(users) {
$.each(results, function(index, item) {
>>>>>>>
sakai_user.getMultipleUsers(userArray, function(users) {
var displayNameWidth = 580;
if (threeDotsWidths && threeDotsWidths.displayNameWidth) {
displayNameWidth = threeDotsWidths.displayNameWidth;
}
$.each(results, function(index, item) {
<<<<<<<
item.ownerDisplayNameShort = sakai_util.applyThreeDots(displayName, displayNameWidth, {max_rows: 1,whole_word: false}, "s3d-bold", true);
item.ownerDisplayNameShorter = sakai_util.applyThreeDots(displayName, 180, {max_rows: 1,whole_word: false}, "s3d-bold", true);
=======
item.ownerDisplayNameShort = sakai_util.applyThreeDots(displayName, 580, {max_rows: 1,whole_word: false}, 's3d-bold', true);
item.ownerDisplayNameShorter = sakai_util.applyThreeDots(displayName, 180, {max_rows: 1,whole_word: false}, 's3d-bold', true);
>>>>>>>
item.ownerDisplayNameShort = sakai_util.applyThreeDots(displayName, displayNameWidth, {max_rows: 1,whole_word: false}, 's3d-bold', true);
item.ownerDisplayNameShorter = sakai_util.applyThreeDots(displayName, 180, {max_rows: 1,whole_word: false}, 's3d-bold', true); |
<<<<<<<
var $accountpreferences_langloc_settings = $("#accountpreferences_langloc_settings");
var $tabList = $('#accountpreferences_tabs');
=======
var $accountpreferences_langloc_settings = $('#accountpreferences_langloc_settings');
>>>>>>>
var $accountpreferences_langloc_settings = $('#accountpreferences_langloc_settings');
var $tabList = $('#accountpreferences_tabs'); |
<<<<<<<
var redirectUrl = oae.api.util.url().param('url') || '/me';
=======
var redirectUrl = $.url().param('url') || '/';
>>>>>>>
var redirectUrl = oae.api.util.url().param('url') || '/'; |
<<<<<<<
groupData.push({
id: group.groupid,
url: "/~" + sakai.api.Util.makeSafeURL(group.groupid),
picsrc: pic,
edit_url: "/dev/group_edit2.html?id=" + group.groupid,
title: group["sakai:group-title"],
titleShort: titleShort,
desc: desc,
type: groupType,
lastModified: group.lastModified,
contentCount: group.counts.contentCount,
membersCount: group.counts.membersCount,
tags: tags
});
}
=======
groupData.push({
id: group.groupid,
url: "/~" + sakai.api.Util.makeSafeURL(group.groupid),
picsrc: sakai.api.Groups.getProfilePicture(group),
edit_url: "/dev/group_edit2.html?id=" + group.groupid,
title: group["sakai:group-title"],
titleShort: titleShort,
desc: desc,
type: groupType,
lastModified: group.lastModified,
contentCount: group.counts.contentCount,
membersCount: group.counts.membersCount,
tags: tags,
userMember: sakai.api.Groups.isCurrentUserAMember(group.groupid,sakai.data.me),
joinable: group["sakai:group-joinable"]
});
>>>>>>>
groupData.push({
id: group.groupid,
url: "/~" + sakai.api.Util.makeSafeURL(group.groupid),
picsrc: pic,
edit_url: "/dev/group_edit2.html?id=" + group.groupid,
title: group["sakai:group-title"],
titleShort: titleShort,
desc: desc,
type: groupType,
lastModified: group.lastModified,
contentCount: group.counts.contentCount,
membersCount: group.counts.membersCount,
tags: tags,
userMember: sakai.api.Groups.isCurrentUserAMember(group.groupid,sakai.data.me),
joinable: group["sakai:group-joinable"]
});
}
<<<<<<<
var checkAddingEnabled = function(){
if($(".mymemberships_select_group_checkbox:checked")[0]){
$("#mymemberships_addpeople_button").removeAttr("disabled");
} else {
$("#mymemberships_addpeople_button").attr("disabled", true);
$("#mymemberships_select_checkbox").removeAttr("checked");
}
};
=======
var removeMembership = function(groupid,groupname){
sakai.api.Groups.getRole(sakai.data.me.user.userid,groupid,function(success,role) {
sakai.api.Groups.leave(groupid,role,sakai.data.me,function(success) {
if (success) {
$(window).trigger("lhnav.updateCount", ["memberships", -1]);
$("#mymemberships_delete_membership_dialog").jqmHide();
$("#mymemberships_item_"+groupid).remove();
sakai.api.Util.notification.show(sakai.api.i18n.getValueForKey("MY_MEMBERSHIPS","mymemberships"),
sakai.api.i18n.getValueForKey("YOU_HAVE_LEFT_GROUP","mymemberships").replace("{groupname}",groupname),
sakai.api.Util.notification.type.INFORMATION);
}
else {
$("#mymemberships_delete_membership_dialog").jqmHide();
sakai.api.Util.notification.show(sakai.api.i18n.getValueForKey("MY_MEMBERSHIPS","mymemberships"),
sakai.api.i18n.getValueForKey("ERROR_LEAVING_GROUP","mymemberships").replace("{groupname}",groupname),
sakai.api.Util.notification.type.ERROR);
}
});
});
};
var bindEvents = function(){
$("#mymemberships_delete_membership_dialog").jqm({
modal: true,
overlay: 20,
toTop: true,
});
$(".s3d-actions-delete", $rootel).live("click", function() {
var msg = sakai.api.i18n.getValueForKey("ARE_YOU_SURE_YOU_WANT_TO_LEAVE","mymemberships").replace("{groupname}",'<span class="s3d-bold">'+$(this).data("sakai-entityname")+'</span>');
$("#mymemberships_are_you_sure").html(msg);
$("#mymemberships_delete_membership_confirm").data("sakai-entityid", $(this).data("sakai-entityid"));
$("#mymemberships_delete_membership_confirm").data("sakai-entityname", $(this).data("sakai-entityname"));
$("#mymemberships_delete_membership_dialog").jqmShow();
});
$("#mymemberships_delete_membership_confirm").live("click", function(){
removeMembership($(this).data("sakai-entityid"),$(this).data("sakai-entityname"));
});
if (sakai_global.profile.main.data.userid !== sakai.data.me.user.userid) {
$('.searchgroups_result_plus',$rootel).live("click", function(ev) {
var joinable = $(this).data("group-joinable");
var groupid = $(this).data("groupid");
var itemdiv = $(this);
sakai.api.Groups.addJoinRequest(sakai.data.me, groupid, false, true, function (success) {
if (success) {
if (joinable === "withauth") {
// Don't add green tick yet because they need to be approved.
var notimsg = sakai.api.i18n.getValueForKey("YOUR_REQUEST_HAS_BEEN_SENT");
}
else { // Everything else should be regular success
$("#searchgroups_memberimage_"+groupid).show();
var notimsg = sakai.api.i18n.getValueForKey("SUCCESSFULLY_ADDED_TO_GROUP");
}
sakai.api.Util.notification.show(sakai.api.i18n.getValueForKey("GROUP_MEMBERSHIP"),
notimsg, sakai.api.Util.notification.type.INFORMATION);
itemdiv.removeClass("s3d-action-icon s3d-actions-addtolibrary searchgroups_result_plus");
} else {
sakai.api.Util.notification.show(sakai.api.i18n.getValueForKey("GROUP_MEMBERSHIP"),
sakai.api.i18n.getValueForKey("PROBLEM_ADDING_TO_GROUP"),
sakai.api.Util.notification.type.ERROR);
}
});
});
}
};
>>>>>>>
var checkAddingEnabled = function(){
if($(".mymemberships_select_group_checkbox:checked")[0]){
$("#mymemberships_addpeople_button").removeAttr("disabled");
} else {
$("#mymemberships_addpeople_button").attr("disabled", true);
$("#mymemberships_select_checkbox").removeAttr("checked");
}
};
var removeMembership = function(groupid,groupname){
sakai.api.Groups.getRole(sakai.data.me.user.userid,groupid,function(success,role) {
sakai.api.Groups.leave(groupid,role,sakai.data.me,function(success) {
if (success) {
$(window).trigger("lhnav.updateCount", ["memberships", -1]);
$("#mymemberships_delete_membership_dialog").jqmHide();
$("#mymemberships_item_"+groupid).remove();
sakai.api.Util.notification.show(sakai.api.i18n.getValueForKey("MY_MEMBERSHIPS","mymemberships"),
sakai.api.i18n.getValueForKey("YOU_HAVE_LEFT_GROUP","mymemberships").replace("{groupname}",groupname),
sakai.api.Util.notification.type.INFORMATION);
}
else {
$("#mymemberships_delete_membership_dialog").jqmHide();
sakai.api.Util.notification.show(sakai.api.i18n.getValueForKey("MY_MEMBERSHIPS","mymemberships"),
sakai.api.i18n.getValueForKey("ERROR_LEAVING_GROUP","mymemberships").replace("{groupname}",groupname),
sakai.api.Util.notification.type.ERROR);
}
});
});
}; |
<<<<<<<
'markdown': 'vendor/js/markdown',
=======
'qunitjs': 'vendor/js/qunit',
>>>>>>>
'markdown': 'vendor/js/markdown',
'qunitjs': 'vendor/js/qunit', |
<<<<<<<
"addcontent": {
"ca":true,
"description":"Add Resource to a Site",
"name":"Add Resource",
"id":"addcontent",
"img":"/devwidgets/addcontent/images/addcontent.png",
"showinsakaigoodies":true,
"url":"/devwidgets/addcontent/addcontent.html"
},
=======
"activitystream": {
"description":"Activity Stream Widget",
"hasSettings":true,
"img": "/devwidgets/activitystream/images/activitystream_icon.png",
"id":"activitystream",
"i18n": {
"default": "/devwidgets/activitystream/bundles/default.json",
"en_US": "/devwidgets/activitystream/bundles/en_US.json"
},
"name":"Activity Stream",
"personalportal":true,
"url":"/devwidgets/activitystream/activitystream.html"
},
>>>>>>>
"addcontent": {
"ca":true,
"description":"Add Resource to a Site",
"name":"Add Resource",
"id":"addcontent",
"img":"/devwidgets/addcontent/images/addcontent.png",
"showinsakaigoodies":true,
"url":"/devwidgets/addcontent/addcontent.html"
},
"activitystream": {
"description":"Activity Stream Widget",
"hasSettings":true,
"img": "/devwidgets/activitystream/images/activitystream_icon.png",
"id":"activitystream",
"i18n": {
"default": "/devwidgets/activitystream/bundles/default.json",
"en_US": "/devwidgets/activitystream/bundles/en_US.json"
},
"name":"Activity Stream",
"personalportal":true,
"url":"/devwidgets/activitystream/activitystream.html"
}, |
<<<<<<<
var error = resp;
var selector = this.modal_selector;
$(selector + ' .modal-body .alert').remove();
=======
var error = response;
$('#altEditor-modal .modal-body .alert').remove();
>>>>>>>
var error = response;
var selector = this.modal_selector;
$(selector + ' .modal-body .alert').remove(); |
<<<<<<<
var selectedData = collectionData[pageIndex][selectedIndex];
var width = parseInt($collectionviewerExpandedContentContainer.width(), 10) / 2.5 - 50;
if (selectedData._mimeType === 'x-sakai/collection') {
getCollectionData('c-' + selectedData._path, false, function(data) {
if (data.results.fetchMultipleUserDataInWidget) {
delete data.results.fetchMultipleUserDataInWidget;
}
selectedData.collectionItems = data.results;
=======
if (!isNaN(pageIndex)) {
var selectedData = collectionData[pageIndex][selectedIndex];
if (selectedData._mimeType === 'x-sakai/collection') {
getCollectionData('c-' + selectedData._path, false, function(data) {
if (data.results.fetchMultipleUserDataInWidget) {
delete data.results.fetchMultipleUserDataInWidget;
}
selectedData.collectionItems = data.results;
sakai.api.Util.TemplateRenderer('collectionviewer_list_item_template', {
data: selectedData,
sakai: sakai,
collectionName: getCollectionName(),
collectionId: getCollectionId(collectionviewer.contextId),
isEditor: sakai.api.Content.Collections.canCurrentUserEditCollection(collectionviewer.contextId),
pagePreviewDisabled: pagePreviewDisabled
}, $('#collectionviewer_expanded_content_container', $rootel));
if (previewsAllowed) {
sakai.api.Widgets.widgetLoader.insertWidgets(tuid);
}
});
} else {
>>>>>>>
if (!isNaN(pageIndex)) {
var selectedData = collectionData[pageIndex][selectedIndex];
var width = parseInt($collectionviewerExpandedContentContainer.width(), 10) / 2.5 - 50;
if (selectedData._mimeType === 'x-sakai/collection') {
getCollectionData('c-' + selectedData._path, false, function(data) {
if (data.results.fetchMultipleUserDataInWidget) {
delete data.results.fetchMultipleUserDataInWidget;
}
selectedData.collectionItems = data.results;
sakai.api.Util.TemplateRenderer('collectionviewer_list_item_template', {
data: selectedData,
sakai: sakai,
collectionName: getCollectionName(),
collectionId: getCollectionId(collectionviewer.contextId),
isEditor: sakai.api.Content.Collections.canCurrentUserEditCollection(collectionviewer.contextId),
pagePreviewDisabled: pagePreviewDisabled
}, $('#collectionviewer_expanded_content_container', $rootel));
if (previewsAllowed) {
sakai.api.Widgets.widgetLoader.insertWidgets(tuid);
}
});
} else {
<<<<<<<
});
} else {
sakai.api.Util.TemplateRenderer('collectionviewer_list_item_template', {
data: selectedData,
sakai: sakai,
collectionName: getCollectionName(),
collectionId: getCollectionId(collectionviewer.contextId),
isEditor: sakai.api.Content.Collections.canCurrentUserEditCollection(collectionviewer.contextId),
titleWidth: width,
pagePreviewDisabled: pagePreviewDisabled
}, $('#collectionviewer_expanded_content_container', $rootel));
if (previewsAllowed) {
sakai.api.Widgets.widgetLoader.insertWidgets(tuid);
=======
>>>>>>> |
<<<<<<<
define(['jquery'], function($) {
return function() {
$('#footer-date').text(new Date().getFullYear());
=======
define(['jquery', 'oae.core'], function($, oae) {
return function(uid, showSettings) {
var $rootel = $('#' + uid);
/*!
* TODO: Move this to a configuration option
*/
var languages = {
'en_GB': 'English (United Kingdom)',
'en_US': 'English (United States)',
'es_ES': 'Español',
'fr_FR': 'Français',
'nl_NL': 'Nederlands',
'zh_CN': '中文',
'ru_RU': 'Русский'
};
/*!
* TODO: Move this to a configuration option
*/
var footerLinks = [{
'title': '__MSG__COPYRIGHT__',
'href': 'http://sakaiproject.org/foundation-licenses',
'newWindow': true
}, {
'title': '__MSG__HELP__',
'href': 'http://sakaiproject.org/node/2307',
'newWindow': true
}, {
'title': '__MSG__ACKNOWLEDGEMENTS__',
'href': '/acknowledgements'
}, {
'title': '__MSG__SUGGEST_AN_IMPROVEMENT__',
'href': 'http://sakaioae.idea.informer.com/',
'newWindow': true
}];
/**
* Set the end year of the copyright notice to be the current year
*/
var setCopyRightYear = function() {
$('#footer_date_end', $rootel).text(new Date().getFullYear());
};
/**
* Set the current user's language and location. This will only be done
* for logged in users
*/
var setLanguageAndLocation = function() {
// Only set them for logged in users
if (!oae.data.me.anon) {
// Set the user's language. Default to the locale name when no translation can be found
$('#footer_language', $rootel).text(languages[oae.data.me.locale.locale] || oae.data.me.locale.locale);
// Set the user's location
$('#footer_location', $rootel).text(oae.data.me.locale.timezone.name);
// Show the container
$('#footer_langloc', $rootel).show();
}
};
/**
* Set the debug info, which will show the current UI and Hilary version for
* helpdesk purposes
*/
var setDebugInfo = function() {
// TODO: Re-implement when debug info can be retrieved
};
/**
* Render the left-hand side footer links, which are configurable in the admin
* console
*/
var setFooterLinks = function() {
// We also need to translate the links as these may contain i18n keys
$('#footer_links', $rootel).html(oae.api.i18n.translate(oae.api.util.renderTemplate('#footer_links_template', {
'footerLinks':footerLinks
}), 'footer'));
};
setCopyRightYear();
setLanguageAndLocation();
setDebugInfo();
setFooterLinks();
>>>>>>>
define(['jquery', 'oae.core'], function($, oae) {
return function() {
$('#footer-date').text(new Date().getFullYear()); |
<<<<<<<
=======
'jquery.gritter': 'vendor/js/jquery-plugins/jquery.gritter.sakai-edit',
'jquery.iframe-transport': 'vendor/js/jquery-plugins/jquery.iframe-transport',
'jquery.imgareaselect': 'vendor/js/jquery-plugins/imgareaselect/jquery.imgareaselect',
>>>>>>>
'jquery.iframe-transport': 'vendor/js/jquery-plugins/jquery.iframe-transport',
'jquery.imgareaselect': 'vendor/js/jquery-plugins/imgareaselect/jquery.imgareaselect',
<<<<<<<
'jquery.fileupload': 'vendor/js/jquery-plugins/jquery.fileupload',
'jquery.dnd-upload': 'vendor/js/jquery-plugins/jquery.dnd-upload',
'jquery.autoSuggest': 'vendor/js/jquery-plugins/jquery.autoSuggest.sakai-edited',
'jquery.jeditable': 'vendor/js/jquery-plugins/jquery.jeditable.sakai-edited',
=======
>>>>>>> |
<<<<<<<
var removeProgressBar = function(){
var curDate = new Date();
var curTimestamp = curDate.getTime();
var progressData = {
"hideSystemTour": true,
"reminderTimestamp": curTimestamp
};
var authprofileURL = "/~" + me.user.userid + "/public/authprofile/userprogress";
sakai.api.Server.saveJSON(authprofileURL, progressData, function(success, data){
// Check whether save was successful
if (success) {
$(window).unbind("sakai-systemtour-update");
$systemtourContainer.hide();
=======
sakai_global.systemtour = function(tuid, showSettings){
/////////////////////////////
// Configuration variables //
/////////////////////////////
var me; // Contains information about the current user
// Variables used to determine what the user has done
var uploadedProfilePhoto;
var uploadedContent;
var sharedContent;
var madeContactRequest;
var halfCompletedProfile;
///////////////////
// CSS SELECTORS //
///////////////////
var $rootel = $("#" + tuid); // Get the main div used by the widget
var $systemtourContainer = $("#systemtour_container", $rootel);
var $systemtourProgressBar = $("#systemtour_progress_bar", $rootel);
var $systemtourRemoveWidget = $("#systemtour_remove_widget", $rootel);
var $systemtourCloseWidget = $("#systemtour_close_widget", $rootel);
// Progress bar buttons
var $systemtourButton = $(".systemtour_button", $rootel);
var $systemtourAddPhoto = $("#systemtour_add_photo", $rootel);
var $systemtourUploadFile = $("#systemtour_upload_file", $rootel);
var $systemtourShareContent = $("#systemtour_share_content", $rootel);
var $systemtourInvitedSomeone = $("#systemtour_add_contacts", $rootel);
var $systemtourHalfCompleteProfile = $("#systemtour_edit_profile", $rootel);
var $systemtourAddPhotoComplete = $("#systemtour_add_photo .systemtour_item_complete", $rootel);
var $systemtourUploadFileComplete = $("#systemtour_upload_file .systemtour_item_complete", $rootel);
var $systemtourShareContentComplete = $("#systemtour_share_content .systemtour_item_complete", $rootel);
var $systemtourInvitedSomeoneComplete = $("#systemtour_add_contacts .systemtour_item_complete", $rootel);
var $systemtourHalfCompleteProfileComplete = $("#systemtour_edit_profile .systemtour_item_complete", $rootel);
////////////////////////
// Utility functions //
////////////////////////
/**
* Updates the progress data based
*/
var updateProgressData = function(){
me = sakai.data.me;
uploadedProfilePhoto = me.profile.userprogress.uploadedProfilePhoto;
uploadedContent = me.profile.userprogress.uploadedContent;
sharedContent = me.profile.userprogress.sharedContent;
madeContactRequest = me.profile.userprogress.madeContactRequest;
halfCompletedProfile = me.profile.userprogress.halfCompletedProfile;
};
/**
* Updates the progress bar based on actions the user has already performed
*/
var updateProgressBar = function(){
if (uploadedProfilePhoto) {
$systemtourAddPhoto.find(".systemtour_item_complete").addClass("systemtour_item_complete_full");
>>>>>>>
sakai_global.systemtour = function(tuid, showSettings){
/////////////////////////////
// Configuration variables //
/////////////////////////////
var me; // Contains information about the current user
// Variables used to determine what the user has done
var uploadedProfilePhoto;
var uploadedContent;
var sharedContent;
var madeContactRequest;
var halfCompletedProfile;
///////////////////
// CSS SELECTORS //
///////////////////
var $rootel = $("#" + tuid); // Get the main div used by the widget
var $systemtourContainer = $("#systemtour_container", $rootel);
var $systemtourProgressBar = $("#systemtour_progress_bar", $rootel);
var $systemtourRemoveWidget = $("#systemtour_remove_widget", $rootel);
var $systemtourCloseWidget = $("#systemtour_close_widget", $rootel);
// Progress bar buttons
var $systemtourButton = $(".systemtour_button", $rootel);
var $systemtourAddPhoto = $("#systemtour_add_photo", $rootel);
var $systemtourUploadFile = $("#systemtour_upload_file", $rootel);
var $systemtourShareContent = $("#systemtour_share_content", $rootel);
var $systemtourInvitedSomeone = $("#systemtour_add_contacts", $rootel);
var $systemtourHalfCompleteProfile = $("#systemtour_edit_profile", $rootel);
var $systemtourAddPhotoComplete = $("#systemtour_add_photo .systemtour_item_complete", $rootel);
var $systemtourUploadFileComplete = $("#systemtour_upload_file .systemtour_item_complete", $rootel);
var $systemtourShareContentComplete = $("#systemtour_share_content .systemtour_item_complete", $rootel);
var $systemtourInvitedSomeoneComplete = $("#systemtour_add_contacts .systemtour_item_complete", $rootel);
var $systemtourHalfCompleteProfileComplete = $("#systemtour_edit_profile .systemtour_item_complete", $rootel);
////////////////////////
// Utility functions //
////////////////////////
/**
* Updates the progress data based
*/
var updateProgressData = function(){
me = sakai.data.me;
uploadedProfilePhoto = me.profile.userprogress.uploadedProfilePhoto;
uploadedContent = me.profile.userprogress.uploadedContent;
sharedContent = me.profile.userprogress.sharedContent;
madeContactRequest = me.profile.userprogress.madeContactRequest;
halfCompletedProfile = me.profile.userprogress.halfCompletedProfile;
};
/**
* Updates the progress bar based on actions the user has already performed
*/
var updateProgressBar = function(){
if (uploadedProfilePhoto) {
$systemtourAddPhoto.find(".systemtour_item_complete").addClass("systemtour_item_complete_full");
<<<<<<<
var hide = $.cookie("sakai.systemtour.hide");
// if user has not removed the tour progress bar or completed all actions or edit profile tour is in progress
if (!hide && !me.profile.userprogress.hideSystemTour && ((!uploadedProfilePhoto || !uploadedContent || !sharedContent || !madeContactRequest || !halfCompletedProfile || checkEditProfileProgress))) {
// update progress bar
updateProgressBar();
=======
>>>>>>> |
<<<<<<<
var sakai2tools = "#sakai2tools";
var sakai2toolsSettings = sakai2tools + "_settings";
var sakai2toolsSettingsAdvanced = sakai2toolsSettings + "_advanced";
var sakai2toolsSettingsAdvancedDown = sakai2toolsSettingsAdvanced + "_down";
var sakai2toolsSettingsAdvancedToggleSettings = sakai2toolsSettingsAdvanced + "_toggle_settings";
var sakai2toolsSettingsAdvancedUp = sakai2toolsSettingsAdvanced + "_up";
var sakai2toolsSettingsBorders = sakai2toolsSettings + "_borders";
var sakai2toolsSettingsCancel = sakai2toolsSettings + "_cancel";
var sakai2toolsSettingsColorContainer = sakai2toolsSettings + "_color_container";
var sakai2toolsSettingsHeight = sakai2toolsSettings + "_frame_height";
var sakai2toolsSettingsInsert = sakai2toolsSettings + "_insert";
var sakai2toolsSettingsPreview = sakai2toolsSettings + "_preview";
var sakai2toolsSettingsPreviewId = tuid + "_frame";
var sakai2toolsSettingsPreviewFrame = "#" + sakai2toolsSettingsPreviewId;
var sakai2toolsSettingsLtiUrl = sakai2toolsSettings + "_ltiurl";
var sakai2toolsSettingsLtiKey = sakai2toolsSettings + "_ltikey";
var sakai2toolsSettingsLtiSecret = sakai2toolsSettings + "_ltisecret";
var sakai2toolsSettingsWidth = sakai2toolsSettings + "_width";
var sakai2toolsSettingsReleaseName = sakai2toolsSettings + "_release_names";
=======
var basiclti = '#basiclti';
var basicltiSettings = basiclti + '_settings';
var basicltiSettingsAdvanced = basicltiSettings + '_advanced';
var basicltiSettingsAdvancedDown = basicltiSettingsAdvanced + '_down';
var basicltiSettingsAdvancedToggleSettings = basicltiSettingsAdvanced + '_toggle_settings';
var basicltiSettingsAdvancedUp = basicltiSettingsAdvanced + '_up';
var basicltiSettingsBorders = basicltiSettings + '_borders';
var basicltiSettingsCancel = basicltiSettings + '_cancel';
var basicltiSettingsColorContainer = basicltiSettings + '_color_container';
var basicltiSettingsHeight = basicltiSettings + '_frame_height';
var basicltiSettingsInsert = basicltiSettings + '_insert';
var basicltiSettingsPreview = basicltiSettings + '_preview';
var basicltiSettingsPreviewId = tuid + '_frame';
var basicltiSettingsPreviewFrame = '#' + basicltiSettingsPreviewId;
var basicltiSettingsLtiUrl = basicltiSettings + '_ltiurl';
var basicltiSettingsLtiKey = basicltiSettings + '_ltikey';
var basicltiSettingsLtiSecret = basicltiSettings + '_ltisecret';
var basicltiSettingsWidth = basicltiSettings + '_width';
var basicltiSettingsReleaseName = basicltiSettings + '_release_names';
>>>>>>>
var sakai2tools = '#sakai2tools';
var sakai2toolsSettings = sakai2tools + '_settings';
var sakai2toolsSettingsAdvanced = sakai2toolsSettings + '_advanced';
var sakai2toolsSettingsAdvancedDown = sakai2toolsSettingsAdvanced + '_down';
var sakai2toolsSettingsAdvancedToggleSettings = sakai2toolsSettingsAdvanced + '_toggle_settings';
var sakai2toolsSettingsAdvancedUp = sakai2toolsSettingsAdvanced + '_up';
var sakai2toolsSettingsBorders = sakai2toolsSettings + '_borders';
var sakai2toolsSettingsCancel = sakai2toolsSettings + '_cancel';
var sakai2toolsSettingsColorContainer = sakai2toolsSettings + '_color_container';
var sakai2toolsSettingsHeight = sakai2toolsSettings + '_frame_height';
var sakai2toolsSettingsInsert = sakai2toolsSettings + '_insert';
var sakai2toolsSettingsPreview = sakai2toolsSettings + '_preview';
var sakai2toolsSettingsPreviewId = tuid + '_frame';
var sakai2toolsSettingsPreviewFrame = '#' + sakai2toolsSettingsPreviewId;
var sakai2toolsSettingsLtiUrl = sakai2toolsSettings + '_ltiurl';
var sakai2toolsSettingsLtiKey = sakai2toolsSettings + '_ltikey';
var sakai2toolsSettingsLtiSecret = sakai2toolsSettings + '_ltisecret';
var sakai2toolsSettingsWidth = sakai2toolsSettings + '_width';
var sakai2toolsSettingsReleaseName = sakai2toolsSettings + '_release_names';
<<<<<<<
var sakai2toolsMainContainer = sakai2tools + "_main_container";
=======
var basicltiMainContainer = basiclti + '_main_container';
>>>>>>>
var sakai2toolsMainContainer = sakai2tools + '_main_container';
<<<<<<<
var sakai2toolsSettingsWidthUnitClass = ".sakai2tools_settings_width_unit";
var sakai2toolsSettingsWidthUnitSelectedClass = "sakai2tools_settings_width_unit_selected";
=======
var basicltiSettingsWidthUnitClass = '.basiclti_settings_width_unit';
var basicltiSettingsWidthUnitSelectedClass = 'basiclti_settings_width_unit_selected';
>>>>>>>
var sakai2toolsSettingsWidthUnitClass = '.sakai2tools_settings_width_unit';
var sakai2toolsSettingsWidthUnitSelectedClass = 'sakai2tools_settings_width_unit_selected';
<<<<<<<
var $sakai2toolsSettingsColorContainerTemplate = $("#sakai2tools_settings_color_container_template", rootel);
var $sakai2toolsSettingsTemplate = $("#sakai2tools_settings_template", rootel);
var $sakai2toolsSettingsPreviewTemplate = $("#sakai2tools_settings_preview_template", rootel);
=======
var $basicltiSettingsColorContainerTemplate = $('#basiclti_settings_color_container_template', rootel);
var $basicltiSettingsTemplate = $('#basiclti_settings_template', rootel);
var $basicltiSettingsPreviewTemplate = $('#basiclti_settings_preview_template', rootel);
>>>>>>>
var $sakai2toolsSettingsColorContainerTemplate = $('#sakai2tools_settings_color_container_template', rootel);
var $sakai2toolsSettingsTemplate = $('#sakai2tools_settings_template', rootel);
var $sakai2toolsSettingsPreviewTemplate = $('#sakai2tools_settings_preview_template', rootel);
<<<<<<<
json.tuidFrame = sakai2toolsSettingsPreviewId;
$(sakai2toolsMainContainer, rootel).html(sakai.api.Util.TemplateRenderer($sakai2toolsSettingsPreviewTemplate, json));
json.launchDataUrl = sakai.api.Widgets.getWidgetDataStorageURL(tuid) + ".launch.html";
=======
json.tuidFrame = basicltiSettingsPreviewId;
$(basicltiMainContainer, rootel).html(sakai.api.Util.TemplateRenderer($basicltiSettingsPreviewTemplate, json));
json.launchDataUrl = sakai.api.Widgets.getWidgetDataStorageURL(tuid) + '.launch.html';
>>>>>>>
json.tuidFrame = sakai2toolsSettingsPreviewId;
$(sakai2toolsMainContainer, rootel).html(sakai.api.Util.TemplateRenderer($sakai2toolsSettingsPreviewTemplate, json));
json.launchDataUrl = sakai.api.Widgets.getWidgetDataStorageURL(tuid) + '.launch.html';
<<<<<<<
$("#" + json.tuidFrame, rootel).attr("src", json.launchDataUrl);
=======
$('#' + json.tuidFrame, rootel).attr('src', json.launchDataUrl);
>>>>>>>
$('#' + json.tuidFrame, rootel).attr('src', json.launchDataUrl);
<<<<<<<
if(isSameOriginPolicy(window.location.href, json.ltiurl)) {
$(sakai2toolsSettingsPreviewFrame, rootel).load(function() {
$(this).height($(this).contents().find("body").height() + 15); // add 10px for IE and 5px more for Gradebook weirdness
=======
if (isSameOriginPolicy(window.location.href, json.ltiurl)) {
$(basicltiSettingsPreviewFrame, rootel).load(function() {
$(this).height($(this).contents().find('body').height() + 15); // add 10px for IE and 5px more for Gradebook weirdness
>>>>>>>
if (isSameOriginPolicy(window.location.href, json.ltiurl)) {
$(sakai2toolsSettingsPreviewFrame, rootel).load(function() {
$(this).height($(this).contents().find('body').height() + 15); // add 10px for IE and 5px more for Gradebook weirdness
<<<<<<<
var addColorBinding = function(){
$(".sakai2tools_settings_color",rootel).click(function(){
json.border_color = $(this).attr("id").split("_")[$(this).attr("id").split("_").length - 1];
=======
var addColorBinding = function() {
$('.basiclti_settings_color',rootel).click(function() {
json.border_color = $(this).attr('id').split('_')[$(this).attr('id').split('_').length - 1];
>>>>>>>
var addColorBinding = function() {
$('.sakai2tools_settings_color',rootel).click(function() {
json.border_color = $(this).attr('id').split('_')[$(this).attr('id').split('_').length - 1];
<<<<<<<
$(sakai2toolsSettingsLtiUrl,rootel).change(function(){
=======
$(basicltiSettingsLtiUrl,rootel).change(function() {
>>>>>>>
$(sakai2toolsSettingsLtiUrl, rootel).change(function() {
<<<<<<<
$(sakai2toolsSettingsWidth,rootel).change(function(){
var widthValue = $(sakai2toolsSettingsWidth,rootel).val();
=======
$(basicltiSettingsWidth,rootel).change(function() {
var widthValue = $(basicltiSettingsWidth,rootel).val();
>>>>>>>
$(sakai2toolsSettingsWidth, rootel).change(function() {
var widthValue = $(sakai2toolsSettingsWidth, rootel).val();
<<<<<<<
$(sakai2toolsSettingsHeight,rootel).change(function(){
var heightValue = $(sakai2toolsSettingsHeight,rootel).val();
=======
$(basicltiSettingsHeight,rootel).change(function() {
var heightValue = $(basicltiSettingsHeight,rootel).val();
>>>>>>>
$(sakai2toolsSettingsHeight, rootel).change(function() {
var heightValue = $(sakai2toolsSettingsHeight, rootel).val();
<<<<<<<
$(sakai2toolsSettingsBorders,rootel).change(function(){
var borderValue = $(sakai2toolsSettingsBorders,rootel).val();
=======
$(basicltiSettingsBorders,rootel).change(function() {
var borderValue = $(basicltiSettingsBorders,rootel).val();
>>>>>>>
$(sakai2toolsSettingsBorders, rootel).change(function() {
var borderValue = $(sakai2toolsSettingsBorders, rootel).val();
<<<<<<<
$(sakai2toolsSettingsAdvancedToggleSettings,rootel).click(function(){
$("#sakai2tools_settings_advanced", rootel).toggle();
=======
$(basicltiSettingsAdvancedToggleSettings,rootel).click(function() {
$('#basiclti_settings_advanced', rootel).toggle();
>>>>>>>
$(sakai2toolsSettingsAdvancedToggleSettings,rootel).click(function() {
$('#sakai2tools_settings_advanced', rootel).toggle();
<<<<<<<
$(sakai2toolsSettingsWidthUnitClass,rootel).click(function(){
var widthUnitValue = $(this).attr("id").split("_")[$(this).attr("id").split("_").length - 1];
if (widthUnitValue === "px") {
=======
$(basicltiSettingsWidthUnitClass,rootel).click(function() {
var widthUnitValue = $(this).attr('id').split('_')[$(this).attr('id').split('_').length - 1];
if (widthUnitValue === 'px') {
>>>>>>>
$(sakai2toolsSettingsWidthUnitClass,rootel).click(function() {
var widthUnitValue = $(this).attr('id').split('_')[$(this).attr('id').split('_').length - 1];
if (widthUnitValue === 'px') {
<<<<<<<
$(sakai2toolsSettingsInsert,rootel).click(function(){
=======
$(basicltiSettingsInsert,rootel).click(function() {
>>>>>>>
$(sakai2toolsSettingsInsert, rootel).click(function() {
<<<<<<<
$(sakai2toolsSettingsCancel,rootel).click(function(){
sakai.api.Widgets.Container.informCancel(tuid, "sakai2tools");
=======
$(basicltiSettingsCancel,rootel).click(function() {
sakai.api.Widgets.Container.informCancel(tuid, 'basiclti');
>>>>>>>
$(sakai2toolsSettingsCancel,rootel).click(function() {
sakai.api.Widgets.Container.informCancel(tuid, 'sakai2tools'); |
<<<<<<<
case "group_managed":
$('#entity_groupsettings_dropdown').html(sakai.api.Util.TemplateRenderer("entity_groupsettings_dropdown", context));
break;
=======
case "group":
$(window).bind("ready.joinrequestbuttons.sakai", function() {
var url = "/system/userManager/group/" +
context.data.authprofile.groupid + ".managers.json";
$.ajax({
url: url,
success: function(managers){
$(window).trigger("init.joinrequestbuttons.sakai", [
context.data.authprofile.groupid,
context.data.authprofile["sakai:group-joinable"],
managers.length,
function (renderedButtons) {
// onShow
$("#joinrequestbuttons_widget", $rootel).show();
}
]);
}
});
});
sakai.api.Widgets.widgetLoader.insertWidgets("entity_container", false, $rootel);
break;
>>>>>>>
case "group_managed":
$('#entity_groupsettings_dropdown').html(sakai.api.Util.TemplateRenderer("entity_groupsettings_dropdown", context));
break;
case "group":
$(window).bind("ready.joinrequestbuttons.sakai", function() {
var url = "/system/userManager/group/" +
context.data.authprofile.groupid + ".managers.json";
$.ajax({
url: url,
success: function(managers){
$(window).trigger("init.joinrequestbuttons.sakai", [
context.data.authprofile.groupid,
context.data.authprofile["sakai:group-joinable"],
managers.length,
function (renderedButtons) {
// onShow
$("#joinrequestbuttons_widget", $rootel).show();
}
]);
}
});
});
sakai.api.Widgets.widgetLoader.insertWidgets("entity_container", false, $rootel);
break; |
<<<<<<<
var resultsToDisplay = 12;
var refineBy = "";
=======
var $rootel = $("#" + tuid);
>>>>>>>
var $rootel = $("#" + tuid);
var refineBy = "";
<<<<<<<
"q": $(searchConfig.global.text, rootel).val(),
"cat": "",
"page": 0,
"refine": ""
=======
"q": $(searchConfig.global.text, $rootel).val(),
"cat": ""
>>>>>>>
"q": $(searchConfig.global.text, rootel).val(),
"cat": "",
"refine": ""
<<<<<<<
"q": $(searchConfig.global.text, rootel).val(),
"page": 0,
"refine": ""
=======
"q": $(searchConfig.global.text, $rootel).val(),
"cat": ""
>>>>>>>
"q": $(searchConfig.global.text, rootel).val(),
"cat": "",
"refine": ""
<<<<<<<
"q": $(searchConfig.global.text, rootel).val(),
"cat": "",
"page": 0,
"refine": ""
=======
"q": $(searchConfig.global.text, $rootel).val(),
"cat": ""
>>>>>>>
"q": $(searchConfig.global.text, rootel).val(),
"cat": "",
"refine": "" |
<<<<<<<
var subnavtl = '.hassubnav_tl';
var navLinkDropdown = '.s3d-dropdown-container';
var hasSubnav = '.hassubnav';
var topnavExplore = '.topnavigation_explore';
=======
var $rootel = $('#' + tuid);
var subnavtl = ".hassubnav_tl";
var navLinkDropdown = ".s3d-dropdown-container";
var hasSubnav = ".hassubnav";
var topnavExplore = ".topnavigation_explore";
>>>>>>>
var $rootel = $('#' + tuid);
var subnavtl = '.hassubnav_tl';
var navLinkDropdown = '.s3d-dropdown-container';
var hasSubnav = '.hassubnav';
var topnavExplore = '.topnavigation_explore';
<<<<<<<
$('#subnavigation_preferences_link').live('click', function() {
$(window).trigger('init.accountpreferences.sakai');
return false;
});
$('#topnavigation_search_input').keyup(function(evt) {
=======
$("#topnavigation_search_input").keyup(function(evt){
>>>>>>>
$('#subnavigation_preferences_link').live('click', function() {
$(window).trigger('init.accountpreferences.sakai');
return false;
});
$('#topnavigation_search_input').keyup(function(evt) {
<<<<<<<
var doLogin = function() {
$(topnavUserOptionsLoginButtonSigningIn).show();
$(topnavUserOptionsLoginButtonCancel).hide();
$(topnavuserOptionsLoginButtonLogin).hide();
sakai.api.User.login({
'username': $(topnavUseroptionsLoginFieldsUsername).val(),
'password': $(topnavUseroptionsLoginFieldsPassword).val()
}, function(success) {
if (success) {
var redirectURL = getRedirectURL();
if (redirectURL === window.location.pathname + window.location.search + window.location.hash) {
window.location.reload(true);
} else {
window.location = redirectURL;
}
} else {
$(topnavUserOptionsLoginButtonSigningIn).hide();
$(topnavUserOptionsLoginButtonCancel).show();
$(topnavuserOptionsLoginButtonLogin).show();
$(topnavUseroptionsLoginFieldsPassword).val('');
$(topnavUseroptionsLoginFieldsPassword).focus();
$(topnavUseroptionsLoginFieldsUsername).addClass('failedloginusername');
$(topnavUseroptionsLoginFieldsPassword).addClass('failedloginpassword');
$(topnavUserOptionsLoginForm).valid();
$(topnavUseroptionsLoginFieldsUsername).removeClass('failedloginusername');
$(topnavUseroptionsLoginFieldsPassword).removeClass('failedloginpassword');
}
});
};
$.validator.addMethod('failedloginusername', function(value, element) {
return false;
}, sakai.api.i18n.getValueForKey('INVALID_USERNAME_OR_PASSWORD'));
$.validator.addMethod('failedloginpassword', function(value, element) {
return false;
}, '');
var validateOpts = {
submitHandler: function(form) {
doLogin();
}
};
// Initialize the validate plug-in
sakai.api.Util.Forms.validate($(topnavUserOptionsLoginForm), validateOpts, true);
=======
$(topnavUserLoginButton).on('hover focus', addUserLoginValidation);
>>>>>>>
$(topnavUserLoginButton).on('hover focus', addUserLoginValidation);
<<<<<<<
$(window).scroll(function(ev) {
if ($(window).scrollTop() > 800) {
=======
$(window).on('scroll', function(ev) {
if ($(window).scrollTop() > 800) {
>>>>>>>
$(window).on('scroll', function(ev) {
if ($(window).scrollTop() > 800) {
<<<<<<<
$('#topnavigation_messages_container').live('click', function() {
if ($('#topnavigation_user_messages_container .s3d-dropdown-menu').is(':hidden')) {
sakai.api.Communication.getAllMessages('inbox', false, false, 1, 0, '_created', 'desc', function(success, data) {
=======
/////////////////////
// MESSAGES POP-UP //
/////////////////////
$("#topnavigation_messages_container").live("click", function(){
if($("#topnavigation_user_messages_container .s3d-dropdown-menu").is(":hidden")){
sakai.api.Communication.getAllMessages("inbox", false, false, 1, 0, "_created", "desc", function(success, data){
>>>>>>>
/////////////////////
// MESSAGES POP-UP //
/////////////////////
$('#topnavigation_messages_container').live('click', function() {
if ($('#topnavigation_user_messages_container .s3d-dropdown-menu').is(':hidden')) {
sakai.api.Communication.getAllMessages('inbox', false, false, 1, 0, '_created', 'desc', function(success, data) {
<<<<<<<
=======
addBinding();
>>>>>>> |
<<<<<<<
=======
// Error messages
var addToContactsError = addToContacts + '_error';
var addToContactsErrorMessage = addToContactsError + '_message';
var addToContactsErrorRequest = addToContactsError + '_request';
var addToContactsErrorNoTypeSelected = addToContactsError + '_noTypeSelected';
var addToContactsResponse = addToContacts + '_response';
>>>>>>>
<<<<<<<
=======
$(addToContactsResponse).text('');
>>>>>>>
<<<<<<<
var loadDialog = function(hash){
$("#addtocontacts_dialog_title").html($("#addtocontacts_dialog_title_template").html().replace("${user}", contactToAdd.displayName));
=======
var loadDialog = function(hash) {
$('#addtocontacts_dialog_title').html($('#addtocontacts_dialog_title_template').html().replace('${user}', sakai.api.Security.safeOutput(contactToAdd.displayName)));
>>>>>>>
var loadDialog = function(hash) {
$('#addtocontacts_dialog_title').html($('#addtocontacts_dialog_title_template').html().replace('${user}', sakai.api.Security.safeOutput(contactToAdd.displayName))); |
<<<<<<<
newjson.entry[0].manager = member;
var item = {
member: {
memberId: id,
memberName: name,
memberPicture: picture,
roleName: role
},
group: newjson.entry[0],
sakai: sakai
};
$("#recentmemberships_item_member_container").html(sakai.api.Util.TemplateRenderer("#recentmemberships_item_member_template", item));
break;
=======
if (id) {
newjson.entry[0].manager = member;
var item = {
member: {
memberId: id,
memberName: name,
memberPicture: picture,
roleName: role
},
group: newjson.entry[0]
};
$("#recentmemberships_item_member_container").html(sakai.api.Util.TemplateRenderer("#recentmemberships_item_member_template", item));
break;
}
>>>>>>>
if (id) {
newjson.entry[0].manager = member;
var item = {
member: {
memberId: id,
memberName: name,
memberPicture: picture,
roleName: role
},
group: newjson.entry[0],
sakai: sakai
};
$("#recentmemberships_item_member_container").html(sakai.api.Util.TemplateRenderer("#recentmemberships_item_member_template", item));
break;
} |
<<<<<<<
$.bbq.pushState({"mso": "desc"});
} else {
=======
$.bbq.pushState({"mso": "desc"});
} else if (sortSelection === "asc") {
>>>>>>>
$.bbq.pushState({"mso": "desc"});
} else if (sortSelection === "asc") {
<<<<<<<
$.bbq.pushState({"mso": "asc"});
=======
$.bbq.pushState({"mso": "asc"});
} else {
mymemberships.sortOrder = "modified";
$.bbq.pushState({"mso": "modified"});
>>>>>>>
$.bbq.pushState({"mso": "asc"});
} else {
mymemberships.sortOrder = "modified";
$.bbq.pushState({"mso": "modified"});
<<<<<<<
var checkAddingEnabled = function(){
if($(".mymemberships_select_group_checkbox:checked")[0]){
$("#mymemberships_addpeople_button").removeAttr("disabled");
} else {
$("#mymemberships_addpeople_button").attr("disabled", true);
$("#mymemberships_select_checkbox").removeAttr("checked");
}
};
=======
var updateMessageData = function(){
var idArr = [];
var titleArr = [];
$.each($(".mymemberships_select_group_checkbox:checked"), function(i, group){
idArr.push($(group).data("groupid"));
titleArr.push($(group).data("grouptitle"));
});
$("#mymemberships_message_button").attr("sakai-entityid", idArr);
$("#mymemberships_message_button").attr("sakai-entityname", titleArr);
};
>>>>>>>
var updateMessageData = function(){
var idArr = [];
var titleArr = [];
$.each($(".mymemberships_select_group_checkbox:checked"), function(i, group){
idArr.push($(group).data("groupid"));
titleArr.push($(group).data("grouptitle"));
});
$("#mymemberships_message_button").attr("sakai-entityid", idArr);
$("#mymemberships_message_button").attr("sakai-entityname", titleArr);
};
<<<<<<<
/////////////////////////////
// Initialization function //
/////////////////////////////
var addBinding = function(){
$(window).bind("hashchanged.mymemberships.sakai", function(){
render(sakai.api.Groups.getMemberships(sakai.data.me.groups));
});
$("#mymemberships_search_button").click(function(){
var q = $.trim($("#mymemberships_livefilter").val());
if (q !== currentQuery) {
$.bbq.pushState({"mq": q, "mp": 1});
currentQuery = q;
}
});
$mymemberships_show_list.click(function(){
$("#mymemberships_items").removeClass("s3d-search-results-grid");
$(".s3d-listview-options").find("div").removeClass("selected");
$(this).addClass("selected");
$(this).children().addClass("selected");
});
$mymemberships_show_grid.click(function(){
$("#mymemberships_items").addClass("s3d-search-results-grid");
$(".s3d-listview-options").find("div").removeClass("selected");
$(this).addClass("selected");
$(this).children().addClass("selected");
});
$("#mymemberships_livefilter").keyup(function(ev){
var q = $.trim($("#mymemberships_livefilter").val());
if (q !== currentQuery && ev.keyCode === 13) {
$.bbq.pushState({"mq": q, "mp": 1});
currentQuery = q;
}
return false;
});
$("#mymemberships_select_checkbox").change(function(){
if($(this).is(":checked")){
$("#mymemberships_addpeople_button").removeAttr("disabled");
$(".mymemberships_select_group_checkbox").attr("checked", true);
} else{
$("#mymemberships_addpeople_button").attr("disabled", true);
$(".mymemberships_select_group_checkbox").removeAttr("checked");
}
});
$(".mymemberships_select_group_checkbox").live("change", function(){
checkAddingEnabled();
});
=======
/////////////////////////////
// Initialization function //
/////////////////////////////
var addBinding = function(){
$(window).bind("hashchanged.mymemberships.sakai", function(){
if (sakai_global.profile.main.data.userid === sakai.data.me.user.userid) {
render(sakai.api.Groups.getMemberships(sakai.data.me.groups));
} else {
sakai.api.Server.loadJSON("/system/me", function(success, data){
render(sakai.api.Groups.getMemberships(data.groups));
}, { uid: sakai_global.profile.main.data.userid });
}
});
$("#mymemberships_search_button").click(function(){
var q = $.trim($("#mymemberships_livefilter").val());
if (q !== currentQuery) {
$.bbq.pushState({"mq": q, "mp": 1});
currentQuery = q;
}
});
$mymemberships_show_list.click(function(){
$("#mymemberships_items").removeClass("s3d-search-results-grid");
$("#mymemberships_listview_options").find("div").removeClass("selected");
$(this).addClass("selected");
$(this).children().addClass("selected");
});
$mymemberships_show_grid.click(function(){
$("#mymemberships_items").addClass("s3d-search-results-grid");
$("#mymemberships_listview_options").find("div").removeClass("selected");
$(this).addClass("selected");
$(this).children().addClass("selected");
});
$("#mymemberships_livefilter").keyup(function(ev){
var q = $.trim($("#mymemberships_livefilter").val());
if (q !== currentQuery && ev.keyCode === 13) {
$.bbq.pushState({"mq": q, "mp": 1});
currentQuery = q;
}
return false;
});
$("#mymemberships_select_checkbox").change(function(){
if($(this).is(":checked")){
$("#mymemberships_addpeople_button").removeAttr("disabled");
$(".mymemberships_select_group_checkbox").attr("checked", true);
} else{
$("#mymemberships_addpeople_button").attr("disabled", true);
$(".mymemberships_select_group_checkbox").removeAttr("checked");
}
checkAddingEnabled();
updateMessageData();
});
$(".mymemberships_select_group_checkbox").live("change", function(){
checkAddingEnabled();
updateMessageData();
});
>>>>>>>
/////////////////////////////
// Initialization function //
/////////////////////////////
var addBinding = function(){
$(window).bind("hashchanged.mymemberships.sakai", function(){
if (sakai_global.profile.main.data.userid === sakai.data.me.user.userid) {
render(sakai.api.Groups.getMemberships(sakai.data.me.groups));
} else {
sakai.api.Server.loadJSON("/system/me", function(success, data){
render(sakai.api.Groups.getMemberships(data.groups));
}, { uid: sakai_global.profile.main.data.userid });
}
});
$("#mymemberships_search_button").click(function(){
var q = $.trim($("#mymemberships_livefilter").val());
if (q !== currentQuery) {
$.bbq.pushState({"mq": q, "mp": 1});
currentQuery = q;
}
});
$mymemberships_show_list.click(function(){
$("#mymemberships_items").removeClass("s3d-search-results-grid");
$(".s3d-listview-options").find("div").removeClass("selected");
$(this).addClass("selected");
$(this).children().addClass("selected");
});
$mymemberships_show_grid.click(function(){
$("#mymemberships_items").addClass("s3d-search-results-grid");
$(".s3d-listview-options").find("div").removeClass("selected");
$(this).addClass("selected");
$(this).children().addClass("selected");
});
$("#mymemberships_livefilter").keyup(function(ev){
var q = $.trim($("#mymemberships_livefilter").val());
if (q !== currentQuery && ev.keyCode === 13) {
$.bbq.pushState({"mq": q, "mp": 1});
currentQuery = q;
}
return false;
});
$("#mymemberships_select_checkbox").change(function(){
if($(this).is(":checked")){
$("#mymemberships_addpeople_button").removeAttr("disabled");
$(".mymemberships_select_group_checkbox").attr("checked", true);
} else{
$("#mymemberships_addpeople_button").attr("disabled", true);
$(".mymemberships_select_group_checkbox").removeAttr("checked");
}
checkAddingEnabled();
updateMessageData();
});
$(".mymemberships_select_group_checkbox").live("change", function(){
checkAddingEnabled();
updateMessageData();
});
<<<<<<<
addBinding();
currentQuery = $.bbq.getState("mq") || "";
$("#mymemberships_sortby").val($.bbq.getState("mso") || "asc");
mymemberships.sortOrder = $.bbq.getState("mso") || "asc";
$("#mymemberships_livefilter").val(currentQuery);
=======
currentQuery = $.bbq.getState("mq") || "";
$("#mymemberships_sortby").val($.bbq.getState("mso") || "modified");
mymemberships.sortOrder = $.bbq.getState("mso") || "modified";
$("#mymemberships_livefilter").val(currentQuery);
>>>>>>>
currentQuery = $.bbq.getState("mq") || "";
$("#mymemberships_sortby").val($.bbq.getState("mso") || "modified");
mymemberships.sortOrder = $.bbq.getState("mso") || "modified";
$("#mymemberships_livefilter").val(currentQuery); |
<<<<<<<
creationComplete.members = true;
checkCreationComplete();
});
$.each(users, function(index, item){
sakai.api.Communication.sendMessage(item.user, sakai.data.me, sakai.api.i18n.getValueForKey("USER_HAS_ADDED_YOU_AS_A_ROLE_TO_THE_GROUP_GROUPNAME", "newcreategroup").replace("${user}", sakai.api.User.getDisplayName(sakai.data.me.profile)).replace("<\"Role\">", item.permission).replace("${groupName}", grouptitle), $(newcreategroupMembersMessage, $rootel).text().replace("<\"Role\">", item.permission).replace("<\"First Name\">", item.name), "message", false, false, true, "group_invitation",{"groupTitle":grouptitle,"groupId":groupid});
if(users.length - 1 == index){
creationComplete.message = true;
checkCreationComplete();
}
=======
$.each(users, function(index, item){
var subject = sakai.api.i18n.Widgets.getValueForKey("newcreategroup","","USER_HAS_ADDED_YOU_AS_A_ROLE_TO_THE_GROUP_GROUPNAME").replace("${user}", sakai.api.Security.unescapeHTML(sakai.api.User.getDisplayName(sakai.data.me.profile))).replace("<\"Role\">", item.permission).replace("${groupName}", grouptitle);
var body = $(newcreategroupMembersMessage, $rootel).text().replace("<\"Role\">", item.permission).replace("<\"First Name\">", item.name);
sakai.api.Communication.sendMessage(item.user, sakai.data.me, subject, body, "message", false, false, true, "group_invitation",{"groupTitle":grouptitle,"groupId":groupid});
if(users.length - 1 === index){
createGroupDocs(groupid, currentTemplate);
}
});
>>>>>>>
$.each(users, function(index, item){
var subject = sakai.api.i18n.getValueForKey("USER_HAS_ADDED_YOU_AS_A_ROLE_TO_THE_GROUP_GROUPNAME", "newcreategroup").replace("${user}", sakai.api.Security.unescapeHTML(sakai.api.User.getDisplayName(sakai.data.me.profile))).replace("<\"Role\">", item.permission).replace("${groupName}", grouptitle);
var body = $(newcreategroupMembersMessage, $rootel).text().replace("<\"Role\">", item.permission).replace("<\"First Name\">", item.name);
sakai.api.Communication.sendMessage(item.user, sakai.data.me, subject, body, "message", false, false, true, "group_invitation",{"groupTitle":grouptitle,"groupId":groupid});
if(users.length - 1 === index){
createGroupDocs(groupid, currentTemplate);
}
}); |
<<<<<<<
'largePictureUrl': p.profile.picture.large || '/ui/img/entities/user_icon_large.png',
'mediumPictureUrl': p.profile.picture.medium || '/ui/img/entities/user_icon_medium.png',
'smallPictureUrl': p.profile.picture.small || '/ui/img/entities/user_icon.png',
=======
'largePictureUrl': p.profile.mediumPicture || '/ui/img/entities/' + resourceType + '_icon_large.png',
'mediumPictureUrl': p.profile.mediumPicture || '/ui/img/entities/' + resourceType + '_icon_medium.png',
'smallPictureUrl': '/ui/img/entities/' + resourceType + '_icon.png',
>>>>>>>
'largePictureUrl': p.profile.picture.large || '/ui/img/entities/' + resourceType + '_icon_large.png',
'mediumPictureUrl': p.profile.picture.medium || '/ui/img/entities/' + resourceType + '_icon_medium.png',
'smallPictureUrl': p.profile.picture.small || '/ui/img/entities/' + resourceType + '_icon.png', |
<<<<<<<
data.oae = require('oae.core');
=======
data['oae'] = require('oae/api/oae.core');
// Make underscore available
data['_'] = require('underscore');
>>>>>>>
data['oae'] = require('oae.core');
// Make underscore available
data['_'] = require('underscore'); |
<<<<<<<
sakai.api.Groups.getMembers(renderObj.memberOfGroups.entry[membershipFetched].groupid, "query", function(success, data){
if(success){
renderObj.memberOfGroups.entry[membershipFetched].managers = [];
renderObj.memberOfGroups.entry[membershipFetched].members = [];
$.each(data["manager"].results, function(i, manager){
renderObj.memberOfGroups.entry[membershipFetched].managers.push(manager["rep:userId"] || manager.groupid);
});
$.each(data["member"].results, function(i, member){
renderObj.memberOfGroups.entry[membershipFetched].members.push(member["rep:userId"] || member.groupid);
});
membershipFetched++;
if(!(membershipFetched >= renderObj.memberOfGroups.entry.length)){
getMemberships();
} else {
selectAlreadyGroupMember();
membershipFetched = 0;
=======
if(renderObj.memberOfGroups.entry.length){
sakai.api.Groups.getMembers(renderObj.memberOfGroups.entry[membershipFetched].groupid, "query", function(success, data){
if(success){
renderObj.memberOfGroups.entry[membershipFetched].managers = [];
renderObj.memberOfGroups.entry[membershipFetched].members = [];
$.each(data["__MSG__MANAGER__"].results, function(i, manager){
renderObj.memberOfGroups.entry[membershipFetched].managers.push(manager["rep:userId"] || manager.groupid);
});
$.each(data["__MSG__MEMBER__"].results, function(i, member){
renderObj.memberOfGroups.entry[membershipFetched].members.push(member["rep:userId"] || member.groupid);
});
membershipFetched++;
if(!(membershipFetched >= renderObj.memberOfGroups.entry.length)){
getMemberships();
} else {
selectAlreadyGroupMember();
membershipFetched = 0;
}
>>>>>>>
if(renderObj.memberOfGroups.entry.length){
sakai.api.Groups.getMembers(renderObj.memberOfGroups.entry[membershipFetched].groupid, "query", function(success, data){
if(success){
renderObj.memberOfGroups.entry[membershipFetched].managers = [];
renderObj.memberOfGroups.entry[membershipFetched].members = [];
$.each(data["manager"].results, function(i, manager){
renderObj.memberOfGroups.entry[membershipFetched].managers.push(manager["rep:userId"] || manager.groupid);
});
$.each(data["member"].results, function(i, member){
renderObj.memberOfGroups.entry[membershipFetched].members.push(member["rep:userId"] || member.groupid);
});
membershipFetched++;
if(!(membershipFetched >= renderObj.memberOfGroups.entry.length)){
getMemberships();
} else {
selectAlreadyGroupMember();
membershipFetched = 0;
} |
<<<<<<<
var addNewElement = function(event, addedElement){
var $row = $(addedElement).parents(".contentauthoring_table_row.contentauthoring_cell_container_row");
if (addedElement.hasClass("inserterbar_widget_draggable")){
var type = addedElement.attr("data-element-type");
// Generate unique id
var id = sakai.api.Util.generateWidgetId();
// Replace item
var element = sakai.api.Util.TemplateRenderer("contentauthoring_widget_template", {
"id": id,
"type": type,
"template": "cell",
"settingsoverridden": false,
"sakai": sakai
});
addedElement.replaceWith($(element));
if (sakai.widgets[type].hasSettings){
// Load edit mode
isEditingNewElement = true;
editModeFullScreen(id, type);
} else {
sakai.api.Widgets.widgetLoader.insertWidgets("contentauthoring_widget", false, STORE_PATH);
}
setActions();
};
=======
var addNewElement = function(event, addedElement, clickedElement){
if(!clickedElement){
var $row = $(addedElement).parents(".contentauthoring_table_row.contentauthoring_cell_container_row");
if (addedElement.hasClass("inserterbar_widget_draggable")){
var type = addedElement.attr("data-element-type");
// Generate unique id
var id = sakai.api.Util.generateWidgetId();
// Replace item
var element = sakai.api.Util.TemplateRenderer("contentauthoring_widget_template", {
"id": id,
"type": type,
"template": "cell",
"settingsoverridden": false
});
addedElement.replaceWith($(element));
if (type !== "htmlblock" && type !== "pagetitle"){
// Load edit mode
isEditingNewElement = true;
editModeFullScreen(id, type);
} else {
sakai.api.Widgets.widgetLoader.insertWidgets("contentauthoring_widget", false, STORE_PATH);
}
setActions();
};
} else {
var $row = $(addedElement);
if (clickedElement.hasClass("inserterbar_widget_draggable")){
var type = clickedElement.attr("data-element-type");
// Generate unique id
var id = sakai.api.Util.generateWidgetId();
// Replace item
var element = sakai.api.Util.TemplateRenderer("contentauthoring_widget_template", {
"id": id,
"type": type,
"template": "cell",
"settingsoverridden": false
});
$row.find(".contentauthoring_cell_content:last").append($(element));
if (type !== "htmlblock" && type !== "pagetitle"){
// Load edit mode
isEditingNewElement = true;
editModeFullScreen(id, type);
} else {
sakai.api.Widgets.widgetLoader.insertWidgets("contentauthoring_widget", false, STORE_PATH);
}
checkColumnsEmpty();
setActions();
};
}
>>>>>>>
var addNewElement = function(event, addedElement, clickedElement){
if(!clickedElement){
var $row = $(addedElement).parents(".contentauthoring_table_row.contentauthoring_cell_container_row");
if (addedElement.hasClass("inserterbar_widget_draggable")){
var type = addedElement.attr("data-element-type");
// Generate unique id
var id = sakai.api.Util.generateWidgetId();
// Replace item
var element = sakai.api.Util.TemplateRenderer("contentauthoring_widget_template", {
"id": id,
"type": type,
"template": "cell",
"settingsoverridden": false,
"sakai": sakai
});
addedElement.replaceWith($(element));
if (sakai.widgets[type].hasSettings){
// Load edit mode
isEditingNewElement = true;
editModeFullScreen(id, type);
} else {
sakai.api.Widgets.widgetLoader.insertWidgets("contentauthoring_widget", false, STORE_PATH);
}
setActions();
};
} else {
var $row = $(addedElement);
if (clickedElement.hasClass("inserterbar_widget_draggable")){
var type = clickedElement.attr("data-element-type");
// Generate unique id
var id = sakai.api.Util.generateWidgetId();
// Replace item
var element = sakai.api.Util.TemplateRenderer("contentauthoring_widget_template", {
"id": id,
"type": type,
"template": "cell",
"settingsoverridden": false,
"sakai": sakai
});
$row.find(".contentauthoring_cell_content:last").append($(element));
if (sakai.widgets[type].hasSettings){
// Load edit mode
isEditingNewElement = true;
editModeFullScreen(id, type);
} else {
sakai.api.Widgets.widgetLoader.insertWidgets("contentauthoring_widget", false, STORE_PATH);
}
checkColumnsEmpty();
setActions();
};
} |
<<<<<<<
var permissions = sakai.config.Permissions.Collections.defaultaccess;
sakai.api.Content.Collections.createCollection(title, '', permissions, [], contentToAdd, [], function() {
=======
var permissions = 'public';
sakai.api.Content.Collections.createCollection(title, '', permissions, [], contentToAdd, [], function(success, path) {
sakai.api.Server.loadJSON('/p/' + path + '.json', function(success, collection) {
if (success) {
$(window).trigger('done.newaddcontent.sakai', [[collection], 'user']);
}
});
>>>>>>>
var permissions = sakai.config.Permissions.Collections.defaultaccess;
sakai.api.Content.Collections.createCollection(title, '', permissions, [], contentToAdd, [], function(success, path) {
sakai.api.Server.loadJSON('/p/' + path + '.json', function(success, collection) {
if (success) {
$(window).trigger('done.newaddcontent.sakai', [[collection], 'user']);
}
}); |
<<<<<<<
'jquery.notify': 'vendor/js/jquery-plugins/jquery.bootstrap.notify.oae-edited',
=======
>>>>>>> |
<<<<<<<
var docData = {};
$.each(widgetData.items, function(index, value) {
var placement = "ecDocViewer" + tuid + value["jcr:name"] + index;
widgetData.items[index].placement = placement;
docData[placement] = {
data : value.fullresult,
url : window.location.protocol + '//' + window.location.host + "/p/" + docData['jrc:name']
};
});
=======
// boolean are return as string from ajax call so change back to boolean value
widgetData.download = widgetData.download === "true";
widgetData.name = widgetData.name === "true";
widgetData.details = widgetData.details === "true";
>>>>>>>
var docData = {};
$.each(widgetData.items, function(index, value) {
var placement = "ecDocViewer" + tuid + value["jcr:name"] + index;
widgetData.items[index].placement = placement;
docData[placement] = {
data : value.fullresult,
url : window.location.protocol + '//' + window.location.host + "/p/" + docData['jrc:name']
};
});
// boolean are return as string from ajax call so change back to boolean value
widgetData.download = widgetData.download === "true";
widgetData.name = widgetData.name === "true";
widgetData.details = widgetData.details === "true"; |
<<<<<<<
// Autosize the new comment field when a users enters text
$('#comments-new-comment').autosize();
// Focuses the new comment field when the comment clip is clicked
$(document).on('click', '.comments-focus-new-comment', function() {
$('.comments-new-comment-form textarea').focus();
});
}
=======
// Focuses the new comment field when the comment clip is clicked
$(document).on('click', '.comments-focus-new-comment', function() {
$('.comments-new-comment-form textarea').focus();
});
>>>>>>>
// Autosize the new comment field when a users enters text
$('#comments-new-comment').autosize();
// Focuses the new comment field when the comment clip is clicked
$(document).on('click', '.comments-focus-new-comment', function() {
$('.comments-new-comment-form textarea').focus();
}); |
<<<<<<<
$('.modal-body > div:visible', $rootel).hide();
$('#createlink-modal .modal-content > .modal-footer', $rootel).hide();
=======
$('#createlink-modal .modal-body > div:visible', $rootel).hide();
$('#createlink-modal > .modal-footer', $rootel).hide();
>>>>>>>
$('#createlink-modal .modal-body > div:visible', $rootel).hide();
$('#createlink-modal .modal-content > .modal-footer', $rootel).hide();
<<<<<<<
$('#createlink-modal .modal-content > .modal-footer', $rootel).show();
$('.modal-body > div#createlink-overview-container', $rootel).show();
=======
$('#createlink-modal > .modal-footer', $rootel).show();
$('#createlink-modal .modal-body > div#createlink-overview-container', $rootel).show();
>>>>>>>
$('#createlink-modal .modal-content > .modal-footer', $rootel).show();
$('#createlink-modal .modal-body > div#createlink-overview-container', $rootel).show(); |
<<<<<<<
this.switchType = function(selection, data) {
if (!selection.isPropertySelection()) {
return;
}
// only text nodes can be changed at the moment
var path = selection.start.path;
var offset = selection.start.offset;
var comp = this.container.getComponent(path);
var node = this.document.get(comp.rootId);
if (!(node.isInstanceOf('text'))) {
return;
}
var pos = this.container.getPosition(node.id);
var tx = this.document.startTransaction({ selection: selection });
tx.selection = selection;
var container = tx.get(this.container.id);
try {
// create a new node
var newNode = {
id: Substance.uuid(data.type),
type: data.type,
content: node.content
};
Substance.extend(newNode, data);
var newPath = [newNode.id, 'content'];
tx.create(newNode);
Annotations.transferAnnotations(tx, path, 0, newPath, 0);
this._deleteNodeWithId(tx, node.id);
container.show(newNode.id, pos);
tx.selection = Selection.create(newPath, offset);
tx.save({ selection: tx.selection });
this.selection = tx.selection;
} finally {
tx.cleanup();
}
};
=======
this.switchType = function(selection, newType, data) {
if (!selection.isPropertySelection()) {
return;
}
// only text nodes can be changed at the moment
var path = selection.start.path;
var offset = selection.start.offset;
var comp = this.container.getComponent(path);
var node = this.document.get(comp.rootId);
if (!(node.isInstanceOf('text')) || node.type === newType) {
return;
}
var pos = this.container.getPosition(node.id);
var tx = this.document.startTransaction({ selection: selection });
tx.selection = selection;
var container = tx.get(this.container.id);
try {
// create a new node
var newNode = {
id: Substance.uuid(newType),
type: newType,
content: node.content
};
Substance.extend(newNode, data);
var newPath = [newNode.id, 'content'];
tx.create(newNode);
Annotations.transferAnnotations(tx, path, 0, newPath, 0);
this._deleteNodeWithId(tx, node.id);
container.show(newNode.id, pos);
tx.selection = Selection.create(newPath, offset);
tx.save({ selection: tx.selection });
this.selection = tx.selection;
} finally {
tx.cleanup();
}
};
>>>>>>>
this.switchType = function(selection, data) {
if (!selection.isPropertySelection()) {
return;
}
// only text nodes can be changed at the moment
var path = selection.start.path;
var offset = selection.start.offset;
var comp = this.container.getComponent(path);
var node = this.document.get(comp.rootId);
if (!(node.isInstanceOf('text'))) {
return;
}
var pos = this.container.getPosition(node.id);
var tx = this.document.startTransaction({ selection: selection });
tx.selection = selection;
var container = tx.get(this.container.id);
try {
// create a new node
var newNode = {
id: Substance.uuid(data.type),
type: data.type,
content: node.content
};
Substance.extend(newNode, data);
var newPath = [newNode.id, 'content'];
tx.create(newNode);
Annotations.transferAnnotations(tx, path, 0, newPath, 0);
this._deleteNodeWithId(tx, node.id);
container.show(newNode.id, pos);
tx.selection = Selection.create(newPath, offset);
tx.save({ selection: tx.selection });
this.selection = tx.selection;
} finally {
tx.cleanup();
}
};
<<<<<<<
this._deleteNodeWithId(tx, nodeSel.node.id);
}
};
this._deleteNodeWithId = function(tx, nodeId) {
var container = tx.get(this.container.id);
var node = tx.get(nodeId);
// only hide a node if it is managed externally
// remove all associated annotations
var annos = tx.getIndex('annotations').get(nodeId);
var i;
for (i = 0; i < annos.length; i++) {
tx.delete(annos[i].id);
}
// We need to transfer anchors of ContainerAnnotations
// to previous or next node
var anchors = tx.getIndex('container-annotations').get(nodeId);
for (i = 0; i < anchors.length; i++) {
var anchor = anchors[i];
// Note: during the course of this loop we might have deleted the node already
// so, do not do it again
if (!tx.get(anchor.id)) continue;
var comp = container.getComponent(anchor.path);
if (anchor.isStart) {
if (comp.hasNext()) {
tx.set([anchor.id, 'startPath'], comp.next.path);
tx.set([anchor.id, 'startOffset'], 0);
} else {
tx.delete(anchor.id);
}
} else {
if (comp.hasPrevious()) {
var prevLength = tx.get(comp.previous.path).length;
tx.set([anchor.id, 'endPath'], comp.previous.path);
tx.set([anchor.id, 'endOffset'], prevLength);
=======
this._deleteNodeWithId(tx, nodeSel.node.id);
}
};
this._deleteNodeWithId = function(tx, nodeId) {
var container = tx.get(this.container.id);
var node = tx.get(nodeId);
// only hide a node if it is managed externally
if (node.isExternal()) {
container.hide(nodeId);
return;
}
// remove all associated annotations
var annos = tx.getIndex('annotations').get(nodeId);
var i;
for (i = 0; i < annos.length; i++) {
tx.delete(annos[i].id);
}
// We need to transfer anchors of ContainerAnnotations
// to previous or next node
var anchors = tx.getIndex('container-annotations').get(nodeId);
for (i = 0; i < anchors.length; i++) {
var anchor = anchors[i];
// Note: during the course of this loop we might have deleted the node already
// so, do not do it again
if (!tx.get(anchor.id)) continue;
var comp = container.getComponent(anchor.path);
if (anchor.isStart) {
if (comp.hasNext()) {
tx.set([anchor.id, 'startPath'], comp.next.path);
tx.set([anchor.id, 'startOffset'], 0);
} else {
tx.delete(anchor.id);
}
} else {
if (comp.hasPrevious()) {
var prevLength = tx.get(comp.previous.path).length;
tx.set([anchor.id, 'endPath'], comp.previous.path);
tx.set([anchor.id, 'endOffset'], prevLength);
>>>>>>>
this._deleteNodeWithId(tx, nodeSel.node.id);
}
};
this._deleteNodeWithId = function(tx, nodeId) {
var container = tx.get(this.container.id);
var node = tx.get(nodeId);
// remove all associated annotations
var annos = tx.getIndex('annotations').get(nodeId);
var i;
for (i = 0; i < annos.length; i++) {
tx.delete(annos[i].id);
}
// We need to transfer anchors of ContainerAnnotations
// to previous or next node
var anchors = tx.getIndex('container-annotations').get(nodeId);
for (i = 0; i < anchors.length; i++) {
var anchor = anchors[i];
// Note: during the course of this loop we might have deleted the node already
// so, do not do it again
if (!tx.get(anchor.id)) continue;
var comp = container.getComponent(anchor.path);
if (anchor.isStart) {
if (comp.hasNext()) {
tx.set([anchor.id, 'startPath'], comp.next.path);
tx.set([anchor.id, 'startOffset'], 0);
} else {
tx.delete(anchor.id);
}
} else {
if (comp.hasPrevious()) {
var prevLength = tx.get(comp.previous.path).length;
tx.set([anchor.id, 'endPath'], comp.previous.path);
tx.set([anchor.id, 'endOffset'], prevLength); |
<<<<<<<
log({err: 'couch', body: parsed, headers: rh});
=======
if(verbose) {
console.log({err: 'couch', body: parsed, headers: rh});
}
if (!parsed) { parsed = {}; } // if HEAD request, body will be undefined
>>>>>>>
log({err: 'couch', body: parsed, headers: rh});
if (!parsed) { parsed = {}; } // if HEAD request, body will be undefined |
<<<<<<<
'js/ConstraintManager/ConstraintManager',
'js/SnapInterpreter'], function (logManager,
=======
'js/ConstraintManager/ConstraintManager',
'js/Utils/InterpreterManager'], function (logManager,
>>>>>>>
'js/ConstraintManager/ConstraintManager',
'js/SnapInterpreter',
'js/Utils/InterpreterManager'], function (logManager,
<<<<<<<
ConstraintManager,
SnapInterpreter) {
=======
ConstraintManager,
InterpreterManager) {
>>>>>>>
ConstraintManager,
SnapInterpreter,
InterpreterManager) {
<<<<<<<
new SnapInterpreter(client);
projectToLoad = projectToLoad === "" ? CONFIG.project : projectToLoad;
client.connectToDatabaseAsync({'open': projectToLoad,
'project': projectToLoad}, function (err) {
if (err) {
logger.error(err);
} else {
if (commitToLoad && commitToLoad !== "") {
client.selectCommitAsync(commitToLoad, function (err) {
if (err) {
=======
if(createNewProject && projectToLoad !== ""){
client.connectToDatabaseAsync({},function(err){
if(err){
logger.error(err);
} else {
client.getAvailableProjectsAsync(function(err,projectArray){
if(err){
>>>>>>>
new SnapInterpreter(client);
if(createNewProject && projectToLoad !== ""){
client.connectToDatabaseAsync({},function(err){
if(err){
logger.error(err);
} else {
client.getAvailableProjectsAsync(function(err,projectArray){
if(err){ |
<<<<<<<
],function(
LogManager,
Storage,
FS,
Express,
GMEAUTH,
VFAUTH,
SSTORE,
Passport,
PassGoogle,
REST,
CANON,
Path,
Http,
Https,
OS,
mime,
BlobMetadata,
BlobFSBackend,
BlobS3Backend,
BlobServer,
GUID
){
'use strict';
function StandAloneServer(CONFIG){
=======
], function (LogManager,
Storage,
FS,
Express,
GMEAUTH,
VFAUTH,
SSTORE,
Passport,
PassGoogle,
REST,
CANON,
Path,
Http,
Https,
OS,
mime,
BlobMetadata,
BlobFSBackend,
BlobS3Backend,
BlobServer,
GUID) {
'use strict';
function StandAloneServer(CONFIG) {
>>>>>>>
], function (LogManager,
Storage,
FS,
Express,
GMEAUTH,
VFAUTH,
SSTORE,
Passport,
PassGoogle,
REST,
CANON,
Path,
Http,
Https,
OS,
mime,
BlobMetadata,
BlobFSBackend,
BlobS3Backend,
BlobServer,
GUID) {
'use strict';
'use strict';
function StandAloneServer(CONFIG) {
<<<<<<<
function getRedirectUrlParameter(req){
//return '?redirect=' + URL.addSpecialChars(req.url);
return '?redirect=' + encodeURIComponent(req.url);
}
function redirectUrl(req,res){
if(req.query.redirect){
//res.redirect(URL.removeSpecialChars(req.query.redirect));
res.redirect(decodeURIComponent(req.query.redirect));
=======
function storeQueryString(req, res, next) {
if (req && req.session && req.session.originalQuery === undefined) {
var index = req.url.indexOf('?');
req.session.originalQuery = index === -1 ? "" : req.url.substring(index);
}
if (req && req.session && req.session.originalUrl === undefined) {
req.session.originalUrl = req.url;
}
if (typeof CONFIG.defaultUser === 'string' && req.session.authenticated !== true) {
//TODO: this has do be done in some other way
if (req.param('user') === CONFIG.defaultUser) {
req.session.udmId = CONFIG.defaultUser;
req.session.authenticated = true;
req.session.userType = 'GME';
//probably this is the last step in authentication so we should set cookies as well
res.cookie('webgme', req.session.udmId);
next();
} else {
next();
}
>>>>>>>
function getRedirectUrlParameter(req){
//return '?redirect=' + URL.addSpecialChars(req.url);
return '?redirect=' + encodeURIComponent(req.url);
}
function redirectUrl(req,res){
if(req.query.redirect){
//res.redirect(URL.removeSpecialChars(req.query.redirect));
res.redirect(decodeURIComponent(req.query.redirect));
<<<<<<<
__app.get('/',checkVF,ensureAuthenticated,function(req,res){
=======
__app.get('/', storeQueryString, checkVF, ensureAuthenticated, function (req, res) {
>>>>>>>
__app.get('/',checkVF,ensureAuthenticated,function(req,res){
<<<<<<<
__app.get('/login',function(req,res){
=======
__app.get('/login'/*,storeQueryString*/, function (req, res) {
>>>>>>>
__app.get('/login',function(req,res){
<<<<<<<
__app.post('/login',__gmeAuth.authenticate,function(req,res){
res.cookie('webgme',req.session.udmId);
redirectUrl(req,res);
=======
__app.post('/login'/*,storeQueryString*/, __gmeAuth.authenticate, function (req, res) {
res.cookie('webgme', req.session.udmId);
//res.redirect('/'+req.session.originalQuery || "");
res.redirect(req.session.originalUrl);
>>>>>>>
__app.post('/login',__gmeAuth.authenticate,function(req,res){
res.cookie('webgme', req.session.udmId);
redirectUrl(req,res);
<<<<<<<
__app.get('/gettoken',ensureAuthenticated,function(req,res){
if(CONFIG.secureREST == true){
__gmeAuth.getToken(req.session.id,function(err,token){
if(err){
=======
__app.get('/gettoken', storeQueryString, ensureAuthenticated, function (req, res) {
if (CONFIG.secureREST == true) {
__gmeAuth.getToken(req.session.id, function (err, token) {
if (err) {
>>>>>>>
__app.get('/gettoken',ensureAuthenticated,function(req,res){
if (CONFIG.secureREST == true) {
__gmeAuth.getToken(req.session.id, function (err, token) {
if (err) {
<<<<<<<
__app.get('/rest/:command',ensureAuthenticated,checkREST,function(req,res){
__REST.initialize(function(err){
if(err){
=======
__app.get('/rest/:command', storeQueryString, ensureAuthenticated, checkREST, function (req, res) {
__REST.initialize(function (err) {
if (err) {
>>>>>>>
__app.get('/rest/:command',ensureAuthenticated,checkREST,function(req,res){
__REST.initialize(function (err) {
if (err) { |
<<<<<<<
__storage.close(function (err1) {
var numDestroyedSockets = 0;
// request server close - do not accept any new connections.
// first we have to request the close then we can destroy the sockets.
__httpServer.close(function (err2) {
logger.info('http server closed');
callback(err1 || err2 || null);
});
=======
__storage.close();
//kill all remaining workers
__workerManager.stop();
// request server close - do not accept any new connections.
// first we have to request the close then we can destroy the sockets.
__httpServer.close(function (err) {
logger.info('http server closed');
callback(err);
});
>>>>>>>
__storage.close(function (err1) {
var numDestroyedSockets = 0;
//kill all remaining workers
__workerManager.stop();
// request server close - do not accept any new connections.
// first we have to request the close then we can destroy the sockets.
__httpServer.close(function (err2) {
logger.info('http server closed');
callback(err1 || err2 || null);
});
<<<<<<<
logger = mainLogger.fork('server:standalone');
self.logger = logger;
=======
self.logger = logger; //TODO: is this used?
>>>>>>>
logger = mainLogger.fork('server:standalone'); |
<<<<<<<
/*globals define*/
/*
* @author rkereskenyi / https://github/rkereskenyi
=======
/*globals define*/
/**
* @author rkereskenyi / https://github.com/rkereskenyi
>>>>>>>
/*globals define*/
/**
* @author rkereskenyi / https://github.com/rkereskenyi
<<<<<<<
=======
>>>>>>> |
<<<<<<<
import { MAX_RESULTS } from './index.js';
=======
import { getFilteredSuggestions } from 'lib/utils.js';
import { MAX_RESULTS } from './';
>>>>>>>
import { getFilteredSuggestions } from 'lib/utils.js';
import { MAX_RESULTS } from './index.js'; |
<<<<<<<
_users[guid].PATTERNS = JSON.parse(JSON.stringify(patterns));
if(!error){
userEvents(guid,[]);
=======
if(_users[guid]){
_users[guid].PATTERNS = patterns;
if(!error){
userEvents(guid,[]);
}
>>>>>>>
if(_users[guid]){
_users[guid].PATTERNS = JSON.parse(JSON.stringify(patterns));
if(!error){
userEvents(guid,[]);
} |
<<<<<<<
_socket = io.connect(/*_serverlocation*/);
/*socket handling functions*/
=======
_socket = io.connect( _serverlocation );
>>>>>>>
_socket = io.connect( _serverlocation );
/*socket handling functions*/
<<<<<<<
_socket.emit('connectToBranch',"basetest");
}
=======
_socket.emit('connectToBranch',"testtwo");
>>>>>>>
_socket.emit('connectToBranch',"testtwo");
} |
<<<<<<<
'Shibboleth': /<form action="\/idp\/Authn\/UserPassword" method="post">/,
'Django': /<input[^>]*name=[\"']csrfmiddlewaretoken[\"'][^>]*>/
=======
'Shibboleth': /<form action="\/idp\/Authn\/UserPassword" method="post">/,
'React': /<[^>]+data-react/
>>>>>>>
'Shibboleth': /<form action="\/idp\/Authn\/UserPassword" method="post">/,
'Django': /<input[^>]*name=[\"']csrfmiddlewaretoken[\"'][^>]*>/
'React': /<[^>]+data-react/ |
<<<<<<<
})
test('includes single property functions', () => {
const parser = system({
color: true,
backgroundColor: true,
width: true,
})
const a = parser.color({ color: 'tomato', backgroundColor: 'nope' })
const b = parser.width({ width: '100%', color: 'tomato', backgroundColor: 'nope' })
expect(a).toEqual({ color: 'tomato' })
expect(b).toEqual({ width: '100%' })
=======
})
test('parser configs can be composed manually', () => {
const color = system({ color: true, backgroundColor: true })
const layout = system({ width: true, height: true })
const composed = system({ ...color.config, ...layout.config })
const style = composed({
color: 'tomato',
backgroundColor: 'black',
width: '100%',
})
expect(style).toEqual({
color: 'tomato',
backgroundColor: 'black',
width: '100%',
})
>>>>>>>
})
test('includes single property functions', () => {
const parser = system({
color: true,
backgroundColor: true,
width: true,
})
const a = parser.color({ color: 'tomato', backgroundColor: 'nope' })
const b = parser.width({ width: '100%', color: 'tomato', backgroundColor: 'nope' })
expect(a).toEqual({ color: 'tomato' })
expect(b).toEqual({ width: '100%' })
})
test('parser configs can be composed manually', () => {
const color = system({ color: true, backgroundColor: true })
const layout = system({ width: true, height: true })
const composed = system({ ...color.config, ...layout.config })
const style = composed({
color: 'tomato',
backgroundColor: 'black',
width: '100%',
})
expect(style).toEqual({
color: 'tomato',
backgroundColor: 'black',
width: '100%',
}) |
<<<<<<<
import PropTypes from 'prop-types'
// utils
const noop = n => n
export const propTypes = {
numberOrString: PropTypes.oneOfType([
PropTypes.number,
PropTypes.string,
]),
responsive: PropTypes.oneOfType([
PropTypes.number,
PropTypes.string,
PropTypes.array,
]),
}
export const defaultBreakpoints = [ 40, 52, 64, ].map(n => n + 'em')
export const is = n => n !== undefined && n !== null
export const num = n => typeof n === 'number' && !isNaN(n)
export const px = n => num(n) ? n + 'px' : n
export const get = (obj, ...paths) => paths.join('.').split('.')
.reduce((a, b) => (a && a[b]) ? a[b] : null, obj)
export const themeGet = (paths, fallback) => props => get(props.theme, paths) || fallback
export const cloneFunc = fn => (...args) => fn(...args)
export const merge = (a, b) => Object.assign({}, a, b, Object
.keys(b || {}).reduce((obj, key) =>
Object.assign(obj, {
[key]: a[key] !== null && typeof a[key] === 'object'
? merge(a[key], b[key])
: b[key]
}),
{}))
export const compose = (...funcs) => {
const fn = props => funcs
.map(fn => fn(props))
.filter(Boolean)
.reduce(merge, {})
fn.propTypes = funcs
.map(fn => fn.propTypes)
.reduce(merge, {})
return fn
}
export const createMediaQuery = n => `@media screen and (min-width: ${n})`
export const style = ({
prop,
cssProperty,
key,
getter,
transformValue,
scale: defaultScale = {}
}) => {
const css = cssProperty || prop
const transform = transformValue || getter || noop
const fn = props => {
const val = props[prop]
if (!is(val)) return null
const scale = get(props.theme, key) || defaultScale
const style = n => is(n) ? ({
[css]: transform(
get(scale, n) || n
)
}) : null
if (!Array.isArray(val)) {
return style(val)
}
// how to hoist this up??
const breakpoints = [
null,
...(get(props.theme, 'breakpoints') || defaultBreakpoints)
.map(createMediaQuery)
]
let styles = {}
for (let i = 0; i < val.length; i++) {
const media = breakpoints[i]
if (!media) {
styles = style(val[i])
continue
}
const rule = style(val[i])
if (!rule) continue
styles[media] = rule
}
return styles
}
fn.propTypes = { [prop]: cloneFunc(propTypes.responsive) }
fn.propTypes[prop].meta = {
prop,
themeKey: key,
styleType: 'responsive'
}
return fn
}
export const getWidth = n => !num(n) || n > 1 ? px(n) : (n * 100) + '%'
// variant
export const variant = ({
key,
prop = 'variant'
}) => {
const fn = (props) => get(props.theme, key, props[prop]) || null
fn.propTypes = {
[prop]: propTypes.numberOrString
}
return fn
}
export const util = {
propTypes,
defaultBreakpoints,
is,
num,
px,
get,
themeGet,
cloneFunc,
merge,
compose,
createMediaQuery,
style,
}
// space
const isNegative = n => n < 0
const REG = /^[mp][trblxy]?$/
const properties = {
m: 'margin',
p: 'padding'
}
const directions = {
t: 'Top',
r: 'Right',
b: 'Bottom',
l: 'Left',
x: [ 'Left', 'Right' ],
y: [ 'Top', 'Bottom' ],
}
const getProperties = key => {
const [ a, b ] = key.split('')
const property = properties[a]
const direction = directions[b] || ''
return Array.isArray(direction)
? direction.map(dir => property + dir)
: [ property + direction ]
}
const getValue = scale => n => {
if (!num(n)) {
return scale[n] || n
}
const abs = Math.abs(n)
const neg = isNegative(n)
const value = scale[abs] || abs
if (!num(value)) {
return neg ? '-' + value : value
}
return px(value * (neg ? -1 : 1))
}
const defaultScale = [
0, 4, 8, 16, 32, 64, 128, 256, 512
]
export const space = props => {
const keys = Object.keys(props)
.filter(key => REG.test(key))
.sort()
const scale = get(props.theme, 'space') || defaultScale
const getStyle = getValue(scale)
return keys
.map(key => {
const value = props[key]
const properties = getProperties(key)
const style = n => is(n) ? properties.reduce((a, prop) => ({
...a,
[prop]: getStyle(n)
}), {}) : null
if (!Array.isArray(value)) {
return style(value)
}
const breakpoints = [
null,
...(get(props.theme, 'breakpoints') || defaultBreakpoints)
.map(createMediaQuery)
]
let styles = {}
for (let i = 0; i < value.length; i++) {
const media = breakpoints[i]
if (!media) {
styles = style(value[i])
continue
}
const rule = style(value[i])
if (!rule) continue
styles[media] = rule
}
return styles
})
.reduce(merge, {})
}
space.propTypes = {
m: cloneFunc(propTypes.responsive),
mt: cloneFunc(propTypes.responsive),
mr: cloneFunc(propTypes.responsive),
mb: cloneFunc(propTypes.responsive),
ml: cloneFunc(propTypes.responsive),
mx: cloneFunc(propTypes.responsive),
my: cloneFunc(propTypes.responsive),
p: cloneFunc(propTypes.responsive),
pt: cloneFunc(propTypes.responsive),
pr: cloneFunc(propTypes.responsive),
pb: cloneFunc(propTypes.responsive),
pl: cloneFunc(propTypes.responsive),
px: cloneFunc(propTypes.responsive),
py: cloneFunc(propTypes.responsive)
}
const meta = prop => ({
prop,
themeKey: 'space',
styleType: 'responsive'
})
Object.keys(space.propTypes).forEach(prop => {
space.propTypes[prop].meta = meta(prop)
})
// styles
export const width = style({
prop: 'width',
transformValue: getWidth
})
export const fontSize = style({
prop: 'fontSize',
key: 'fontSizes',
transformValue: px,
scale: [
12,
14,
16,
20,
24,
32,
48,
64,
72
]
})
export const textColor = style({
prop: 'color',
key: 'colors',
})
export const bgColor = style({
prop: 'bg',
cssProperty: 'backgroundColor',
key: 'colors'
})
export const color = compose(
textColor,
bgColor
)
// typography
export const fontFamily = style({
prop: 'fontFamily',
key: 'fonts'
})
export const textAlign = style({
prop: 'textAlign'
})
export const lineHeight = style({
prop: 'lineHeight',
key: 'lineHeights'
})
export const fontWeight = style({
prop: 'fontWeight',
key: 'fontWeights'
})
export const letterSpacing = style({
prop: 'letterSpacing',
key: 'letterSpacings',
transformValue: px
})
// layout
export const display = style({
prop: 'display'
})
export const maxWidth = style({
prop: 'maxWidth',
key: 'maxWidths',
transformValue: px
})
export const minWidth = style({
prop: 'minWidth',
key: 'minWidths',
transformValue: px
})
export const height = style({
prop: 'height',
key: 'heights',
transformValue: px
})
export const maxHeight = style({
prop: 'maxHeight',
key: 'maxHeights',
transformValue: px
})
export const minHeight = style({
prop: 'minHeight',
key: 'minHeights',
transformValue: px
})
export const sizeWidth = style({
prop: 'size',
cssProperty: 'width',
transformValue: px
})
export const sizeHeight = style({
prop: 'size',
cssProperty: 'height',
transformValue: px
})
export const size = compose(
sizeHeight,
sizeWidth
)
=======
export * as util from "./util"
export * as styles from "./styles"
export { style, themeGet, merge, compose } from "./util"
>>>>>>>
import PropTypes from 'prop-types'
// utils
const noop = n => n
export const propTypes = {
numberOrString: PropTypes.oneOfType([
PropTypes.number,
PropTypes.string,
]),
responsive: PropTypes.oneOfType([
PropTypes.number,
PropTypes.string,
PropTypes.array,
]),
}
export const defaultBreakpoints = [ 40, 52, 64, ].map(n => n + 'em')
export const is = n => n !== undefined && n !== null
export const num = n => typeof n === 'number' && !isNaN(n)
export const px = n => num(n) ? n + 'px' : n
export const get = (obj, ...paths) => paths.join('.').split('.')
.reduce((a, b) => (a && a[b]) ? a[b] : null, obj)
export const themeGet = (paths, fallback) => props => get(props.theme, paths) || fallback
export const cloneFunc = fn => (...args) => fn(...args)
export const merge = (a, b) => Object.assign({}, a, b, Object
.keys(b || {}).reduce((obj, key) =>
Object.assign(obj, {
[key]: a[key] !== null && typeof a[key] === 'object'
? merge(a[key], b[key])
: b[key]
}),
{}))
export const compose = (...funcs) => {
const fn = props => funcs
.map(fn => fn(props))
.filter(Boolean)
.reduce(merge, {})
fn.propTypes = funcs
.map(fn => fn.propTypes)
.reduce(merge, {})
return fn
}
export const createMediaQuery = n => `@media screen and (min-width: ${n})`
export const style = ({
prop,
cssProperty,
key,
getter,
transformValue,
scale: defaultScale = {}
}) => {
const css = cssProperty || prop
const transform = transformValue || getter || noop
const fn = props => {
const val = props[prop]
if (!is(val)) return null
const scale = get(props.theme, key) || defaultScale
const style = n => is(n) ? ({
[css]: transform(
get(scale, n) || n
)
}) : null
if (!Array.isArray(val)) {
return style(val)
}
// how to hoist this up??
const breakpoints = [
null,
...(get(props.theme, 'breakpoints') || defaultBreakpoints)
.map(createMediaQuery)
]
let styles = {}
for (let i = 0; i < val.length; i++) {
const media = breakpoints[i]
if (!media) {
styles = style(val[i])
continue
}
const rule = style(val[i])
if (!rule) continue
styles[media] = rule
}
return styles
}
fn.propTypes = { [prop]: cloneFunc(propTypes.responsive) }
fn.propTypes[prop].meta = {
prop,
themeKey: key,
styleType: 'responsive'
}
return fn
}
export const getWidth = n => !num(n) || n > 1 ? px(n) : (n * 100) + '%'
// variant
export const variant = ({
key,
prop = 'variant'
}) => {
const fn = (props) => get(props.theme, key, props[prop]) || null
fn.propTypes = {
[prop]: propTypes.numberOrString
}
return fn
}
export const util = {
propTypes,
defaultBreakpoints,
is,
num,
px,
get,
themeGet,
cloneFunc,
merge,
compose,
createMediaQuery,
style,
}
// space
const isNegative = n => n < 0
const REG = /^[mp][trblxy]?$/
const properties = {
m: 'margin',
p: 'padding'
}
const directions = {
t: 'Top',
r: 'Right',
b: 'Bottom',
l: 'Left',
x: [ 'Left', 'Right' ],
y: [ 'Top', 'Bottom' ],
}
const getProperties = key => {
const [ a, b ] = key.split('')
const property = properties[a]
const direction = directions[b] || ''
return Array.isArray(direction)
? direction.map(dir => property + dir)
: [ property + direction ]
}
const getValue = scale => n => {
if (!num(n)) {
return scale[n] || n
}
const abs = Math.abs(n)
const neg = isNegative(n)
const value = scale[abs] || abs
if (!num(value)) {
return neg ? '-' + value : value
}
return px(value * (neg ? -1 : 1))
}
const defaultScale = [
0, 4, 8, 16, 32, 64, 128, 256, 512
]
export const space = props => {
const keys = Object.keys(props)
.filter(key => REG.test(key))
.sort()
const scale = get(props.theme, 'space') || defaultScale
const getStyle = getValue(scale)
return keys
.map(key => {
const value = props[key]
const properties = getProperties(key)
const style = n => is(n) ? properties.reduce((a, prop) => ({
...a,
[prop]: getStyle(n)
}), {}) : null
if (!Array.isArray(value)) {
return style(value)
}
const breakpoints = [
null,
...(get(props.theme, 'breakpoints') || defaultBreakpoints)
.map(createMediaQuery)
]
let styles = {}
for (let i = 0; i < value.length; i++) {
const media = breakpoints[i]
if (!media) {
styles = style(value[i])
continue
}
const rule = style(value[i])
if (!rule) continue
styles[media] = rule
}
return styles
})
.reduce(merge, {})
}
space.propTypes = {
m: cloneFunc(propTypes.responsive),
mt: cloneFunc(propTypes.responsive),
mr: cloneFunc(propTypes.responsive),
mb: cloneFunc(propTypes.responsive),
ml: cloneFunc(propTypes.responsive),
mx: cloneFunc(propTypes.responsive),
my: cloneFunc(propTypes.responsive),
p: cloneFunc(propTypes.responsive),
pt: cloneFunc(propTypes.responsive),
pr: cloneFunc(propTypes.responsive),
pb: cloneFunc(propTypes.responsive),
pl: cloneFunc(propTypes.responsive),
px: cloneFunc(propTypes.responsive),
py: cloneFunc(propTypes.responsive)
}
const meta = prop => ({
prop,
themeKey: 'space',
styleType: 'responsive'
})
Object.keys(space.propTypes).forEach(prop => {
space.propTypes[prop].meta = meta(prop)
})
// styles
export const width = style({
prop: 'width',
transformValue: getWidth
})
export const fontSize = style({
prop: 'fontSize',
key: 'fontSizes',
transformValue: px,
scale: [
12,
14,
16,
20,
24,
32,
48,
64,
72
]
})
export const textColor = style({
prop: 'color',
key: 'colors',
})
export const bgColor = style({
prop: 'bg',
cssProperty: 'backgroundColor',
key: 'colors'
})
export const color = compose(
textColor,
bgColor
)
// typography
export const fontFamily = style({
prop: 'fontFamily',
key: 'fonts'
})
export const textAlign = style({
prop: 'textAlign'
})
export const lineHeight = style({
prop: 'lineHeight',
key: 'lineHeights'
})
export const fontWeight = style({
prop: 'fontWeight',
key: 'fontWeights'
})
export const fontStyle = style({
prop: 'fontStyle'
})
export const letterSpacing = style({
prop: 'letterSpacing',
key: 'letterSpacings',
transformValue: px
})
// layout
export const display = style({
prop: 'display'
})
export const maxWidth = style({
prop: 'maxWidth',
key: 'maxWidths',
transformValue: px
})
export const minWidth = style({
prop: 'minWidth',
key: 'minWidths',
transformValue: px
})
export const height = style({
prop: 'height',
key: 'heights',
transformValue: px
})
export const maxHeight = style({
prop: 'maxHeight',
key: 'maxHeights',
transformValue: px
})
export const minHeight = style({
prop: 'minHeight',
key: 'minHeights',
transformValue: px
})
export const sizeWidth = style({
prop: 'size',
cssProperty: 'width',
transformValue: px
})
export const sizeHeight = style({
prop: 'size',
cssProperty: 'height',
transformValue: px
})
export const size = compose(
sizeHeight,
sizeWidth
)
<<<<<<<
=======
gridTemplateAreas,
gridArea,
// borders
>>>>>>>
gridTemplateAreas,
gridArea,
// borders |
<<<<<<<
background
=======
disableWhen={isFetchingCurrencyData}
>>>>>>>
disableWhen={isFetchingCurrencyData}
background
<<<<<<<
<TouchableOpacity
onPress={() => backPress()}
hitSlop={{ top: height / 55, bottom: height / 55, left: width / 55, right: width / 55 }}
>
<View style={styles.itemLeft}>
<Image source={arrowLeftImagePath} style={styles.iconLeft} />
<Text style={[styles.titleTextLeft, textColor]}>{t('global:backLowercase')}</Text>
</View>
</TouchableOpacity>
<TouchableOpacity
onPress={() => this.saveCurrencySelection(this.dropdown.getSelected())}
hitSlop={{ top: height / 55, bottom: height / 55, left: width / 55, right: width / 55 }}
>
<View style={styles.itemRight}>
<Text style={[styles.titleTextRight, textColor]}>{t('global:save')}</Text>
<Image source={tickImagePath} style={styles.iconRight} />
</View>
</TouchableOpacity>
=======
{!isFetchingCurrencyData && this.renderBackOption()}
{!isFetchingCurrencyData && this.renderSaveOption()}
>>>>>>>
{!isFetchingCurrencyData && this.renderBackOption()}
{!isFetchingCurrencyData && this.renderSaveOption()} |
<<<<<<<
ctaColor={THEMES.getHSL(this.props.ctaColor)}
backgroundColor={THEMES.getHSL(this.props.backgroundColor)}
onQRRead={(data) => this.onQRRead(data)}
=======
ctaColor={this.props.ctaColor}
backgroundColor={this.props.backgroundColor}
onQRRead={data => this.onQRRead(data)}
>>>>>>>
ctaColor={this.props.ctaColor}
backgroundColor={this.props.backgroundColor}
onQRRead={(data) => this.onQRRead(data)}
<<<<<<<
onChangeText={(value) => this.setState({ seed: value.toUpperCase() })}
containerStyle={{ width: width / 1.4 }}
autoCapitalize={'none'}
=======
onChangeText={value => this.setState({ seed: value })}
containerStyle={{ width: width / 1.2 }}
autoCapitalize={'characters'}
>>>>>>>
onChangeText={(value) => this.setState({ seed: value })}
containerStyle={{ width: width / 1.2 }}
autoCapitalize={'characters'}
<<<<<<<
onChangeText={(value) => this.setState({ accountName: value })}
containerStyle={{ width: width / 1.4 }}
=======
onChangeText={value => this.setState({ accountName: value })}
containerStyle={{ width: width / 1.2 }}
>>>>>>>
onChangeText={(value) => this.setState({ accountName: value })}
containerStyle={{ width: width / 1.2 }} |
<<<<<<<
import assign from 'lodash/assign';
import includes from 'lodash/includes';
import map from 'lodash/map';
import takeRight from 'lodash/takeRight';
import get from 'lodash/get';
import filter from 'lodash/filter';
import size from 'lodash/size';
import difference from 'lodash/difference';
import isEmpty from 'lodash/isEmpty';
import union from 'lodash/union';
import merge from 'lodash/merge';
=======
import tail from 'lodash/map';
>>>>>>>
import takeRight from 'lodash/takeRight'; |
<<<<<<<
=======
isFetchingNewAddressData: false,
hasErrorFetchingNewAddressData: false,
inactive: false,
minimised: false,
>>>>>>>
inactive: false,
minimised: false, |
<<<<<<<
import { translate } from 'react-i18next';
=======
import THEMES from '../theme/themes';
>>>>>>>
import { translate } from 'react-i18next';
import THEMES from '../theme/themes';
<<<<<<<
label={t('customNode')}
tintColor="#F7D002"
=======
label="Custom node"
tintColor={THEMES.getHSL(this.props.negativeColor)}
>>>>>>>
label={t('customNode')} tintColor={THEMES.getHSL(this.props.negativeColor)} |
<<<<<<<
negativeColor: PropTypes.object.isRequired,
isFingerprintEnabled: PropTypes.bool.isRequired,
};
const mapStateToProps = state => ({
isFingerprintEnabled: state.account.isFingerprintEnabled,
});
const mapDispatchToProps = {
setLoginPasswordField,
setUserActivity,
=======
negativeColor: PropTypes.string.isRequired,
>>>>>>>
negativeColor: PropTypes.string.isRequired,
isFingerprintEnabled: PropTypes.bool.isRequired,
};
const mapStateToProps = state => ({
isFingerprintEnabled: state.account.isFingerprintEnabled,
});
const mapDispatchToProps = {
setLoginPasswordField,
setUserActivity, |
<<<<<<<
const { t, seed, theme: { body, primary } } = this.props;
const { isModalActive, iotaLogoCheckbox } = this.state;
=======
const { t, seed, theme: { body, primary, secondary } } = this.props;
>>>>>>>
const { t, seed, theme: { body, primary, secondary } } = this.props;
const { isModalActive, iotaLogoCheckbox } = this.state; |
<<<<<<<
const getRelevantAddresses = (resolve, reject, seed, opts, genFn, allAddresses) => {
getNewAddress(seed, opts, genFn, (err, addresses) => {
=======
const getAddressesWithTransactions = (resolve, reject, seed, opts, allAddresses) => {
iota.api.getNewAddress(seed, opts, (err, addresses) => {
>>>>>>>
const getAddressesWithTransactions = (resolve, reject, seed, opts, genFn, allAddresses) => {
getNewAddress(seed, opts, genFn, (err, addresses) => {
<<<<<<<
getRelevantAddresses(resolve, reject, seed, newOpts, genFn, allAddresses);
=======
getAddressesWithTransactions(resolve, reject, seed, newOpts, allAddresses);
>>>>>>>
getAddressesWithTransactions(resolve, reject, seed, newOpts, genFn, allAddresses);
<<<<<<<
export const getAllAddresses = (seed, genFn) => {
return new Promise((res, rej) => {
const opts = { index: 0, total: 10, returnAll: true, security: 2 };
getRelevantAddresses(res, rej, seed, opts, genFn, []);
});
};
=======
export const getAllAddresses = (
seed,
addressesOpts = {
index: 0,
total: 10,
returnAll: true,
security: 2,
},
) => new Promise((res, rej) => getAddressesWithTransactions(res, rej, seed, addressesOpts, []));
>>>>>>>
export const getAllAddresses = (seed, genFn) => {
return new Promise((res, rej) => {
const opts = { index: 0, total: 10, returnAll: true, security: 2 };
getAddressesWithTransactions(res, rej, seed, opts, genFn, []);
});
}; |
<<<<<<<
import ChangePassword from '../containers/changePassword';
=======
import OnboardingComplete from '../containers/onboardingComplete';
import UseSeed from '../containers/useSeed';
>>>>>>>
import ChangePassword from '../containers/changePassword';
import OnboardingComplete from '../containers/onboardingComplete';
import UseSeed from '../containers/useSeed';
<<<<<<<
Navigation.registerComponent('change-password', () => ChangePassword, store, Provider);
=======
Navigation.registerComponent('onboardingComplete', () => OnboardingComplete, store, Provider);
Navigation.registerComponent('useSeed', () => UseSeed, store, Provider);
>>>>>>>
Navigation.registerComponent('change-password', () => ChangePassword, store, Provider);
Navigation.registerComponent('onboardingComplete', () => OnboardingComplete, store, Provider);
Navigation.registerComponent('useSeed', () => UseSeed, store, Provider); |
<<<<<<<
import { detectLocale, selectLocale } from '../components/locale';
import { Icon } from '../theme/icons.js';
import DynamicStatusBar from '../components/dynamicStatusBar';
=======
import { detectLocale, selectLocale } from 'iota-wallet-shared-modules/libs/locale';
>>>>>>>
import { Icon } from '../theme/icons.js';
import DynamicStatusBar from '../components/dynamicStatusBar'; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.