conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
=======
var ttHtml = require('./dom');
>>>>>>>
<<<<<<<
}
};
customElem.prototype.build = function () {
var element = this.element;
param.data.FCODE = funCaller.getQueryString('fundcode') || '000001';
param.dataPage.FCODE = funCaller.getQueryString('fundcode') || '000001';
funCaller.init();
};
=======
}
};
customElem.prototype.build = function () {
var element = this.element;
$(element).html(ttHtml);
param.data.FCODE = funCaller.getQueryString('fundcode') || '000001';
param.dataPage.FCODE = funCaller.getQueryString('fundcode') || '000001';
funCaller.init();
};
>>>>>>>
}
};
customElem.prototype.build = function () {
var element = this.element;
param.data.FCODE = funCaller.getQueryString('fundcode') || '000001';
param.dataPage.FCODE = funCaller.getQueryString('fundcode') || '000001';
funCaller.init();
}; |
<<<<<<<
getItems: Zotero.Promise.coroutine(function* () {
var search = yield _searchBox.search.clone();
// Hack to create a condition for the search's library --
// this logic should really go in the search itself instead of here
// and in collectionTreeView.js
yield search.loadPrimaryData();
var conditions = search.getSearchConditions();
if (!conditions.some(function (condition) condition.condition == 'libraryID')) {
yield search.addCondition('libraryID', 'is', _searchBox.search.libraryID);
}
var ids = yield search.search();
return Zotero.Items.get(ids);
}),
=======
getItems: function () {
var search = _searchBox.search.clone();
search.libraryID = _libraryID;
return Zotero.Items.get(search.search());
},
>>>>>>>
getItems: Zotero.Promise.coroutine(function* () {
var search = yield _searchBox.search.clone();
search.libraryID = _libraryID;
var ids = yield search.search();
return Zotero.Items.get(ids);
}), |
<<<<<<<
return translation.getTranslators().then(function(translators) {
if(!translators.length) {
// we lied. we can't really translate this file.
throw "No translator found for handled RIS, Refer or ISI file"
}
// translate using first available
translation.setTranslator(translators[0]);
return frontWindow.Zotero_Browser.performTranslation(translation);
});
=======
var translators = translation.getTranslators();
if(!translators.length) {
// we lied. we can't really translate this file.
Zotero.debug("No translator found to handle this file");
return false;
}
// translate using first available
translation.setTranslator(translators[0]);
frontWindow.Zotero_Browser.performTranslation(translation);
return true;
>>>>>>>
return translation.getTranslators().then(function(translators) {
if(!translators.length) {
// we lied. we can't really translate this file.
Zotero.debug("No translator found to handle this file");
return false;
}
// translate using first available
translation.setTranslator(translators[0]);
return frontWindow.Zotero_Browser.performTranslation(translation);
});
<<<<<<<
var me = this;
Zotero.Promise.resolve(_typeHandlers[this._contentType](readString, (this._request.name ? this._request.name : null),
this._contentType, channel)).catch(function(e) {
// if there was an error, handle using nsIExternalHelperAppService
var externalHelperAppService = Components.classes["@mozilla.org/uriloader/external-helper-app-service;1"].
getService(Components.interfaces.nsIExternalHelperAppService);
var frontWindow = Components.classes["@mozilla.org/embedcomp/window-watcher;1"].
getService(Components.interfaces.nsIWindowWatcher).activeWindow;
var inputStream = me._storageStream.newInputStream(0);
var streamListener = externalHelperAppService.doContent(me._contentType, me._request, frontWindow, null);
if (streamListener) {
streamListener.onStartRequest(channel, context);
streamListener.onDataAvailable(me._request, context, inputStream, 0, me._storageStream.length);
streamListener.onStopRequest(channel, context, status);
}
// then throw our error
throw e;
}).fin(function() {
me._storageStream.close();
}).done();
=======
var handled = false;
try {
handled = _typeHandlers[this._contentType](readString, (this._request.name ? this._request.name : null),
this._contentType, channel);
} catch(e) {
Zotero.debug(e);
}
if (!handled) {
// handle using nsIExternalHelperAppService
var externalHelperAppService = Components.classes["@mozilla.org/uriloader/external-helper-app-service;1"].
getService(Components.interfaces.nsIExternalHelperAppService);
var frontWindow = Components.classes["@mozilla.org/embedcomp/window-watcher;1"].
getService(Components.interfaces.nsIWindowWatcher).activeWindow;
var inputStream = this._storageStream.newInputStream(0);
var streamListener = externalHelperAppService.doContent(this._contentType, this._request, frontWindow, null);
if (streamListener) {
streamListener.onStartRequest(channel, context);
streamListener.onDataAvailable(this._request, context, inputStream, 0, this._storageStream.length);
streamListener.onStopRequest(channel, context, status);
}
}
this._storageStream.close();
>>>>>>>
var me = this;
Zotero.Promise.resolve(
_typeHandlers[this._contentType](readString, (this._request.name ? this._request.name : null),
this._contentType,
channel)
)
.catch(function(e) {
Zotero.debug(e, 2);
// if there was an error, handle using nsIExternalHelperAppService
var externalHelperAppService = Components.classes["@mozilla.org/uriloader/external-helper-app-service;1"].
getService(Components.interfaces.nsIExternalHelperAppService);
var frontWindow = Components.classes["@mozilla.org/embedcomp/window-watcher;1"].
getService(Components.interfaces.nsIWindowWatcher).activeWindow;
var inputStream = me._storageStream.newInputStream(0);
var streamListener = externalHelperAppService.doContent(me._contentType, me._request, frontWindow, null);
if (streamListener) {
streamListener.onStartRequest(channel, context);
streamListener.onDataAvailable(me._request, context, inputStream, 0, me._storageStream.length);
streamListener.onStopRequest(channel, context, status);
}
// then throw our error
throw e;
})
.finally(function() {
me._storageStream.close();
});; |
<<<<<<<
=======
Components.utils.import("resource://zotero/config.js");
Components.utils.import("resource://zotero/q.js");
>>>>>>>
Components.utils.import("resource://zotero/config.js");
<<<<<<<
* Log a JS error to the Mozilla JS error console and the text console
=======
* Log a JS error to Mozilla JS error console and debug output
>>>>>>>
* Log a JS error to the Mozilla error console and debug output
<<<<<<<
return win.ZoteroPane.collectionsView.selectedTreeRow;
=======
if (win.document.documentElement.getAttribute('windowtype') == 'zotero:search') {
return win.ZoteroAdvancedSearch.itemsView.itemGroup;
}
return win.ZoteroPane.collectionsView.itemGroup;
>>>>>>>
if (win.document.documentElement.getAttribute('windowtype') == 'zotero:search') {
return win.ZoteroAdvancedSearch.itemsView.collectionTreeRow;
}
return win.ZoteroPane.collectionsView.selectedTreeRow; |
<<<<<<<
this.canHandleItem = function (item) {
return _getURL(item).then((val) => val !== false);
=======
this.handleItems = function(items, event) {
var urls = [for (item of items) _getURL(item)];
ZoteroPane_Local.loadURI([for (url of urls) if (url) url], event);
>>>>>>>
this.canHandleItem = function (item) {
return _getURL(item).then((val) => val !== false);
<<<<<<<
for each(var item in items) {
var attachment = yield _getBestNonNativeAttachment(item);
=======
for (let item of items) {
var attachment = _getBestNonNativeAttachment(item);
>>>>>>>
for (let item of items) {
var attachment = yield _getBestNonNativeAttachment(item);
<<<<<<<
var _getBestNonNativeAttachment = Zotero.Promise.coroutine(function* (item) {
var attachments = item.isAttachment() ? [item] : (yield item.getBestAttachments());
for each(var attachment in attachments) {
=======
function _getBestNonNativeAttachment(item) {
var attachments = (item.isAttachment() ? [item] : Zotero.Items.get(item.getBestAttachments()));
for (let i = 0; i < attachments.length; i++) {
let attachment = attachments[i];
>>>>>>>
var _getBestNonNativeAttachment = Zotero.Promise.coroutine(function* (item) {
var attachments = item.isAttachment() ? [item] : (yield item.getBestAttachments());
for (let i = 0; i < attachments.length; i++) {
let attachment = attachments[i];
<<<<<<<
this.handleItems = Zotero.Promise.coroutine(function* (items, event) {
for each(var item in items) {
var attachment = yield _getBestFile(item);
=======
this.handleItems = function(items, event) {
for (let item of items) {
var attachment = _getBestFile(item);
>>>>>>>
this.handleItems = Zotero.Promise.coroutine(function* (items, event) {
for (let item of items) {
var attachment = yield _getBestFile(item); |
<<<<<<<
var errString = "Downloaded PDF did not have MIME type "
+ "'application/pdf' in Attachments.importFromURL()";
Zotero.debug(errString, 2);
=======
Zotero.debug("Downloaded PDF did not have MIME type "
+ "'application/pdf' in Attachments.importFromURL()", 2);
Zotero.debug(str);
>>>>>>>
var errString = "Downloaded PDF did not have MIME type "
+ "'application/pdf' in Attachments.importFromURL()";
Zotero.debug(errString, 2);
Zotero.debug(str); |
<<<<<<<
+ "FROM creators ";
if (searchParams.libraryID !== undefined) {
sql += "JOIN itemCreators USING (creatorID) JOIN items USING (itemID) ";
}
sql += "WHERE CASE fieldMode "
+ "WHEN 1 THEN lastName "
+ "WHEN 0 THEN firstName || ' ' || lastName END "
+ "LIKE ? ";
var sqlParams = [searchString + '%'];
if (searchParams.libraryID !== undefined) {
=======
+ "FROM creators NATURAL JOIN creatorData "
+ "WHERE CASE fieldMode "
+ "WHEN 1 THEN lastName LIKE ? "
+ "WHEN 0 THEN (firstName || ' ' || lastName LIKE ?) OR (lastName LIKE ?) END "
var sqlParams = [searchString + '%', searchString + '%', searchString + '%'];
if (typeof searchParams.libraryID != 'undefined') {
>>>>>>>
+ "FROM creators ";
if (searchParams.libraryID !== undefined) {
sql += "JOIN itemCreators USING (creatorID) JOIN items USING (itemID) ";
}
sql += "WHERE CASE fieldMode "
+ "WHEN 1 THEN lastName LIKE ? "
+ "WHEN 0 THEN (firstName || ' ' || lastName LIKE ?) OR (lastName LIKE ?) END "
var sqlParams = [searchString + '%', searchString + '%', searchString + '%'];
if (searchParams.libraryID !== undefined) { |
<<<<<<<
this.bail = cmdLine.handleFlag("bail", false);
this.grep = cmdLine.handleFlagWithParam("grep", false);
=======
this.makeTestData = cmdLine.handleFlag("makeTestData", false);
this.noquit = !this.makeTestData && this.noquit;
this.runTests = !this.makeTestData;
>>>>>>>
this.makeTestData = cmdLine.handleFlag("makeTestData", false);
this.noquit = !this.makeTestData && this.noquit;
this.runTests = !this.makeTestData;
this.bail = cmdLine.handleFlag("bail", false);
this.grep = cmdLine.handleFlagWithParam("grep", false); |
<<<<<<<
this._connection.close();
=======
this.stopDummyStatement();
this._connection.asyncClose();
>>>>>>>
this._connection.asyncClose(); |
<<<<<<<
this.findPDFForSelectedItems = async function () {
if (!this.canEdit()) {
this.displayCannotEditLibraryMessage();
return;
}
var items = this.getSelectedItems();
var icon = 'chrome://zotero/skin/treeitem-attachment-pdf.png';
var progressWin = new Zotero.ProgressWindow();
var title = Zotero.getString('findPDF.searchingForAvailablePDFs');
progressWin.changeHeadline(title);
var itemProgress = new progressWin.ItemProgress(
icon,
Zotero.getString('findPDF.checkingItems', items.length, items.length)
);
progressWin.show();
var successful = 0;
for (let i = 0; i < items.length; i++) {
let item = items[i];
if (Zotero.Attachments.canFindPDFForItem(item)) {
try {
let attachment = await Zotero.Attachments.addAvailablePDF(item);
if (attachment) {
successful++;
}
}
catch (e) {
Zotero.logError(e);
}
}
itemProgress.setProgress(((i + 1) / items.length) * 100);
}
itemProgress.setProgress(100);
itemProgress.setIcon(icon);
if (successful) {
itemProgress.setText(Zotero.getString('findPDF.pdfsAdded', successful, successful));
}
else {
itemProgress.setText(Zotero.getString('findPDF.noPDFsFound'))
}
progressWin.startCloseTimer(4000);
};
/**
* @return {Promise<Zotero.Item>|false}
*/
this.addItemFromPage = Zotero.Promise.method(function (itemType, saveSnapshot, row) {
if (row == undefined && this.collectionsView && this.collectionsView.selection) {
row = this.collectionsView.selection.currentIndex;
}
if (row !== undefined) {
if (!this.canEdit(row)) {
this.displayCannotEditLibraryMessage();
return false;
}
var collectionTreeRow = this.collectionsView.getRow(row);
if (collectionTreeRow.isPublications()) {
this.displayCannotAddToMyPublicationsMessage();
return false;
}
}
return this.addItemFromDocument(window.content.document, itemType, saveSnapshot, row);
});
=======
>>>>>>>
this.findPDFForSelectedItems = async function () {
if (!this.canEdit()) {
this.displayCannotEditLibraryMessage();
return;
}
var items = this.getSelectedItems();
var icon = 'chrome://zotero/skin/treeitem-attachment-pdf.png';
var progressWin = new Zotero.ProgressWindow();
var title = Zotero.getString('findPDF.searchingForAvailablePDFs');
progressWin.changeHeadline(title);
var itemProgress = new progressWin.ItemProgress(
icon,
Zotero.getString('findPDF.checkingItems', items.length, items.length)
);
progressWin.show();
var successful = 0;
for (let i = 0; i < items.length; i++) {
let item = items[i];
if (Zotero.Attachments.canFindPDFForItem(item)) {
try {
let attachment = await Zotero.Attachments.addAvailablePDF(item);
if (attachment) {
successful++;
}
}
catch (e) {
Zotero.logError(e);
}
}
itemProgress.setProgress(((i + 1) / items.length) * 100);
}
itemProgress.setProgress(100);
itemProgress.setIcon(icon);
if (successful) {
itemProgress.setText(Zotero.getString('findPDF.pdfsAdded', successful, successful));
}
else {
itemProgress.setText(Zotero.getString('findPDF.noPDFsFound'))
}
progressWin.startCloseTimer(4000);
}; |
<<<<<<<
if (zoteroItem.type != "attachment" && zoteroItem.type != "note") {
var author = Zotero.CreatorTypes.getName(Zotero.CreatorTypes.getPrimaryIDForType(itemTypeID));
var creators = zoteroItem.creators;
for(var i=0; creators && i<creators.length; i++) {
var creator = creators[i];
var creatorType = creator.creatorType;
if(creatorType == author) {
creatorType = "author";
}
creatorType = CSL_NAMES_MAPPINGS[creatorType];
if(!creatorType) continue;
var nameObj;
if (creator.lastName || creator.firstName) {
nameObj = {'family': creator.lastName, 'given': creator.firstName};
} else if (creator.name) {
nameObj = {'literal': creator.name};
}
if(cslItem[creatorType]) {
cslItem[creatorType].push(nameObj);
} else {
cslItem[creatorType] = [nameObj];
}
=======
var author = Zotero.CreatorTypes.getName(Zotero.CreatorTypes.getPrimaryIDForType(itemTypeID));
var creators = zoteroItem.creators;
for(var i=0; creators && i<creators.length; i++) {
var creator = creators[i];
var creatorType = creator.creatorType;
if(creatorType == author) {
creatorType = "author";
}
creatorType = CSL_NAMES_MAPPINGS[creatorType];
if(!creatorType) continue;
var nameObj;
if (creator.lastName || creator.firstName) {
nameObj = {
family: creator.lastName || '',
given: creator.firstName || ''
};
// Parse name particles
// Replicate citeproc-js logic for what should be parsed so we don't
// break current behavior.
if (nameObj.family && nameObj.given) {
// Don't parse if last name is quoted
if (nameObj.family.length > 1
&& nameObj.family.charAt(0) == '"'
&& nameObj.family.charAt(nameObj.family.length - 1) == '"'
) {
nameObj.family = nameObj.family.substr(1, nameObj.family.length - 2);
} else {
Zotero.CiteProc.CSL.parseParticles(nameObj, true);
}
}
} else if (creator.name) {
nameObj = {'literal': creator.name};
}
if(cslItem[creatorType]) {
cslItem[creatorType].push(nameObj);
} else {
cslItem[creatorType] = [nameObj];
>>>>>>>
if (zoteroItem.type != "attachment" && zoteroItem.type != "note") {
var author = Zotero.CreatorTypes.getName(Zotero.CreatorTypes.getPrimaryIDForType(itemTypeID));
var creators = zoteroItem.creators;
for(var i=0; creators && i<creators.length; i++) {
var creator = creators[i];
var creatorType = creator.creatorType;
if(creatorType == author) {
creatorType = "author";
}
creatorType = CSL_NAMES_MAPPINGS[creatorType];
if(!creatorType) continue;
var nameObj;
if (creator.lastName || creator.firstName) {
nameObj = {
family: creator.lastName || '',
given: creator.firstName || ''
};
// Parse name particles
// Replicate citeproc-js logic for what should be parsed so we don't
// break current behavior.
if (nameObj.family && nameObj.given) {
// Don't parse if last name is quoted
if (nameObj.family.length > 1
&& nameObj.family.charAt(0) == '"'
&& nameObj.family.charAt(nameObj.family.length - 1) == '"'
) {
nameObj.family = nameObj.family.substr(1, nameObj.family.length - 2);
} else {
Zotero.CiteProc.CSL.parseParticles(nameObj, true);
}
}
} else if (creator.name) {
nameObj = {'literal': creator.name};
}
if(cslItem[creatorType]) {
cslItem[creatorType].push(nameObj);
} else {
cslItem[creatorType] = [nameObj];
} |
<<<<<<<
this._DOI = m[0];
} else { // dont look for ISBNs if we found a DOI
var isbns = this._findISBNs(allText);
if(isbns.length > 0) {
this._ISBNs = isbns;
Zotero.debug("Found ISBNs: " + isbns);
}
=======
this._DOI = m;
>>>>>>>
this._DOI = m;
} else { // dont look for ISBNs if we found a DOI
var isbns = this._findISBNs(allText);
if(isbns.length > 0) {
this._ISBNs = isbns;
Zotero.debug("Found ISBNs: " + isbns);
} |
<<<<<<<
sql += " ORDER BY name COLLATE locale";
=======
sql += " ORDER BY val COLLATE locale";
statement = this._zotero.DB.getStatement(sql, sqlParams);
>>>>>>>
sql += " ORDER BY val COLLATE locale";
<<<<<<<
var onRow = null;
// If there's a result callback (e.g., for sorting), don't use a row handler
if (!resultsCallback) {
onRow = function (row) {
if (this._cancelled) {
Zotero.debug("Cancelling query");
throw StopIteration;
=======
var self = this;
this.pendingStatement = statement.executeAsync({
handleResult: function (storageResultSet) {
self._zotero.debug("Handling autocomplete results");
var results = [];
var comments = [];
for (let row = storageResultSet.getNextRow();
row;
row = storageResultSet.getNextRow()) {
results.push(row.getResultByIndex(0));
let comment = row.getResultByIndex(1);
if (comment) {
comments.push(comment);
}
}
self.updateResults(results, comments, true);
},
handleError: function (e) {
Components.utils.reportError(e.message);
},
handleCompletion: function (reason) {
self.pendingStatement = null;
if (reason != Ci.mozIStorageStatementCallback.REASON_FINISHED) {
var resultCode = Ci.nsIAutoCompleteResult.RESULT_FAILURE;
}
else {
var resultCode = null;
}
self.updateResults(null, null, false, resultCode);
if (resultCode) {
self._zotero.debug("Autocomplete query aborted");
}
else {
self._zotero.debug("Autocomplete query completed");
>>>>>>>
var onRow = null;
// If there's a result callback (e.g., for sorting), don't use a row handler
if (!resultsCallback) {
onRow = function (row) {
if (this._cancelled) {
Zotero.debug("Cancelling query");
throw StopIteration; |
<<<<<<<
=======
/**
* A really ugly way of making a DOM object not look like a DOM object, so we can pass it to the
* sandbox under Firefox 5
*/
Zotero.Translate.SandboxManager.Fx5DOMWrapper = function(obj, parent) {
if(obj === null) {
return null;
}
if(typeof obj === "function") {
var me = this;
var val = function() {
var nArgs = arguments.length;
var args = new Array(nArgs);
for(var i=0; i<nArgs; i++) {
var arg = arguments[i];
args[i] = (((typeof arg === "object" && arg !== null)
|| typeof arg === "function")
&& "__wrappedDOMObject" in arg
? arg.__wrappedDOMObject : arg);
}
return Zotero.Translate.SandboxManager.Fx5DOMWrapper(obj.apply(parent ? parent : null, args));
}
} else if(typeof obj === "object") {
if(val instanceof Array) {
var val = [];
} else {
var val = {};
}
} else {
return obj;
}
val.__wrappedDOMObject = obj;
val.__exposedProps__ = {};
for(var prop in obj) {
if(prop === "prototype") continue;
let localProp = prop,
cachedWrapper;
val.__exposedProps__[localProp] = "r";
val.__defineGetter__(localProp, function() {
if(!cachedWrapper) cachedWrapper = Zotero.Translate.SandboxManager.Fx5DOMWrapper(obj[localProp], obj);
return cachedWrapper;
});
}
return val;
}
>>>>>>> |
<<<<<<<
},
/**
* Gets the icon for a JSON-style attachment
*/
"determineAttachmentIcon":function(attachment) {
if(attachment.linkMode === "linked_url") {
return Zotero.ItemTypes.getImageSrc("attachment-web-link");
}
return Zotero.ItemTypes.getImageSrc(attachment.mimeType === "application/pdf"
? "attachment-pdf" : "attachment-snapshot");
}
=======
},
/**
* Provides unicode support and other additional features for regular expressions
* See https://github.com/slevithan/xregexp for usage
*/
"XRegExp": XRegExp
>>>>>>>
},
/**
* Gets the icon for a JSON-style attachment
*/
"determineAttachmentIcon":function(attachment) {
if(attachment.linkMode === "linked_url") {
return Zotero.ItemTypes.getImageSrc("attachment-web-link");
}
return Zotero.ItemTypes.getImageSrc(attachment.mimeType === "application/pdf"
? "attachment-pdf" : "attachment-snapshot");
},
/**
* Provides unicode support and other additional features for regular expressions
* See https://github.com/slevithan/xregexp for usage
*/
"XRegExp": XRegExp |
<<<<<<<
// Credits Command
////////////////////////////////////////////////////////////////////////////
var credits = {
add: function() {
}
}
var CreditsCommand = function(name, params, text, videoManager) {
VideoCommand.call(this, name, params, text, videoManager);
$("#credits")
.width(this.videoManager.videoElement.clientWidth)
.height(this.videoManager.videoElement.clientHeight)
this.params["in"]=this.videoManager.videoElement.duration-.1;
this.params["out"]=this.videoManager.videoElement.duration+.1;
var that = this;
this.onIn = function() {
$("#credits").show();
$("#choices").animate({ right:'+=200px' }, 1000);
CreditsCommand.add( [
{
text: "Play Again",
click:function() {
CreditsCommand.killCol(0)
$('video')[0].currentTime=0;
}
},
{
text: "People",
next:[
{
text: "Nick Cammarata",
next: [
{ text: "Twitter", href: "http://twitter.com/nicklovescode" },
{ text: "Flickr", href: "http://flickr.com/nicklovescode" }
]
},
{
text: "Celine Celine",
href: "http://twitter.com/celinecelines"
}
]
},
{ text: "Places" },
{ text: "Articles" }
]);
};
this.onOut = function() {
$("#choices").css("right","-200px");
$("#credits").hide();
};
};
CreditsCommand.colIndex = 0;
CreditsCommand.killCol = function(index, callback) {
$(".column").each(function() {
if ($(this).attr("colindex")>index) {
$(this).addClass("removing").animate( { left: -$(this).outerWidth() + "px" }, 1200, function() {
$(this).remove();
});
}
});
if (callback) callback();
}
CreditsCommand.add = function(items) {
CreditsCommand.colIndex++;
var ul = $("<ul></ul>")
.addClass('column')
.attr('colindex',parseInt(CreditsCommand.colIndex))
$.each(items, function(i, val) {
var li = $(document.createElement('li'))
.append($(document.createElement('a'))
.text(val.text)
.attr("href",val.href||"#")
.attr("target",val.href?"_blank":""))
.appendTo(ul)
.addClass('play')
.click(function() {
if (val.href) return true;
var colIndex = $(this).parent().attr('colindex');
if (CreditsCommand.colIndex>colIndex) {
CreditsCommand.killCol(colIndex);
CreditsCommand.colIndex = colIndex;
}
var hasClass = $(this).hasClass('selected');
if (!hasClass) {
if (val.click) val.click();
if (val.next) CreditsCommand.add(val.next);
}
$(this)
.parent()
.find('.selected')
.removeClass('selected')
if (!hasClass) $(this).addClass('selected');
})
});
var width = 0;
$(".column:not(.removing)").each(function() {
width+=$(this).outerWidth();
})
ul
.appendTo("#credit_inner")
.css("z-index",1000-CreditsCommand.colIndex)
.css("left",-ul.outerWidth())
.animate({
left: width + "px"
},750)
}
////////////////////////////////////////////////////////////////////////////
=======
// GoogleNews Command
////////////////////////////////////////////////////////////////////////////
var GoogleNewsCommand = function(name, params, text, videoManager) {
VideoCommand.call(this, name, params, text, videoManager);
this.target = document.createElement('div');
this.target.setAttribute('style', 'display:none;border:0px;');
document.getElementById(this.params.target).appendChild(this.target);
this.target.setAttribute('id', this.id);
var content = document.getElementById(this.id);
var options = {
format : "300x250",
queryList : [
{q: this.params.topic || "Top Stories"}
]
};
var newsShow = new google.elements.NewsShow(content, options);
this.onIn = function() {
this.target.setAttribute('style', 'display:inline');
};
this.onOut = function() {
this.target.setAttribute('style', 'display:none');
};
};
////////////////////////////////////////////////////////////////////////////
>>>>>>>
// GoogleNews Command
////////////////////////////////////////////////////////////////////////////
var GoogleNewsCommand = function(name, params, text, videoManager) {
VideoCommand.call(this, name, params, text, videoManager);
this.target = document.createElement('div');
this.target.setAttribute('style', 'display:none;border:0px;');
document.getElementById(this.params.target).appendChild(this.target);
this.target.setAttribute('id', this.id);
var content = document.getElementById(this.id);
var options = {
format : "300x250",
queryList : [
{q: this.params.topic || "Top Stories"}
]
};
var newsShow = new google.elements.NewsShow(content, options);
this.onIn = function() {
this.target.setAttribute('style', 'display:inline');
};
this.onOut = function() {
this.target.setAttribute('style', 'display:none');
};
};
////////////////////////////////////////////////////////////////////////////
// Credits Command
////////////////////////////////////////////////////////////////////////////
var credits = {
add: function() {
}
}
var CreditsCommand = function(name, params, text, videoManager) {
VideoCommand.call(this, name, params, text, videoManager);
$("#credits")
.width(this.videoManager.videoElement.clientWidth)
.height(this.videoManager.videoElement.clientHeight)
this.params["in"]=this.videoManager.videoElement.duration-.1;
this.params["out"]=this.videoManager.videoElement.duration+.1;
var that = this;
this.onIn = function() {
$("#credits").show();
$("#choices").animate({ right:'+=200px' }, 1000);
CreditsCommand.add( [
{
text: "Play Again",
click:function() {
CreditsCommand.killCol(0)
$('video')[0].currentTime=0;
}
},
{
text: "People",
next:[
{
text: "Nick Cammarata",
next: [
{ text: "Twitter", href: "http://twitter.com/nicklovescode" },
{ text: "Flickr", href: "http://flickr.com/nicklovescode" }
]
},
{
text: "Celine Celine",
href: "http://twitter.com/celinecelines"
}
]
},
{ text: "Places" },
{ text: "Articles" }
]);
};
this.onOut = function() {
$("#choices").css("right","-200px");
$("#credits").hide();
};
};
CreditsCommand.colIndex = 0;
CreditsCommand.killCol = function(index, callback) {
$(".column").each(function() {
if ($(this).attr("colindex")>index) {
$(this).addClass("removing").animate( { left: -$(this).outerWidth() + "px" }, 1200, function() {
$(this).remove();
});
}
});
if (callback) callback();
}
CreditsCommand.add = function(items) {
CreditsCommand.colIndex++;
var ul = $("<ul></ul>")
.addClass('column')
.attr('colindex',parseInt(CreditsCommand.colIndex))
$.each(items, function(i, val) {
var li = $(document.createElement('li'))
.append($(document.createElement('a'))
.text(val.text)
.attr("href",val.href||"#")
.attr("target",val.href?"_blank":""))
.appendTo(ul)
.addClass('play')
.click(function() {
if (val.href) return true;
var colIndex = $(this).parent().attr('colindex');
if (CreditsCommand.colIndex>colIndex) {
CreditsCommand.killCol(colIndex);
CreditsCommand.colIndex = colIndex;
}
var hasClass = $(this).hasClass('selected');
if (!hasClass) {
if (val.click) val.click();
if (val.next) CreditsCommand.add(val.next);
}
$(this)
.parent()
.find('.selected')
.removeClass('selected')
if (!hasClass) $(this).addClass('selected');
})
});
var width = 0;
$(".column:not(.removing)").each(function() {
width+=$(this).outerWidth();
})
ul
.appendTo("#credit_inner")
.css("z-index",1000-CreditsCommand.colIndex)
.css("left",-ul.outerWidth())
.animate({
left: width + "px"
},750)
}
////////////////////////////////////////////////////////////////////////////
<<<<<<<
=======
},
googlenews: {
create: function(name, params, text, videoManager) {
return new GoogleNewsCommand(name, params, text, videoManager);
}
},
flickr: {
create: function(name, params, text, videoManager) {
return new FlickrCommand(name, params, text, videoManager);
}
>>>>>>>
},
googlenews: {
create: function(name, params, text, videoManager) {
return new GoogleNewsCommand(name, params, text, videoManager);
} |
<<<<<<<
var AcestreamModule = {
=======
var DirectVideoLinkModule = {
canHandleUrl: function(url) {
var supportedVideoExtensions = ['avi', 'wmv', 'asf', 'flv', 'mkv', 'mp4', 'webm', 'm4v'];
for (var i = 0; i < supportedVideoExtensions.length; i++) {
var extension = supportedVideoExtensions[i];
var regex = '^.*\\.(' + extension + '|' + extension + '\\?.*)$';
if (url.match(regex)) {
return true;
}
}
return false;
},
getMediaType: function() {
return 'video';
},
getPluginPath: function(url, getAddOnVersion, callback) {
callback(url);
},
getEmbedSelector: function() {
return 'video';
}
};
var DirectAudioLinkModule = {
canHandleUrl: function(url) {
var supportedVideoExtensions = ['mp3', 'ogg', 'midi', 'wav', 'aiff', 'aac', 'flac', 'ape', 'wma', 'm4a', 'mka'];
for (var i = 0; i < supportedVideoExtensions.length; i++) {
var extension = supportedVideoExtensions[i];
var regex = '^.*\\.' + extension + "$";
if (url.match(regex)) {
return true;
}
}
return false;
},
getMediaType: function() {
return 'audio';
},
getPluginPath: function(url, getAddOnVersion, callback) {
callback(url);
}
};
var DumpertModule = {
canHandleUrl: function(url) {
var validPatterns = [
'.*dumpert.nl/mediabase/*'
];
return urlMatchesOneOfPatterns(url, validPatterns);
},
getMediaType: function() {
return 'video';
},
getPluginPath: function(url, getAddOnVersion, callback) {
callback('plugin://plugin.video.dumpert/?action=play&video_page_url=' + encodeURIComponent(url));
}
};
var TorrentsLinkModule = {
>>>>>>>
var AcestreamModule = {
<<<<<<<
getPluginPath: function(url, callback) {
callback('plugin://plugin.video.p2p-streams/?url=' + encodeURIComponent(url) + '&mode=1&name=acestream+title');
=======
getPluginPath: function(url, getAddOnVersion, callback) {
if (localStorage['magnetAddOn'] == 'pulsar') {
callback('plugin://plugin.video.pulsar/play?uri=' + encodeURIComponent(url));
} else if (localStorage['magnetAddOn'] == 'quasar') {
callback('plugin://plugin.video.quasar/play?uri=' + encodeURIComponent(url));
} else if (localStorage['magnetAddOn'] == 'kmediatorrent') {
callback('plugin://plugin.video.kmediatorrent/play/' + encodeURIComponent(url));
} else if (localStorage['magnetAddOn'] == 'torrenter') {
callback('plugin://plugin.video.torrenter/?action=playSTRM&url=' + encodeURIComponent(url));
} else {
callback('plugin://plugin.video.xbmctorrent/play/' + encodeURIComponent(url));
}
>>>>>>>
getPluginPath: function(url, getAddOnVersion, callback) {
callback('plugin://plugin.video.p2p-streams/?url=' + encodeURIComponent(url) + '&mode=1&name=acestream+title');
<<<<<<<
=======
var ZdfMediathekModule = {
canHandleUrl: function(url) {
var validPatterns = [
".*zdf.de/.*video/.*"
];
return urlMatchesOneOfPatterns(url, validPatterns);
},
getMediaType: function() {
return 'video';
},
getPluginPath: function(url, getAddOnVersion, callback) {
var videoId = url.match('(https|http)://(www\.)?zdf.de/ZDFmediathek/#/beitrag/video/([^_&/#\?]+)/.*')[3];
callback('plugin://plugin.video.zdf_de_lite/?mode=playVideo&url=' + encodeURIComponent(videoId));
}
};
>>>>>>>
var CdaModule = {
canHandleUrl: function(url) {
var validPatterns = [
".*cda.pl/.*"
];
return urlMatchesOneOfPatterns(url, validPatterns);
},
getMediaType: function() {
return 'video';
},
getPluginPath: function(url, getAddOnVersion, callback) {
chrome.tabs.sendMessage(currentTabId, {action: 'getVideoSrc'}, function (response) {
if (response) {
callback(response.videoSrc);
}
});
}
};
<<<<<<<
getPluginPath: function(url, callback) {
chrome.tabs.sendMessage(currentTabId, {action: 'getVideoSrc'}, function (response) {
if (response) {
callback(response.videoSrc);
}
});
=======
getPluginPath: function(url, getAddOnVersion, callback) {
var videoId = url.match('(https|http)://(www\.)?mixcloud.com(/[^_&#\?]+/[^_&#\?]+)')[3];
callback('plugin://plugin.audio.mixcloud/?mode=40&key=' + encodeURIComponent(videoId));
>>>>>>>
getPluginPath: function(url, getAddOnVersion, callback) {
chrome.tabs.sendMessage(currentTabId, {action: 'getVideoSrc'}, function (response) {
if (response) {
callback(response.videoSrc);
}
});
}
};
var MixcloudModule = {
canHandleUrl: function(url) {
var validPatterns = [
".*mixcloud.com.*"
];
return urlMatchesOneOfPatterns(url, validPatterns);
},
getMediaType: function() {
return 'audio';
},
getPluginPath: function(url, getAddOnVersion, callback) {
var videoId = url.match('(https|http)://(www\.)?mixcloud.com(/[^_&#\?]+/[^_&#\?]+)')[3];
callback('plugin://plugin.audio.mixcloud/?mode=40&key=' + encodeURIComponent(videoId));
<<<<<<<
getPluginPath: function(url, callback) {
if (debugLogsEnabled) console.log("Sending message to tab '" + currentTabId + "' for video source.");
=======
getPluginPath: function(url, getAddOnVersion, callback) {
>>>>>>>
getPluginPath: function(url, getAddOnVersion, callback) {
if (debugLogsEnabled) console.log("Sending message to tab '" + currentTabId + "' for video source.");
<<<<<<<
getPluginPath: function(url, callback) {
var videoId = url.match('^(https|http)://(www\.)?vimeo.com[^/]*/(\\d+).*$')[3];
callback('plugin://plugin.video.vimeo/play/?video_id=' + videoId);
=======
getPluginPath: function(url, getAddOnVersion, callback) {
callback('plugin://plugin.video.p2p-streams/?url=' + encodeURIComponent(url) + '&mode=1&name=acestream+title');
>>>>>>>
getPluginPath: function(url, getAddOnVersion, callback) {
var videoId = url.match('^(https|http)://(www\.)?vimeo.com[^/]*/(\\d+).*$')[3];
callback('plugin://plugin.video.vimeo/play/?video_id=' + videoId);
<<<<<<<
getPluginPath: function(url, callback) {
callback('plugin://plugin.video.yleareena/?view=video&link=' + encodeURIComponent(url));
=======
getPluginPath: function(url, getAddOnVersion, callback) {
callback('plugin://plugin.video.p2p-streams/?url=' + encodeURIComponent(url) + '&mode=2&name=title+sopcast');
>>>>>>>
getPluginPath: function(url, getAddOnVersion, callback) {
callback('plugin://plugin.video.yleareena/?view=video&link=' + encodeURIComponent(url));
<<<<<<<
getPluginPath: function(url, callback) {
if (url.match('v=([^&]+)')) {
var videoId = url.match('v=([^&]+)')[1];
callback('plugin://plugin.video.youtube/?action=play_video&videoid=' + videoId);
}
=======
getPluginPath: function(url, getAddOnVersion, callback) {
chrome.tabs.sendMessage(currentTabId, {action: 'getUrgantShowVideoUrl'}, function (response) {
if (response) {
var urgantShowLink = response.url;
callback(urgantShowLink);
}
});
}
};
var KinoLiveModule = {
canHandleUrl: function(url) {
var validPatterns = [
"^.*kino-live\\.org/.*"
];
return urlMatchesOneOfPatterns(url, validPatterns);
},
>>>>>>>
getPluginPath: function(url, getAddOnVersion, callback) {
if (url.match('v=([^&]+)')) {
var videoId = url.match('v=([^&]+)')[1];
callback('plugin://plugin.video.youtube/?action=play_video&videoid=' + videoId);
}
<<<<<<<
var $youtubeContextMenu = $('ul.html5-context-menu');
$youtubeContextMenu.append('<li><span class="playtoxbmc-icon"></span><a id="playnow-' + videoId + '" class="yt-uix-button-menu-item html5-context-menu-link" target="_blank">Play Now</a></li>');
$youtubeContextMenu.append('<li><span class="playtoxbmc-icon"></span><a id="resume-' + videoId + '" class="yt-uix-button-menu-item html5-context-menu-link" target="_blank">Resume</a></li>');
$youtubeContextMenu.append('<li><span class="playtoxbmc-icon"></span><a id="queue-' + videoId + '" class="yt-uix-button-menu-item html5-context-menu-link" target="_blank">Queue</a></li>');
$youtubeContextMenu.append('<li><span class="playtoxbmc-icon"></span><a id="playnext-' + videoId + '" class="yt-uix-button-menu-item html5-context-menu-link" target="_blank">Play this Next</a></li>');
$('.playtoxbmc-icon')
.css('background', 'url(\'' + chrome.extension.getURL('/images/icon.png') + '\') no-repeat 3px 3px')
.css('height', '25px')
.css('width', '25px')
.css('border', 'none')
.css('background-size', '17px 17px')
.css('float', 'left');
$('#playnow-' + videoId).click(function () {
player.pause();
chrome.extension.sendMessage({action: 'playThis', url: url}, function (response) {});
$('ul.html5-context-menu').hide();
});
$('#resume-' + videoId).click(function () {
player.pause();
chrome.extension.sendMessage({action: 'resume', url: url, currentTime: Math.round(player.currentTime)}, function (response) {});
$('ul.html5-context-menu').hide();
});
$('#queue-' + videoId).click(function () {
chrome.extension.sendMessage({action: 'queueThis', url: url}, function (response) {});
$('ul.html5-context-menu').hide();
});
$('#playnext-' + videoId).click(function () {
chrome.extension.sendMessage({action: 'playThisNext', url: url}, function (response) {});
$('ul.html5-context-menu').hide();
});
}
=======
getPluginPath: function(url, getAddOnVersion, callback) {
chrome.tabs.sendMessage(currentTabId, {action: 'getKinoLiveVideoUrl'}, function (response) {
if (response) {
callback(response.url);
}
});
>>>>>>>
var $youtubeContextMenu = $('ul.html5-context-menu');
$youtubeContextMenu.append('<li><span class="playtoxbmc-icon"></span><a id="playnow-' + videoId + '" class="yt-uix-button-menu-item html5-context-menu-link" target="_blank">Play Now</a></li>');
$youtubeContextMenu.append('<li><span class="playtoxbmc-icon"></span><a id="resume-' + videoId + '" class="yt-uix-button-menu-item html5-context-menu-link" target="_blank">Resume</a></li>');
$youtubeContextMenu.append('<li><span class="playtoxbmc-icon"></span><a id="queue-' + videoId + '" class="yt-uix-button-menu-item html5-context-menu-link" target="_blank">Queue</a></li>');
$youtubeContextMenu.append('<li><span class="playtoxbmc-icon"></span><a id="playnext-' + videoId + '" class="yt-uix-button-menu-item html5-context-menu-link" target="_blank">Play this Next</a></li>');
$('.playtoxbmc-icon')
.css('background', 'url(\'' + chrome.extension.getURL('/images/icon.png') + '\') no-repeat 3px 3px')
.css('height', '25px')
.css('width', '25px')
.css('border', 'none')
.css('background-size', '17px 17px')
.css('float', 'left');
$('#playnow-' + videoId).click(function () {
player.pause();
chrome.extension.sendMessage({action: 'playThis', url: url}, function (response) {});
$('ul.html5-context-menu').hide();
});
$('#resume-' + videoId).click(function () {
player.pause();
chrome.extension.sendMessage({action: 'resume', url: url, currentTime: Math.round(player.currentTime)}, function (response) {});
$('ul.html5-context-menu').hide();
});
$('#queue-' + videoId).click(function () {
chrome.extension.sendMessage({action: 'queueThis', url: url}, function (response) {});
$('ul.html5-context-menu').hide();
});
$('#playnext-' + videoId).click(function () {
chrome.extension.sendMessage({action: 'playThisNext', url: url}, function (response) {});
$('ul.html5-context-menu').hide();
});
}
<<<<<<<
AcestreamModule,
AnimeLabModule,
ArdMediaThekModule,
=======
DirectVideoLinkModule,
DirectAudioLinkModule,
DumpertModule,
TorrentsLinkModule,
YoutubeModule,
VimeoModule,
FreerideModule,
>>>>>>>
AcestreamModule,
AnimeLabModule,
ArdMediaThekModule,
CdaModule
<<<<<<<
VimeoModule,
YleAreenaModule,
YoutubeModule,
ZdfMediathekModule
=======
Mp4UploadModule,
ZdfMediathekModule,
CdaModule
>>>>>>>
VimeoModule,
YleAreenaModule,
YoutubeModule,
ZdfMediathekModule, |
<<<<<<<
if(!Array.isArray(content) && content != null)
throw new Error("Exported value was not extracted as an array: " + JSON.stringify(content));
module.meta[__dirname] = {
=======
if(!Array.isArray(content) && content !== null)
throw new Error("Exported value is not a string.");
module.meta[fs.realpathSync(__dirname)] = {
>>>>>>>
if(!Array.isArray(content) && content != null)
throw new Error("Exported value was not extracted as an array: " + JSON.stringify(content));
module.meta[fs.realpathSync(__dirname)] = { |
<<<<<<<
var childFilename = "extract-text-webpack-plugin-output-filename"; // eslint-disable-line no-path-concat
var publicPath = typeof query.publicPath === "string" ? query.publicPath : this._compilation.outputOptions.publicPath;
var outputOptions = {
filename: childFilename,
publicPath: publicPath
};
var childCompiler = this._compilation.createChildCompiler("extract-text-webpack-plugin", outputOptions);
childCompiler.apply(new NodeTemplatePlugin(outputOptions));
childCompiler.apply(new LibraryTemplatePlugin(null, "commonjs2"));
childCompiler.apply(new NodeTargetPlugin());
childCompiler.apply(new SingleEntryPlugin(this.context, "!!" + request));
childCompiler.apply(new LimitChunkCountPlugin({ maxChunks: 1 }));
var subCache = "subcache " + __dirname + " " + request; // eslint-disable-line no-path-concat
childCompiler.plugin("compilation", function(compilation) {
if(compilation.cache) {
if(!compilation.cache[subCache])
compilation.cache[subCache] = {};
compilation.cache = compilation.cache[subCache];
}
});
// We set loaderContext[__dirname] = false to indicate we already in
// a child compiler so we don't spawn another child compilers from there.
childCompiler.plugin("this-compilation", function(compilation) {
compilation.plugin("normal-module-loader", function(loaderContext) {
loaderContext[__dirname] = false;
=======
if(query.extract !== false) {
var childFilename = "extract-text-webpack-plugin-output-filename"; // eslint-disable-line no-path-concat
var publicPath = typeof query.publicPath === "string" ? query.publicPath : this._compilation.outputOptions.publicPath;
var outputOptions = {
filename: childFilename,
publicPath: publicPath
};
var childCompiler = this._compilation.createChildCompiler("extract-text-webpack-plugin", outputOptions);
childCompiler.apply(new NodeTemplatePlugin(outputOptions));
childCompiler.apply(new LibraryTemplatePlugin(null, "commonjs2"));
childCompiler.apply(new NodeTargetPlugin());
childCompiler.apply(new SingleEntryPlugin(this.context, "!!" + request));
childCompiler.apply(new LimitChunkCountPlugin({ maxChunks: 1 }));
var subCache = "subcache " + fs.realpathSync(__dirname) + " " + request; // eslint-disable-line no-path-concat
childCompiler.plugin("compilation", function(compilation) {
if(compilation.cache) {
if(!compilation.cache[subCache])
compilation.cache[subCache] = {};
compilation.cache = compilation.cache[subCache];
}
});
// We set loaderContext[fs.realpathSync(__dirname)] = false to indicate we already in
// a child compiler so we don't spawn another child compilers from there.
childCompiler.plugin("this-compilation", function(compilation) {
compilation.plugin("normal-module-loader", function(loaderContext) {
loaderContext[fs.realpathSync(__dirname)] = false;
});
>>>>>>>
var childFilename = "extract-text-webpack-plugin-output-filename"; // eslint-disable-line no-path-concat
var publicPath = typeof query.publicPath === "string" ? query.publicPath : this._compilation.outputOptions.publicPath;
var outputOptions = {
filename: childFilename,
publicPath: publicPath
};
var childCompiler = this._compilation.createChildCompiler("extract-text-webpack-plugin", outputOptions);
childCompiler.apply(new NodeTemplatePlugin(outputOptions));
childCompiler.apply(new LibraryTemplatePlugin(null, "commonjs2"));
childCompiler.apply(new NodeTargetPlugin());
childCompiler.apply(new SingleEntryPlugin(this.context, "!!" + request));
childCompiler.apply(new LimitChunkCountPlugin({ maxChunks: 1 }));
var subCache = "subcache " + fs.realpathSync(__dirname) + " " + request; // eslint-disable-line no-path-concat
childCompiler.plugin("compilation", function(compilation) {
if(compilation.cache) {
if(!compilation.cache[subCache])
compilation.cache[subCache] = {};
compilation.cache = compilation.cache[subCache];
}
});
// We set loaderContext[fs.realpathSync(__dirname)] = false to indicate we already in
// a child compiler so we don't spawn another child compilers from there.
childCompiler.plugin("this-compilation", function(compilation) {
compilation.plugin("normal-module-loader", function(loaderContext) {
loaderContext[fs.realpathSync(__dirname)] = false;
<<<<<<<
});
this[__dirname](text, query);
if(text.locals && typeof resultSource !== "undefined") {
resultSource += "\nmodule.exports = " + JSON.stringify(text.locals) + ";";
=======
this[fs.realpathSync(__dirname)](text, query);
if(text.locals && typeof resultSource !== "undefined") {
resultSource += "\nmodule.exports = " + JSON.stringify(text.locals) + ";";
}
} catch(e) {
return callback(e);
>>>>>>>
});
this[fs.realpathSync(__dirname)](text, query);
if(text.locals && typeof resultSource !== "undefined") {
resultSource += "\nmodule.exports = " + JSON.stringify(text.locals) + ";";
<<<<<<<
} catch(e) {
return callback(e);
}
if(resultSource)
callback(null, resultSource);
else
callback();
}.bind(this));
=======
if(resultSource)
callback(null, resultSource);
else
callback();
}.bind(this));
} else {
this[fs.realpathSync(__dirname)]("", query);
return resultSource;
}
>>>>>>>
} catch(e) {
return callback(e);
}
if(resultSource)
callback(null, resultSource);
else
callback();
}.bind(this)); |
<<<<<<<
});
->
System.registerDynamic(['some', 'deps', 'require'], false, function(__require, __exports, __module) {
return (function(some, deps, require) {
})(__require('some'), __require('deps'), __require);
});
define(['dep'], factory)
->
System.registerDynamic(['dep'], false, function(__require, __exports, __module) {
return (factory)(__require('dep'));
});
define('jquery', [], factory)
->
System.registerDynamic([], false, factory);
IF it is the only define
otherwise we convert an AMD bundle into a register bundle:
System.registerDynamic('jquery', [], false, factory);
Note that when __module is imported, we decorate it with 'uri' and an empty 'config' function
*/
=======
>>>>>>> |
<<<<<<<
<div className="main-sidebar">
<div className="main-sidebar-contents">
<TOC
entities={entities}
url={url}
intl={intl}
translations={translations}
categories={categories}
/>
</div>
</div>
=======
{false && (
<div className="main-sidebar">
<TOC
entities={entities}
url={url}
intl={intl}
translations={translations}
categories={categories}
/>
</div>
)}
>>>>>>>
{false && (
<div className="main-sidebar">
<div className="main-sidebar-contents">
<TOC
entities={entities}
url={url}
intl={intl}
translations={translations}
categories={categories}
/>
</div>
</div>
)} |
<<<<<<<
this.item[0] = ig.game.itemCatalog.sword1;
this.item[1] = ig.game.itemCatalog.item1;
this.item[2] = ig.game.itemCatalog.item3;
this.item[3] = ig.game.itemCatalog.item4;
this.item[4] = ig.game.itemCatalog.sword5;
=======
this.item[0] = ig.game.itemCatalog.sword1; this.item_uses[0] = this.item[0].uses;
this.item[1] = ig.game.itemCatalog.item1; this.item_uses[1] = this.item[1].uses;
this.item[2] = ig.game.itemCatalog.sword3; this.item_uses[2] = this.item[2].uses;
this.item[3] = ig.game.itemCatalog.sword4; this.item_uses[3] = this.item[3].uses;
this.item[4] = ig.game.itemCatalog.sword5; this.item_uses[4] = this.item[4].uses;
>>>>>>>
this.item[0] = ig.game.itemCatalog.sword1;
this.item[1] = ig.game.itemCatalog.item1;
this.item[2] = ig.game.itemCatalog.item3;
this.item[3] = ig.game.itemCatalog.item4;
this.item[4] = ig.game.itemCatalog.sword5;
this.item[0] = ig.game.itemCatalog.sword1; this.item_uses[0] = this.item[0].uses;
this.item[1] = ig.game.itemCatalog.item1; this.item_uses[1] = this.item[1].uses;
this.item[2] = ig.game.itemCatalog.sword3; this.item_uses[2] = this.item[2].uses;
this.item[3] = ig.game.itemCatalog.sword4; this.item_uses[3] = this.item[3].uses;
this.item[4] = ig.game.itemCatalog.sword5; this.item_uses[4] = this.item[4].uses; |
<<<<<<<
item3: { name: 'Energy Drop', type: 'consumable', affinity: 'item', icon: new ig.Image('media/weapons/items/energy_drop.png'), uses: 1, cost: 0, desc: '', effect: function(entity){ entity.stat.str += 2 } },
item4: { name: 'Angelic Robe', type: 'consumable', affinity: 'item', icon: new ig.Image('media/weapons/items/angelic_robe.png'), uses: 1, cost: 0, desc: '', effect: function(entity){ entity.health_max += 7 } },
shop1: null,
init: function(x, y, settings){
this.shop1 = [this.sword1, this.sword2];
}
=======
item3: { name: 'Energy Drop', type: 'consumable', affinity: 'item', icon: new ig.Image('media/weapons/items/energy_drop.png'), uses: 1, cost: 0, desc: '', effect: function(entity) { entity.stat.str += 2; } },
item4: { name: 'Angelic Robe', type: 'consumable', affinity: 'item', icon: new ig.Image('media/weapons/items/angelic_robe.png'), uses: 1, cost: 0, desc: '', effect: function(entity) { entity.health_max += 7; } }
>>>>>>>
item3: { name: 'Energy Drop', type: 'consumable', affinity: 'item', icon: new ig.Image('media/weapons/items/energy_drop.png'), uses: 1, cost: 0, desc: '', effect: function(entity){ entity.stat.str += 2 } },
item4: { name: 'Angelic Robe', type: 'consumable', affinity: 'item', icon: new ig.Image('media/weapons/items/angelic_robe.png'), uses: 1, cost: 0, desc: '', effect: function(entity){ entity.health_max += 7 } },
shop1: null,
init: function(x, y, settings){
this.shop1 = [this.sword1, this.sword2];
}
item3: { name: 'Energy Drop', type: 'consumable', affinity: 'item', icon: new ig.Image('media/weapons/items/energy_drop.png'), uses: 1, cost: 0, desc: '', effect: function(entity) { entity.stat.str += 2; } },
item4: { name: 'Angelic Robe', type: 'consumable', affinity: 'item', icon: new ig.Image('media/weapons/items/angelic_robe.png'), uses: 1, cost: 0, desc: '', effect: function(entity) { entity.health_max += 7; } } |
<<<<<<<
// Items
item1: { name: 'Vulenary', type: 'consumable', affinity: 'potion', range: 1, icon: new ig.Image('media/weapons/items/vulenary.png'), uses: 3, cost: 100, effect: function(entity){ entity.receiveDamage(-5, this) }},
item2: { name: 'Elixer', type: 'consumable', affinity: 'potion', range: 1, icon: new ig.Image('media/weapons/items/elixer.png'), uses: 3, cost: 1300, effect: function(entity){entity.receiveDamage(this.health_max, this) }},
item3: { name: 'Energy Drop', type: 'consumable', affinity: 'potion', range: 1, icon: new ig.Image('media/weapons/items/energy_drop.png'), uses: 1, effect: function(entity){entity.stat.str += 2 }},
item4: { name: 'Angelic Robe', type: 'consumable', affinity: 'potion', range: 1, icon: new ig.Image('media/weapons/items/angelic_robe.png'), uses: 1, effect: function(entity){entity.health_max += 7}},
=======
// Healing items
item1: { name: 'Vulnerary', type: 'consumable', affinity: 'potion', icon: new ig.Image('media/weapons/items/vulnerary.png'), uses: 3, cost: 100, desc: '', effect: function(entity){ entity.receiveDamage(-5, this) } },
item2: { name: 'Elixir', type: 'consumable', affinity: 'potion', icon: new ig.Image('media/weapons/items/elixir.png'), uses: 3, cost: 1300, desc: '', effect: function(entity){ entity.receiveDamage(-10, this) } },
>>>>>>>
// Items
item1: { name: 'Vulenary', type: 'consumable', affinity: 'potion', range: 1, icon: new ig.Image('media/weapons/items/vulenary.png'), uses: 3, cost: 100, effect: function(entity){ entity.receiveDamage(-5, this) }},
item2: { name: 'Elixer', type: 'consumable', affinity: 'potion', range: 1, icon: new ig.Image('media/weapons/items/elixer.png'), uses: 3, cost: 1300, effect: function(entity){entity.receiveDamage(this.health_max, this) }},
item3: { name: 'Energy Drop', type: 'consumable', affinity: 'potion', range: 1, icon: new ig.Image('media/weapons/items/energy_drop.png'), uses: 1, effect: function(entity){entity.stat.str += 2 }},
item4: { name: 'Angelic Robe', type: 'consumable', affinity: 'potion', range: 1, icon: new ig.Image('media/weapons/items/angelic_robe.png'), uses: 1, effect: function(entity){entity.health_max += 7}},
// Healing items
item1: { name: 'Vulnerary', type: 'consumable', affinity: 'potion', icon: new ig.Image('media/weapons/items/vulnerary.png'), uses: 3, cost: 100, desc: '', effect: function(entity){ entity.receiveDamage(-5, this) } },
item2: { name: 'Elixir', type: 'consumable', affinity: 'potion', icon: new ig.Image('media/weapons/items/elixir.png'), uses: 3, cost: 1300, desc: '', effect: function(entity){ entity.receiveDamage(-10, this) } }, |
<<<<<<<
this.item[0] = ig.game.itemCatalog.axe1;
//this.item[0] = null;
this.item[1] = null;
this.item[2] = null;
this.item[3] = null;
this.item[4] = null;
this.derived_stats = ig.game.recomputeStats(this);
=======
//this.item[0] = null; this.item_uses[0] = this.item[0].uses;
//this.item[1] = null; this.item_uses[1] = this.item[1].uses;
//this.item[2] = null; this.item_uses[2] = this.item[2].uses;
//this.item[3] = null; this.item_uses[3] = this.item[3].uses;
//this.item[4] = null; this.item_uses[4] = this.item[4].uses;
>>>>>>>
this.item[0] = ig.game.itemCatalog.axe1;
//this.item[0] = null;
this.item[1] = null;
this.item[2] = null;
this.item[3] = null;
this.item[4] = null;
this.derived_stats = ig.game.recomputeStats(this);
//this.item[0] = null; this.item_uses[0] = this.item[0].uses;
//this.item[1] = null; this.item_uses[1] = this.item[1].uses;
//this.item[2] = null; this.item_uses[2] = this.item[2].uses;
//this.item[3] = null; this.item_uses[3] = this.item[3].uses;
//this.item[4] = null; this.item_uses[4] = this.item[4].uses; |
<<<<<<<
},
{
title: 'Tabs 标签页',
route: 'compTabsIndexZh'
=======
},
{
title: 'Avatar 头像',
route: 'compAvatarIndexZh'
>>>>>>>
},
{
title: 'Tabs 标签页',
route: 'compTabsIndexZh'
},
{
title: 'Avatar 头像',
route: 'compAvatarIndexZh' |
<<<<<<<
import Pagination from './pagination'
=======
import Card from './card'
import Grid from './grid'
import Radio from './radio'
import Switch from './switch'
import Message from './message'
import Transition from './transition'
import Breadcrumb from './breadcrumb'
import Tabs from './tabs'
import Tag from './tag'
>>>>>>>
import Pagination from './pagination'
import Card from './card'
import Grid from './grid'
import Radio from './radio'
import Switch from './switch'
import Message from './message'
import Transition from './transition'
import Breadcrumb from './breadcrumb'
import Tabs from './tabs'
import Tag from './tag'
<<<<<<<
},
{
path: '/pagination',
component: Pagination
=======
},
{
path: '/card',
component: Card
},
{
path: '/grid',
component: Grid
},
{
path: '/radio',
component: Radio
},
{
path: '/switch',
component: Switch
},
{
path: '/message',
component: Message
},
{
path: '/transition',
component: Transition
},
{
path: '/breadcrumb',
component: Breadcrumb
},
{
path: '/tabs',
component: Tabs
},
{
path: '/tag',
component: Tag
>>>>>>>
},
{
path: '/pagination',
component: Pagination
},
{
path: '/card',
component: Card
},
{
path: '/grid',
component: Grid
},
{
path: '/radio',
component: Radio
},
{
path: '/switch',
component: Switch
},
{
path: '/message',
component: Message
},
{
path: '/transition',
component: Transition
},
{
path: '/breadcrumb',
component: Breadcrumb
},
{
path: '/tabs',
component: Tabs
},
{
path: '/tag',
component: Tag |
<<<<<<<
import Radio from './radio'
=======
import Switch from './switch'
import Transition from './transition'
>>>>>>>
import Radio from './radio'
import Switch from './switch'
import Transition from './transition'
<<<<<<<
},
{
path: '/radio',
component: Radio
=======
},
{
path: '/switch',
component: Switch
},
{
path: '/transition',
component: Transition
>>>>>>>
},
{
path: '/radio',
component: Radio
},
{
path: '/switch',
component: Switch
},
{
path: '/transition',
component: Transition |
<<<<<<<
if(Array.isArray(featureFile)) {
let accumulatedErrors = [];
featureFile.forEach(element => {
var parsedFile = parser.parse(fs.readFileSync('test/rules/' + element, 'utf8')).feature;
accumulatedErrors = accumulatedErrors.concat(rule.run(parsedFile, {name: element}, configuration));
});
assert.sameDeepMembers(accumulatedErrors, expectedErrors);
} else {
var parsedFile = parser.parse(fs.readFileSync('test/rules/' + featureFile, 'utf8')).feature;
assert.sameDeepMembers(rule.run(parsedFile, {name: featureFile}, configuration), expectedErrors);
}
=======
const {feature, file} = linter.readAndParseFile('test/rules/' + featureFile, 'utf8');
assert.sameDeepMembers(rule.run(feature, file, configuration), expectedErrors);
>>>>>>>
if(Array.isArray(featureFile)) {
let accumulatedErrors = [];
featureFile.forEach(element => {
const {feature, file} = linter.readAndParseFile('test/rules/' + element, 'utf8');
accumulatedErrors = assert.sameDeepMembers(rule.run(feature, file, configuration), expectedErrors);
});
assert.sameDeepMembers(accumulatedErrors, expectedErrors);
} else {
const {feature, file} = linter.readAndParseFile('test/rules/' + featureFile, 'utf8');
assert.sameDeepMembers(rule.run(feature, file, configuration), expectedErrors);
} |
<<<<<<<
function noDuplicateScenarioNames(feature, file, configuration) {
if(configuration === 'in-feature') {
scenarios = [];
}
if(feature.children) {
var errors = [];
=======
function noDuplicateScenarioNames(feature, file) {
var errors = [];
if (feature && feature.children) {
>>>>>>>
function noDuplicateScenarioNames(feature, file) {
var errors = [];
if(configuration === 'in-feature') {
scenarios = [];
}
if (feature && feature.children) { |
<<<<<<<
tierHasStarted = (index) => {
const initialTiersValue = this.props.crowdsaleStore.selected.initialTiersValues[index]
return initialTiersValue ? Date.now() > new Date(initialTiersValue.startTime).getTime() : true
}
=======
tierHasEnded = (index) => {
const initialTierValues = this.props.crowdsaleStore.selected.initialTiersValues[index]
return initialTierValues && new Date(initialTierValues.endTime).getTime() <= Date.now()
}
>>>>>>>
tierHasStarted = (index) => {
const initialTiersValue = this.props.crowdsaleStore.selected.initialTiersValues[index]
return initialTiersValue ? Date.now() > new Date(initialTiersValue.startTime).getTime() : true
tierHasEnded = (index) => {
const initialTierValues = this.props.crowdsaleStore.selected.initialTiersValues[index]
return initialTierValues && new Date(initialTierValues.endTime).getTime() <= Date.now()
}
<<<<<<<
const disabled = !this.state.ownerCurrentUser || !tier.updatable || this.tierHasStarted(index) || crowdsaleHasEnded
=======
const disabled = !this.state.ownerCurrentUser || !tier.updatable || this.tierHasEnded(index)
>>>>>>>
const disabled = !this.state.ownerCurrentUser || !tier.updatable || this.tierHasStarted(index) || this.tierHasEnded(index)
<<<<<<<
const disabled = !this.state.ownerCurrentUser || !tier.updatable || this.tierHasStarted(index) || crowdsaleHasEnded
=======
const disabled = !this.state.ownerCurrentUser || !tier.updatable || this.tierHasEnded(index)
>>>>>>>
const disabled = !this.state.ownerCurrentUser || !tier.updatable || this.tierHasStarted(index) || this.tierHasEnded(index) |
<<<<<<<
import { checkTxMined, attachToContract, checkNetWorkByID, sendTXToContract } from '../../utils/blockchainHelpers'
import { getCrowdsaleData, getCurrentRate, initializeAccumulativeData, getAccumulativeCrowdsaleData, getCrowdsaleTargetDates, findCurrentContractRecursively, getJoinedTiers, getContractStoreProperty } from '../crowdsale/utils'
import { getQueryVariable, getURLParam, getWhiteListWithCapCrowdsaleAssets } from '../../utils/utils'
import { noMetaMaskAlert, noContractAlert, investmentDisabledAlert, investmentDisabledAlertInTime, successfulInvestmentAlert, invalidCrowdsaleAddrAlert } from '../../utils/alerts'
=======
import { getWeb3, checkTxMined, checkNetWorkByID, sendTXToContract } from '../../utils/blockchainHelpers'
import { getCrowdsaleData, getCurrentRate, initializeAccumulativeData, getAccumulativeCrowdsaleData, getCrowdsaleTargetDates, findCurrentContractRecursively, getJoinedTiers } from '../crowdsale/utils'
import { getQueryVariable, getURLParam, getWhiteListWithCapCrowdsaleAssets, toast } from '../../utils/utils'
import { noMetaMaskAlert, investmentDisabledAlertInTime, successfulInvestmentAlert, invalidCrowdsaleAddrAlert } from '../../utils/alerts'
>>>>>>>
import { checkTxMined, checkNetWorkByID, sendTXToContract } from '../../utils/blockchainHelpers'
import { getCrowdsaleData, getCurrentRate, initializeAccumulativeData, getAccumulativeCrowdsaleData, getCrowdsaleTargetDates, findCurrentContractRecursively, getJoinedTiers, getContractStoreProperty } from '../crowdsale/utils'
import { getQueryVariable, getURLParam, getWhiteListWithCapCrowdsaleAssets, toast } from '../../utils/utils'
import { noMetaMaskAlert, investmentDisabledAlertInTime, successfulInvestmentAlert, invalidCrowdsaleAddrAlert } from '../../utils/alerts'
<<<<<<<
import { CONTRACT_TYPES, GAS_PRICE } from '../../utils/constants'
import { observer, inject } from 'mobx-react'
=======
import { TOAST, defaultState, GAS_PRICE, INVESTMENT_OPTIONS } from '../../utils/constants'
import QRPaymentProcess from './QRPaymentProcess'
>>>>>>>
import { CONTRACT_TYPES, TOAST, GAS_PRICE, INVESTMENT_OPTIONS } from '../../utils/constants'
import { observer, inject } from 'mobx-react'
import QRPaymentProcess from './QRPaymentProcess'
<<<<<<<
getCrowdsaleData(web3, this, crowdsaleContract, () => {
initializeAccumulativeData(() => {
=======
getCrowdsaleData(web3, this, crowdsaleContract, () => {
initializeAccumulativeData(this, () => {
>>>>>>>
getCrowdsaleData(web3, this, crowdsaleContract, () => {
initializeAccumulativeData(() => {
<<<<<<<
investToTokens() {
const { crowdsalePageStore, web3Store, contractStore } = this.props
const web3 = web3Store.web3
let state = { ...this.state };
=======
investToTokens(event) {
event.preventDefault();
if (!this.isValidToken(this.state.tokensToInvest)) {
this.setState({ pristineTokenInput: false });
return;
}
let state = this.state;
>>>>>>>
investToTokens(event) {
event.preventDefault();
if (!this.isValidToken(this.state.tokensToInvest)) {
this.setState({ pristineTokenInput: false });
return;
}
const { crowdsalePageStore, web3Store } = this.props
const web3 = web3Store.web3
let state = { ...this.state };
<<<<<<<
this.props.investStore.setProperty('tokensToInvest', event.target.value)
=======
this.setState({ pristineTokenInput: false });
let state = this.state;
state["tokensToInvest"] = event.target.value;
this.setState(state);
>>>>>>>
this.setState({ pristineTokenInput: false });
this.props.investStore.setProperty('tokensToInvest', event.target.value)
<<<<<<<
const investorBalanceTiers = (tokenAmountOf?((tokenAmountOf/10**tokenDecimals)/*.toFixed(tokenDecimals)*/).toString():"0");
const investorBalanceStandard = (ethRaised?(ethRaised/*.toFixed(tokenDecimals)*//rate).toString():"0");
const investorBalance = (contractStore.contractType === CONTRACT_TYPES.whitelistwithcap)?investorBalanceTiers:investorBalanceStandard;
=======
const investorBalanceTiers = (tokenAmountOf?((tokenAmountOf/10**tokenDecimals)).toString():"0");
const investorBalanceStandard = (ethRaised?(ethRaised/rate).toString():"0");
const investorBalance = (this.state.contractType === this.state.contractTypes.whitelistwithcap)?investorBalanceTiers:investorBalanceStandard;
>>>>>>>
const investorBalanceTiers = (tokenAmountOf?((tokenAmountOf/10**tokenDecimals)).toString():"0");
const investorBalanceStandard = (ethRaised?(ethRaised/rate).toString():"0");
const investorBalance = (contractStore.contractType === CONTRACT_TYPES.whitelistwithcap)?investorBalanceTiers:investorBalanceStandard;
<<<<<<<
const tierCap = !isNaN(maxCapBeforeDecimals)?(maxCapBeforeDecimals/*.toFixed(tokenDecimals)*/).toString():"0";
const standardCrowdsaleSupply = !isNaN(crowdsalePageStore.supply)?(crowdsalePageStore.supply/*.toFixed(tokenDecimals)*/).toString():"0";
const totalSupply = (contractStore.contractType === CONTRACT_TYPES.whitelistwithcap)?tierCap:standardCrowdsaleSupply;
=======
const tierCap = !isNaN(maxCapBeforeDecimals)?(maxCapBeforeDecimals).toString():"0";
const standardCrowdsaleSupply = !isNaN(this.state.crowdsale.supply)?(this.state.crowdsale.supply).toString():"0";
const totalSupply = (this.state.contractType === this.state.contractTypes.whitelistwithcap)?tierCap:standardCrowdsaleSupply;
>>>>>>>
const tierCap = !isNaN(maxCapBeforeDecimals)?(maxCapBeforeDecimals).toString():"0";
const standardCrowdsaleSupply = !isNaN(crowdsalePageStore.supply)?(crowdsalePageStore.supply).toString():"0";
const totalSupply = (contractStore.contractType === CONTRACT_TYPES.whitelistwithcap)?tierCap:standardCrowdsaleSupply;
<<<<<<<
<input type="text" className="invest-form-input" value={investStore.tokensToInvest} onChange={this.tokensToInvestOnChange} placeholder="0"/>
=======
<input type="text" className="invest-form-input" value={this.state.tokensToInvest} onChange={this.tokensToInvestOnChange} placeholder="0"/>
>>>>>>>
<input type="text" className="invest-form-input" value={investStore.tokensToInvest} onChange={this.tokensToInvestOnChange} placeholder="0"/> |
<<<<<<<
this.props.deploymentStore.setDeployerAccount(context.selectedAccount)
}
static contextTypes = {
web3: PropTypes.object,
selectedAccount: PropTypes.string
=======
this.props.deploymentStore.setDeploymentStep(0)
>>>>>>>
this.props.deploymentStore.setDeploymentStep(0)
this.props.deploymentStore.setDeployerAccount(context.selectedAccount)
}
static contextTypes = {
web3: PropTypes.object,
selectedAccount: PropTypes.string |
<<<<<<<
import { CHAINS } from './constants'
import { crowdsaleStore, generalStore, web3Store, contractStore } from '../stores'
=======
import { CHAINS, MAX_GAS_PRICE } from './constants'
import { crowdsaleStore, generalStore, web3Store } from '../stores'
>>>>>>>
import { CHAINS, MAX_GAS_PRICE } from './constants'
import { crowdsaleStore, generalStore, web3Store, contractStore } from '../stores' |
<<<<<<<
export const DOWNLOAD_NAME = 'contractInfo'
export const DOWNLOAD_TYPE = {
text: 'text/plain',
blob: 'blob'
}
=======
export const DOWNLOAD_NAME = 'icowizard'
export const DOWNLOAD_TYPE = 'text/plain'
>>>>>>>
export const DOWNLOAD_NAME = 'icowizard'
export const DOWNLOAD_TYPE = {
text: 'text/plain',
blob: 'blob'
} |
<<<<<<<
.then(() => updateJoinedCrowdsalesRecursive(crowdsaleABI, crowdsaleAddr, 293146))
.then(() => setMintAgentRecursive(tokenABI, tokenAddr, crowdsaleAddr, 68425, 'setMintAgentCrowdsale'))
.then(() => setMintAgentRecursive(tokenABI, tokenAddr, currFinalizeAgentAddr, 68425, 'setMintAgentFinalizeAgent'))
=======
.then(() => updateJoinedCrowdsalesRecursive(crowdsaleABI, crowdsaleAddr))
.then(() => setMintAgentRecursive(tokenABI, tokenAddr, crowdsaleAddr))
.then(() => setMintAgentRecursive(tokenABI, tokenAddr, currFinalizeAgentAddr))
>>>>>>>
.then(() => updateJoinedCrowdsalesRecursive(crowdsaleABI, crowdsaleAddr))
.then(() => setMintAgentRecursive(tokenABI, tokenAddr, crowdsaleAddr, 'setMintAgentCrowdsale'))
.then(() => setMintAgentRecursive(tokenABI, tokenAddr, currFinalizeAgentAddr, 'setMintAgentFinalizeAgent'))
<<<<<<<
.then(() => setFinalizeAgentRecursive(crowdsaleABI, crowdsaleAddr, currFinalizeAgentAddr, 68622))
.then(() => setReleaseAgentRecursive(tokenABI, tokenAddr, currFinalizeAgentAddr, 65905))
.then(() => transferOwnership(tokenABI, tokenAddr, tierStore.tiers[0].walletAddress, 46699))
.then(() => {
this.hideModal()
successfulDeployment()
})
.catch(error => this.handleError(error))
=======
.then(() => setFinalizeAgentRecursive(crowdsaleABI, crowdsaleAddr, currFinalizeAgentAddr))
.then(() => setReleaseAgentRecursive(tokenABI, tokenAddr, currFinalizeAgentAddr))
.then(() => transferOwnership(tokenABI, tokenAddr, tierStore.tiers[0].walletAddress))
.then(() => this.hideLoader())
.catch(this.handleError.bind(this))
>>>>>>>
.then(() => setFinalizeAgentRecursive(crowdsaleABI, crowdsaleAddr, currFinalizeAgentAddr))
.then(() => setReleaseAgentRecursive(tokenABI, tokenAddr, currFinalizeAgentAddr))
.then(() => transferOwnership(tokenABI, tokenAddr, tierStore.tiers[0].walletAddress))
.then(() => {
this.hideModal()
successfulDeployment()
})
.catch(error => this.handleError(error)) |
<<<<<<<
=======
validateTicker,
validateTierEndDate,
validateTierStartDate,
validateTokenName,
>>>>>>>
validateTierEndDate,
validateTierStartDate, |
<<<<<<<
}
export function clearingReservedTokens() {
return sweetAlert2({
title: "Clear all reserved tokens",
html: "Are you sure you want to remove all reserved tokens?",
type: "warning",
showCancelButton: true,
cancelButtonText: "No",
confirmButtonText: "Yes",
reverseButtons: true
})
=======
}
export function whitelistImported(count) {
return sweetAlert2({
title: 'Addresses imported',
html: `${count} addresses were added to the whitelist`,
type: 'info'
})
>>>>>>>
}
export function clearingReservedTokens() {
return sweetAlert2({
title: "Clear all reserved tokens",
html: "Are you sure you want to remove all reserved tokens?",
type: "warning",
showCancelButton: true,
cancelButtonText: "No",
confirmButtonText: "Yes",
reverseButtons: true
})
}
export function whitelistImported(count) {
return sweetAlert2({
title: 'Addresses imported',
html: `${count} addresses were added to the whitelist`,
type: 'info'
}) |
<<<<<<<
return sendTXToContract(method)
.then(() => deploymentStore.setAsSuccessful('setReservedTokens'))
=======
return method.estimateGas(opts)
.then(estimatedGas => {
opts.gasLimit = calculateGasLimit(estimatedGas)
return sendTXToContract(method.send(opts))
})
>>>>>>>
return method.estimateGas(opts)
.then(estimatedGas => {
opts.gasLimit = calculateGasLimit(estimatedGas)
return sendTXToContract(method.send(opts))
})
.then(() => deploymentStore.setAsSuccessful('setReservedTokens'))
<<<<<<<
return sendTXToContract(method)
.then(() => deploymentStore.setAsSuccessful('transferOwnership'))
=======
return method.estimateGas(opts)
.then(estimatedGas => {
opts.gasLimit = calculateGasLimit(estimatedGas)
return sendTXToContract(method.send(opts))
})
>>>>>>>
return method.estimateGas(opts)
.then(estimatedGas => {
opts.gasLimit = calculateGasLimit(estimatedGas)
return sendTXToContract(method.send(opts))
})
.then(() => deploymentStore.setAsSuccessful('transferOwnership'))
<<<<<<<
return promise
.then(() => setFinalizeAgent(abi, addrs[index], finalizeAgentAddr, gasLimit))
.then(() => deploymentStore.setAsSuccessful('setFinalizeAgent'))
=======
return promise.then(() => setFinalizeAgent(abi, addrs[index], finalizeAgentAddr))
>>>>>>>
return promise
.then(() => setFinalizeAgent(abi, addrs[index], finalizeAgentAddr))
.then(() => deploymentStore.setAsSuccessful('setFinalizeAgent'))
<<<<<<<
return promise
.then(() => setReleaseAgent(abi, addr, finalizeAgentAddr, gasLimit))
.then(() => deploymentStore.setAsSuccessful('setReleaseAgent'))
=======
return promise.then(() => setReleaseAgent(abi, addr, finalizeAgentAddr))
>>>>>>>
return promise
.then(() => setReleaseAgent(abi, addr, finalizeAgentAddr))
.then(() => deploymentStore.setAsSuccessful('setReleaseAgent')) |
<<<<<<<
function getTargetAccountName(deployment) {
return configurationCache.getEnvironmentTypeByName(fp.get(['Value', 'EnvironmentType'])(deployment))
.then(fp.get(['AWSAccountName']))
.catch((e) => { logger.warn(e); return ''; });
}
function mapDeployment(deployment, account) {
=======
function mapDeployment(deployment) {
>>>>>>>
function getTargetAccountName(deployment) {
return configurationCache.getEnvironmentTypeByName(fp.get(['Value', 'EnvironmentType'])(deployment))
.then(fp.get(['AWSAccountName']))
.catch((e) => { logger.warn(e); return ''; });
}
function mapDeployment(deployment) {
<<<<<<<
return queryDeploymentNodeStates(deployment.Value.EnvironmentName, deployment.DeploymentID, account).then((nodes) => {
deployment.Value.Nodes = nodes.map((node) => {
=======
return queryDeploymentNodeStates(deployment.Value.EnvironmentName, deployment.DeploymentID, deployment.AccountName).then(nodes => {
deployment.Value.Nodes = nodes.map(node => {
>>>>>>>
return queryDeploymentNodeStates(deployment.Value.EnvironmentName, deployment.DeploymentID, deployment.AccountName).then((nodes) => {
deployment.Value.Nodes = nodes.map((node) => {
<<<<<<<
function cross(a, b) {
return a.reduce((acc, x) => acc.concat(b.map(y => [x, y])), []);
}
=======
function queryDeployment({ key }) {
let queryName = 'ScanCrossAccountDynamoResources';
let filter = {
DeploymentID: key
};
let currentDeploymentsQuery = {
name: queryName,
resource: 'deployments/history',
filter,
suppressError: true,
};
let completedDeploymentsQuery = {
name: queryName,
resource: 'deployments/completed',
filter,
suppressError: true,
};
>>>>>>>
function cross(a, b) {
return a.reduce((acc, x) => acc.concat(b.map(y => [x, y])), []);
}
<<<<<<<
return Promise.all(
queries.map(q => executeQuery(q).catch((e) => { logger.warn(e); return {}; }))
).then((results) => {
let result = results.map(x => x.Item).find(x => x);
if (result === undefined) {
throw new ResourceNotFoundError(`Deployment ${key} not found`);
} else {
return getTargetAccountName(result).then((accountName) => {
result.AccountName = accountName;
return result;
});
}
});
=======
return result;
>>>>>>>
return Promise.all(
queries.map(q => executeQuery(q).catch((e) => { logger.warn(e); return {}; }))
).then((results) => {
let result = results.map(x => x.Item).find(x => x);
if (result === undefined) {
throw new ResourceNotFoundError(`Deployment ${key} not found`);
} else {
return getTargetAccountName(result).then((accountName) => {
result.AccountName = accountName;
return result;
});
}
}); |
<<<<<<<
const sns = require('modules/sns/EnvironmentManagerEvents');
=======
let { when } = require('modules/functional');
let { ifNotFound, notFoundMessage } = require('api/api-utils/ifNotFound');
let environmentNotFound = notFoundMessage('environment');
>>>>>>>
const sns = require('modules/sns/EnvironmentManagerEvents');
let { when } = require('modules/functional');
let { ifNotFound, notFoundMessage } = require('api/api-utils/ifNotFound');
let environmentNotFound = notFoundMessage('environment'); |
<<<<<<<
=======
app.use(cookieAuthentication.middleware);
app.use(tokenAuthentication.middleware);
app.use(usernameMiddleware({ usernameProperty: REQUEST_USERNAME_PROPERTY }));
>>>>>>> |
<<<<<<<
/^(trlink|wolink)\.in$/,
=======
/^linkrex\.net$/,
/^3rabshort\.com$/,
/^shink\.xyz$/,
/^mlink\.club$/,
/^zlshorte\.net$/,
/^(igram|gram)\.im$/,
>>>>>>>
/^linkrex\.net$/,
/^3rabshort\.com$/,
/^shink\.xyz$/,
/^mlink\.club$/,
/^zlshorte\.net$/,
/^(igram|gram)\.im$/,
/^(trlink|wolink)\.in$/, |
<<<<<<<
rule: {
host: /yep\.it/,
},
ready: function () {
=======
rule: 'http://yep.it/preview.php?p=*',
run: function () {
>>>>>>>
rule: 'http://yep.it/preview.php?p=*',
ready: function () { |
<<<<<<<
host: [
/^www.img(taxi|adult).com$/,
/^www.imgdrive.net$/,
],
=======
host: /^www\.img(taxi|adult)\.com$/,
>>>>>>>
host: [
/^www\.img(taxi|adult)\.com$/,
/^www.imgdrive.net$/,
], |
<<<<<<<
start: function (m) {
$.redirect('/' + m.query[1]);
=======
run: function (m) {
$.openImage('/' + m.query[1]);
>>>>>>>
start: function (m) {
$.openImage('/' + m.query[1]);
<<<<<<<
start: function (m) {
$.redirect('/xxx/images/' + m.path[1]);
=======
run: function (m) {
$.openImage('/xxx/images/' + m.path[1]);
>>>>>>>
start: function (m) {
$.openImage('/xxx/images/' + m.path[1]);
<<<<<<<
start: function (m) {
$.redirect('/xxx/images/' + m.query[1]);
=======
run: function (m) {
$.openImage('/xxx/images/' + m.query[1]);
>>>>>>>
start: function (m) {
$.openImage('/xxx/images/' + m.query[1]);
<<<<<<<
start: function (m) {
$.redirect(m.query[1]);
=======
run: function (m) {
$.openLink(m.query[1]);
>>>>>>>
start: function (m) {
$.openLink(m.query[1]);
<<<<<<<
start: function (m) {
$.redirect(m.path[1]);
=======
run: function (m) {
$.openImage(m.path[1]);
>>>>>>>
start: function (m) {
$.openImage(m.path[1]);
<<<<<<<
start: function (m) {
$.redirect('/direct' + m.path[1]);
=======
run: function (m) {
$.openImage('/direct' + m.path[1]);
>>>>>>>
start: function (m) {
$.openImage('/direct' + m.path[1]);
<<<<<<<
start: function (m) {
$.redirect('/images/' + m.query[1]);
=======
run: function (m) {
$.openImage('/images/' + m.query[1]);
>>>>>>>
start: function (m) {
$.openImage('/images/' + m.query[1]);
<<<<<<<
start: function (m) {
$.redirect(decodeURIComponent(m.query[1]));
=======
run: function (m) {
$.openLink(decodeURIComponent(m.query[1]));
>>>>>>>
start: function (m) {
$.openLink(decodeURIComponent(m.query[1])); |
<<<<<<<
start: function (m) {
$.redirect(m.query[1]);
=======
run: function (m) {
$.openLink(m.query[1]);
>>>>>>>
start: function (m) {
$.openLink(m.query[1]);
<<<<<<<
start: function (m) {
$.redirect(m.path[1]);
=======
run: function (m) {
$.openLink(m.path[1]);
>>>>>>>
start: function (m) {
$.openLink(m.path[1]); |
<<<<<<<
/^(cutwin|cut-earn|earn-guide)\.com$/,
/^(cutwi|cut-w|cutl|dmus)\.in$/,
=======
/^earn-guide\.com$/,
/^cutwin\.com$/,
/^(cutwi|cut-w|cutl)\.in$/,
>>>>>>>
/^(cutwin|earn-guide)\.com$/,
/^(cutwi|cut-w|cutl|dmus)\.in$/,
<<<<<<<
// com
/^(dz4link|gocitlink|3rabcut|short2win)\.com$/,
/^(tmearn|payshorturl|urltips|shrinkearn)\.com$/,
/^(earn-url|bit-url|cut-win|link-zero)\.com$/,
/^(vy\.)?adsvy\.com$/,
/^(linkexa|admew|shrtfly|kuylink|cut4links)\.com$/,
// net
/^(safelinku|tinylinks|licklink|linkrex|zlshorte)\.net$/,
/^(vn|vina|fox)url\.net$/,
/^(www\.)?linkdrop\.net$/,
// else
/^(trlink|wolink|tocdo|megaurl)\.in$/,
/^(petty|tr)\.link$/,
/^idsly\.(com|bid)$/,
/^(adbilty|adpop|wicr)\.me$/,
/^wi\.cr$/,
=======
/^idsly\.com$/,
/^(adbilty|adpop|payskip)\.me$/,
>>>>>>>
// com
/^(dz4link|gocitlink|3rabcut|short2win)\.com$/,
/^(tmearn|payshorturl|urltips|shrinkearn)\.com$/,
/^(earn-url|bit-url|cut-win|link-zero|cut-earn)\.com$/,
/^(vy\.)?adsvy\.com$/,
/^(linkexa|admew|shrtfly|kuylink|cut4links)\.com$/,
// net
/^(safelinku|tinylinks|licklink|linkrex|zlshorte)\.net$/,
/^(vn|vina|fox)url\.net$/,
/^(www\.)?linkdrop\.net$/,
// else
/^(trlink|wolink|tocdo|megaurl)\.in$/,
/^(petty|tr)\.link$/,
/^idsly\.(com|bid)$/,
/^(adbilty|adpop|payskip|wicr)\.me$/,
/^wi\.cr$/,
<<<<<<<
/^(icutit|earnbig)\.ca$/,
=======
/^(vy\.)?adsvy\.com$/,
/^cut4links\.com$/,
/^(tmearn|payshorturl|urltips|shrinkearn)\.com$/,
/^(earn-url|bit-url|link-zero|cut-earn)\.com$/,
/^megaurl\.in$/,
/^(icutit|earnbig|cutearn)\.ca$/,
>>>>>>>
/^(icutit|earnbig|cutearn)\.ca$/,
<<<<<<<
// com
/^(cut-urls|linclik|premiumzen|shrt10|itiad|by6dk|mikymoons|man2pro|mykinggo)\.com$/,
/^short\.pastewma\.com$/,
/^linkfly\.gaosmedia\.com$/,
/^ads(horte|rt)\.com$/,
/^(www\.)?viralukk\.com$/,
/^(ot|load)url\.com$/,
/^(cut4|rao)link\.com$/,
// net
/^www\.worldhack\.net$/,
/^(eklink|vivads)\.net$/,
// else
/^(coshink|urle|adshort)\.co$/,
/^(weefy|payskip|adbull|zeiz|link4)\.me$/,
/^(adbilty|taive)\.in$/,
/^(psl|twik|adslink)\.pw$/,
/^(curs|crus|4cut|u2s|l2s)\.io$/,
=======
/^(psl|twik)\.pw$/,
/^coshink\.co$/,
/^(curs|crus|4cut)\.io$/,
/^cut-urls\.com$/,
/^adslink\.pw$/,
>>>>>>>
// com
/^(cut-urls|linclik|premiumzen|shrt10|itiad|by6dk|mikymoons|man2pro|mykinggo)\.com$/,
/^short\.pastewma\.com$/,
/^linkfly\.gaosmedia\.com$/,
/^ads(horte|rt)\.com$/,
/^(www\.)?viralukk\.com$/,
/^(ot|load)url\.com$/,
/^(cut4|rao)link\.com$/,
/^(adshorte|adsrt)\.com$/,
/^cut4link\.com$/,
// net
/^www\.worldhack\.net$/,
/^(eklink|vivads)\.net$/,
// else
/^(coshink|urle|adshort)\.co$/,
/^(weefy|adbull|zeiz|link4)\.me$/,
/^(adbilty|taive)\.in$/,
/^(psl|twik|adslink)\.pw$/,
/^(curs|crus|4cut|u2s|l2s)\.io$/,
<<<<<<<
/^(cutearn|shortit)\.ca$/,
=======
/^short\.pastewma\.com$/,
/^l2s\.io$/,
/^adbilty\.in$/,
/^linkfly\.gaosmedia\.com$/,
/^linclik\.com$/,
/^zeiz\.me$/,
/^adbull\.me$/,
/^adshort\.co$/,
/^(adshorte|adsrt)\.com$/,
/^weefy\.me$/,
/^premiumzen\.com$/,
/^cut4link\.com$/,
/^shortit\.ca$/,
/^(www\.)?viralukk\.com$/,
/^shrt10\.com$/,
/^mikymoons\.com$/,
>>>>>>>
/^shortit\.ca$/, |
<<<<<<<
ready: function (m) {
'use strict';
$('form[method="POST"]>input[name="_token"]').parentNode.submit();
=======
async ready () {
$('form').submit();
>>>>>>>
async ready () {
$('form[method="POST"]>input[name="_token"]').parentNode.submit(); |
<<<<<<<
rule: {
host: /cubeupload\.com/,
},
ready: function () {
=======
rule: 'http://cubeupload.com/im/*',
run: function () {
>>>>>>>
rule: 'http://cubeupload.com/im/*',
ready: function () { |
<<<<<<<
/^chronos\.to$/,
/^imgdrive\.co$/,
=======
>>>>>>>
/^imgdrive\.co$/, |
<<<<<<<
rule: {
host: /^imageupper\.com$/,
},
ready: function () {
=======
rule: 'http://imageupper.com/i/?*',
run: function () {
>>>>>>>
rule: 'http://imageupper.com/i/?*',
ready: function () { |
<<<<<<<
rule: {
host: /vvcap\.net/,
},
ready: function () {
=======
rule: 'http://vvcap.net/db/*.htp',
run: function () {
>>>>>>>
rule: 'http://vvcap.net/db/*.htp',
ready: function () { |
<<<<<<<
rule: {
host: /^picshare\.geenza\.com$/,
},
ready: function () {
=======
rule: 'http://picshare.geenza.com/pics/*',
run: function () {
>>>>>>>
rule: 'http://picshare.geenza.com/pics/*',
ready: function () {
<<<<<<<
rule: {
host: /adfoc\.us/,
},
ready: function () {
=======
rule: 'http://adfoc.us/serve/?id=*',
run: function () {
>>>>>>>
rule: 'http://adfoc.us/serve/?id=*',
ready: function () {
<<<<<<<
rule: {
host: /www\.4owl\.info|javelite\.tk/,
},
ready: function () {
=======
rule: [
'http://www.4owl.info/*',
'http://javelite.tk/viewer.php?id=*',
],
run: function () {
>>>>>>>
rule: [
'http://www.4owl.info/*',
'http://javelite.tk/viewer.php?id=*',
],
ready: function () {
<<<<<<<
rule: {
host: /.+\.directupload\.net/,
},
ready: function () {
=======
rule: 'http://*.directupload.net/file/*.htm',
run: function () {
>>>>>>>
rule: 'http://*.directupload.net/file/*.htm',
ready: function () {
<<<<<<<
rule: {
host: /www\.imagebam\.com/,
},
ready: function () {
=======
rule: 'http://www.imagebam.com/image/*',
run: function () {
>>>>>>>
rule: 'http://www.imagebam.com/image/*',
ready: function () {
<<<<<<<
rule: {
host: /www\.pic-upload\.de/,
},
ready: function () {
=======
rule: 'http://www.pic-upload.de/view-*.html',
run: function () {
>>>>>>>
rule: 'http://www.pic-upload.de/view-*.html',
ready: function () {
<<<<<<<
rule: {
host: /www\.bilder-hochladen\.net|imagehosting\.gr/,
},
ready: function () {
=======
rule: [
'http://imagehosting.gr/*.html',
'http://www.bilder-hochladen.net/files/*.html',
],
run: function () {
>>>>>>>
rule: [
'http://imagehosting.gr/*.html',
'http://www.bilder-hochladen.net/files/*.html',
],
ready: function () {
<<<<<<<
rule: {
host: /^www\.bild\.me$/,
},
ready: function () {
=======
rule: 'http://www.bild.me/bild.php?file=*',
run: function () {
>>>>>>>
rule: 'http://www.bild.me/bild.php?file=*',
ready: function () {
<<<<<<<
rule: {
host: /^www\.bilder-upload\.eu$/,
},
ready: function () {
=======
rule: 'http://www.bilder-upload.eu/show.php?file=*',
run: function () {
>>>>>>>
rule: 'http://www.bilder-upload.eu/show.php?file=*',
ready: function () {
<<<<<<<
rule: {
host: /^bildr\.no$/,
},
ready: function () {
=======
rule: 'http://bildr.no/view/*',
run: function () {
>>>>>>>
rule: 'http://bildr.no/view/*',
ready: function () {
<<<<<<<
rule: {
host: /^imagearn\.com$/,
},
ready: function () {
=======
rule: 'http://imagearn.com/image.php?id=*',
run: function () {
>>>>>>>
rule: 'http://imagearn.com/image.php?id=*',
ready: function () {
<<<<<<<
rule: {
host: /^tinypic\.com$/,
},
ready: function () {
=======
rule: 'http://tinypic.com/view.php?pic=*',
run: function () {
>>>>>>>
rule: 'http://tinypic.com/view.php?pic=*',
ready: function () {
<<<<<<<
rule: {
host: /^www\.dumppix\.com$/,
},
ready: function () {
=======
rule: 'http://www.dumppix.com/viewer.php?*',
run: function () {
>>>>>>>
rule: 'http://www.dumppix.com/viewer.php?*',
ready: function () {
<<<<<<<
rule: {
host: /^www\.subirimagenes\.com$/,
},
ready: function () {
=======
rule: 'http://www.subirimagenes.com/*.html',
run: function () {
>>>>>>>
rule: 'http://www.subirimagenes.com/*.html',
ready: function () {
<<<<<<<
rule: {
host: /^www\.lienscash\.com$/,
},
ready: function () {
=======
rule: 'http://www.lienscash.com/l/*',
run: function () {
>>>>>>>
rule: 'http://www.lienscash.com/l/*',
ready: function () {
<<<<<<<
rule: {
host: /^urlz\.so$/,
},
ready: function () {
=======
rule: 'http://urlz.so/l/*',
run: function () {
>>>>>>>
rule: 'http://urlz.so/l/*',
ready: function () {
<<<<<<<
rule: {
host: /www\.fotolink\.su/,
},
ready: function () {
=======
rule: 'http://www.fotolink.su/v.php?id=*',
run: function () {
>>>>>>>
rule: 'http://www.fotolink.su/v.php?id=*',
ready: function () {
<<<<<<<
rule: {
host: /^zo\.mu$/,
},
ready: function () {
=======
rule: 'http://zo.mu/redirector/process?link=*',
run: function () {
>>>>>>>
rule: 'http://zo.mu/redirector/process?link=*',
ready: function () {
<<<<<<<
rule: {
host: /^anonpic\.com$/,
},
ready: function () {
=======
rule: 'http://anonpic.com/?v=*',
run: function () {
>>>>>>>
rule: 'http://anonpic.com/?v=*',
ready: function () {
<<<<<<<
rule: {
host: /^www\.cyberpics\.net$/,
},
ready: function () {
=======
rule: 'http://www.cyberpics.net/pm/*.html',
run: function () {
>>>>>>>
rule: 'http://www.cyberpics.net/pm/*.html',
ready: function () { |
<<<<<<<
/^3rabshort\.com$/,
=======
/^linkrex\.net$/,
>>>>>>>
/^linkrex\.net$/,
/^3rabshort\.com$/, |
<<<<<<<
_.register({
rule: {
host: /^pornyfap\.com$/,
path: /\/pic\//,
},
async ready () {
const p = $('img#myImg');
await $.openImage(p.src);
},
});
=======
_.register({
rule: {
host: /^funimg\.net$/,
path: /\/img-.*\.html/,
},
async start () {
const path = window.location.href.replace('/img-', '/img3-');
await $.openLink(path);
},
});
_.register({
rule: {
host: /^funimg\.net$/,
path: /\/img3-.*\.html/,
},
async ready () {
const i = $('#continuetoimage img');
await $.openImage(i.src);
},
});
>>>>>>>
_.register({
rule: {
host: /^pornyfap\.com$/,
path: /\/pic\//,
},
async ready () {
const p = $('img#myImg');
await $.openImage(p.src);
},
});
_.register({
rule: {
host: /^funimg\.net$/,
path: /\/img-.*\.html/,
},
async start () {
const path = window.location.href.replace('/img-', '/img3-');
await $.openLink(path);
},
});
_.register({
rule: {
host: /^funimg\.net$/,
path: /\/img3-.*\.html/,
},
async ready () {
const i = $('#continuetoimage img');
await $.openImage(i.src);
},
}); |
<<<<<<<
=======
/^(www\.)?imgult\.com$/,
>>>>>>> |
<<<<<<<
rule: {
host: /^image18\.org|screenlist\.ru|www\.imagenetz\.de$/,
},
ready: function () {
=======
rule: [
'http://image18.org/show/*',
'http://screenlist.ru/details.php?image_id=*',
'http://www.imagenetz.de/*/*.html',
],
run: function () {
>>>>>>>
rule: [
'http://image18.org/show/*',
'http://screenlist.ru/details.php?image_id=*',
'http://www.imagenetz.de/*/*.html',
],
ready: function () { |
<<<<<<<
/^icutit\.ca$/,
/^shrt10\.com$/,
=======
/^(icutit|cutearn|earnbig)\.ca$/,
/^(www\.)?viralukk\.com$/,
>>>>>>>
/^(icutit|cutearn|earnbig)\.ca$/,
/^(www\.)?viralukk\.com$/,
/^shrt10\.com$/, |
<<<<<<<
<div className="missingText">
=======
</div>
<div className="AboutLandscape">
<img src={landscape}
alt="Service Mesh Landscape"
/>
>>>>>>>
<div className="AboutLandscape">
<img src={landscape}
alt="Service Mesh Landscape"
/> |
<<<<<<<
post = require('./post'),
vgSchema = require('vega-schema-url-parser').default;
=======
post = require('./post')
ural_parser = require('vega-schema-url-parser');
>>>>>>>
post = require('./post'),
ural_parser = require('vega-schema-url-parser').default; |
<<<<<<<
componentWillReceiveProps(nextProps) {
if (nextProps.compiledVegaSpec !== this.props.compiledVegaSpec) {
if (!nextProps.compiledVegaSpec) {
this.setState({
height: (window.innerHeight - LAYOUT.HeaderHeight) - 25,
})
} else {
this.setState({
height: (window.innerHeight - LAYOUT.HeaderHeight) / 2,
})
}
}
if(nextProps.parse) {
if (this.props.mode === MODES.Vega) {
this.props.updateVegaSpec(this.spec);
} else if (this.props.mode === MODES.VegaLite) {
this.props.updateVegaLiteSpec(this.spec);
}
this.props.parseSpec(false);
}
}
=======
>>>>>>>
componentWillReceiveProps(nextProps) {
if(nextProps.parse) {
if (this.props.mode === MODES.Vega) {
this.props.updateVegaSpec(this.spec);
} else if (this.props.mode === MODES.VegaLite) {
this.props.updateVegaLiteSpec(this.spec);
}
this.props.parseSpec(false);
}
} |
<<<<<<<
// TODO: display error / warnings
var vgSpec = vl.compile(opt, stats).spec;
=======
var vgSpec = vl.compile(spec, stats);
>>>>>>>
// TODO: display error / warnings
var vgSpec = vl.compile(spec, stats).spec;
<<<<<<<
if (opt.data.values === undefined) {
var prefix = ved.isPathAbsolute(opt.data.url) ? '' : ved.path;
d3[opt.data.formatType || 'json'](prefix + opt.data.url, function(err, data) {
=======
if (spec.data.values === undefined) {
d3[spec.data.formatType || 'json'](ved.path + spec.data.url, function(err, data) {
>>>>>>>
if (spec.data.values === undefined) {
var prefix = ved.isPathAbsolute(spec.data.url) ? '' : ved.path;
d3[spec.data.formatType || 'json'](prefix + spec.data.url, function(err, data) { |
<<<<<<<
import { UPDATE_VEGA_SPEC, UPDATE_VEGA_LITE_SPEC, PARSE_SPEC, TOGGLE_DEBUG, TOGGLE_AUTO_PARSE, CYCLE_RENDERER, SET_VEGA_EXAMPLE, SET_VEGA_LITE_EXAMPLE,
=======
import { UPDATE_VEGA_SPEC, UPDATE_VEGA_LITE_SPEC, CYCLE_RENDERER, SET_VEGA_EXAMPLE, SET_VEGA_LITE_EXAMPLE,
>>>>>>>
import { UPDATE_VEGA_SPEC, UPDATE_VEGA_LITE_SPEC, PARSE_SPEC, TOGGLE_AUTO_PARSE, CYCLE_RENDERER, SET_VEGA_EXAMPLE, SET_VEGA_LITE_EXAMPLE,
<<<<<<<
case TOGGLE_DEBUG:
return Object.assign({}, state, {
debug: !state.debug,
});
case TOGGLE_AUTO_PARSE:
return Object.assign({}, state, {
autoParse: !state.autoParse,
parse: !state.autoParse
});
=======
>>>>>>>
case TOGGLE_AUTO_PARSE:
return Object.assign({}, state, {
autoParse: !state.autoParse,
parse: !state.autoParse
}); |
<<<<<<<
var dfd = new Terraformer.Deferred();
=======
var args = Array.prototype.slice.call(arguments);
var dfd = new Deferred();
>>>>>>>
var args = Array.prototype.slice.call(arguments);
var dfd = new Terraformer.Deferred();
<<<<<<<
this.search = function(rect, callback) {
var dfd = new Terraformer.Deferred();
=======
this.search = function(shape, callback) {
var rect;
if(shape.type){
var b = Terraformer.Tools.calculateBounds(shape);
rect = {
x: b[0],
y: b[1],
w: Math.abs(b[0] - b[2]),
h: Math.abs(b[1] - b[3])
};
} else {
rect = shape;
}
var dfd = new Deferred();
>>>>>>>
this.search = function(shape, callback) {
var rect;
if(shape.type){
var b = Terraformer.Tools.calculateBounds(shape);
rect = {
x: b[0],
y: b[1],
w: Math.abs(b[0] - b[2]),
h: Math.abs(b[1] - b[3])
};
} else {
rect = shape;
}
var dfd = new Terraformer.Deferred();
<<<<<<<
this.insert = function(rect, obj, callback) {
var dfd = new Terraformer.Deferred();
=======
this.insert = function(shape, obj, callback) {
var rect;
if(shape.type){
var b = Terraformer.Tools.calculateBounds(shape);
rect = {
x: b[0],
y: b[1],
w: Math.abs(b[0] - b[2]),
h: Math.abs(b[1] - b[3])
};
} else {
rect = shape;
}
var dfd = new Deferred();
>>>>>>>
this.insert = function(shape, obj, callback) {
var rect;
if(shape.type){
var b = Terraformer.Tools.calculateBounds(shape);
rect = {
x: b[0],
y: b[1],
w: Math.abs(b[0] - b[2]),
h: Math.abs(b[1] - b[3])
};
} else {
rect = shape;
}
var dfd = new Terraformer.Deferred(); |
<<<<<<<
/* @flow weak */
export const RULE_TYPE = 'RULE'
export const KEYFRAME_TYPE = 'KEYFRAME'
export const FONT_TYPE = 'FONT'
export const STATIC_TYPE = 'STATIC'
export const CLEAR_TYPE = 'CLEAR'
=======
/* @flow */
export const RULE_TYPE = 1
export const KEYFRAME_TYPE = 2
export const FONT_TYPE = 3
export const STATIC_TYPE = 4
export const CLEAR_TYPE = 5
>>>>>>>
/* @flow */
export const RULE_TYPE = 'RULE'
export const KEYFRAME_TYPE = 'KEYFRAME'
export const FONT_TYPE = 'FONT'
export const STATIC_TYPE = 'STATIC'
export const CLEAR_TYPE = 'CLEAR' |
<<<<<<<
import { RendererContext, ThemeContext } from './context'
import { interceptDeprecation } from './_deprecate'
const Provider = interceptDeprecation(
RendererProvider,
'Importing `Provider` from inferno-fela is deprecated. Import `RendererProvider` instead.\nSee http://fela.js.org/docs/api/bindings/renderer-provider'
)
const FelaRenderer = RendererContext.Consumer
=======
>>>>>>>
import { RendererContext, ThemeContext } from './context'
const FelaRenderer = RendererContext.Consumer |
<<<<<<<
},
{
description: 'arrow functions in block-less for loops in a block-less if/else chain (#110)',
input: `
if (x)
for (let i = 0; i < a.length; ++i)
(() => { console.log(a[i]); })();
else if (y)
for (let i = 0; i < b.length; ++i)
(() => { console.log(b[i]); })();
else
for (let i = 0; i < c.length; ++i)
(() => { console.log(c[i]); })();
`,
// the indentation is not ideal, but the code is correct...
output: `
if (x)
{ var loop = function ( i ) {
(function () { console.log(a[i]); })();
};
for (var i = 0; i < a.length; ++i)
loop( i ); }
else if (y)
{ var loop$1 = function ( i ) {
(function () { console.log(b[i]); })();
};
for (var i$1 = 0; i$1 < b.length; ++i$1)
loop$1( i$1 ); }
else
{ var loop$2 = function ( i ) {
(function () { console.log(c[i]); })();
};
for (var i$2 = 0; i$2 < c.length; ++i$2)
loop$2( i$2 ); }
`
},
=======
},
{
description: 'always initialises block-scoped variable in loop (#124)',
input: `
for (let i = 0; i < 10; i++) {
let something;
if (i % 2) something = true;
console.log(something);
}`,
output: `
for (var i = 0; i < 10; i++) {
var something = void 0;
if (i % 2) something = true;
console.log(something);
}`
}
>>>>>>>
},
{
description: 'arrow functions in block-less for loops in a block-less if/else chain (#110)',
input: `
if (x)
for (let i = 0; i < a.length; ++i)
(() => { console.log(a[i]); })();
else if (y)
for (let i = 0; i < b.length; ++i)
(() => { console.log(b[i]); })();
else
for (let i = 0; i < c.length; ++i)
(() => { console.log(c[i]); })();
`,
// the indentation is not ideal, but the code is correct...
output: `
if (x)
{ var loop = function ( i ) {
(function () { console.log(a[i]); })();
};
for (var i = 0; i < a.length; ++i)
loop( i ); }
else if (y)
{ var loop$1 = function ( i ) {
(function () { console.log(b[i]); })();
};
for (var i$1 = 0; i$1 < b.length; ++i$1)
loop$1( i$1 ); }
else
{ var loop$2 = function ( i ) {
(function () { console.log(c[i]); })();
};
for (var i$2 = 0; i$2 < c.length; ++i$2)
loop$2( i$2 ); }
`
},
{
description: 'always initialises block-scoped variable in loop (#124)',
input: `
for (let i = 0; i < 10; i++) {
let something;
if (i % 2) something = true;
console.log(something);
}`,
output: `
for (var i = 0; i < 10; i++) {
var something = void 0;
if (i % 2) { something = true; }
console.log(something);
}`
} |
<<<<<<<
.version(appInfo.version, '-v, --version')
.option('-u, --url <url>', 'the elasticsearch url to connect to')
.option('-f, --file <file>', 'the file to read data from')
.option('-m, --max <items>', 'the max number of lines to process per batch (default: 20,000)', helpers.integer, 20000)
.option('--requestTimeout <ms>', 'ES CLIENT OPTION: milliseconds before an HTTP request will be aborted and retried. This can also be set per request (default: 30000)', helpers.integer, 30000)
.parse(process.argv);
=======
.version(appInfo.version, '-v, --version')
.option('-u, --url <url>', 'the elasticsearch url to connect to')
.option('-f, --file <file>', 'the file to read data from')
.option(
'-m, --max <items>',
'the max number of lines to process per batch (default: 20,000)',
helpers.integer,
20000
)
.parse(process.argv);
>>>>>>>
.version(appInfo.version, '-v, --version')
.option('-u, --url <url>', 'the elasticsearch url to connect to')
.option('-f, --file <file>', 'the file to read data from')
.option(
'-m, --max <items>',
'the max number of lines to process per batch (default: 20,000)',
helpers.integer,
20000
)
.option('--requestTimeout <ms>', 'ES CLIENT OPTION: milliseconds before an HTTP request will be aborted and retried. This can also be set per request (default: 30000)', helpers.integer, 30000)
.parse(process.argv);
<<<<<<<
var client = new elasticsearch.Client({
requestTimeout: program.requestTimeout,
hosts: program.url.split(',')
});
=======
var client = new elasticsearch.Client({ hosts: program.url.split(',') });
>>>>>>>
var client = new elasticsearch.Client({
requestTimeout: program.requestTimeout,
hosts: program.url.split(',')
});
<<<<<<<
var bulkImport = function (cb) {
client.bulk({body: currentBatch}, function (err, response) {
if (err) {
helpers.exit(err);
}
if (response.error) {
helpers.exit('When executing bulk query: ' + response.error.toString());
}
// reset global variables
currentCount = 0;
currentBatch = '';
// exit or continue processing
if (isFileDone) {
console.log('Complete!');
process.exit();
} else {
cb && cb();
}
});
=======
var bulkImport = function(cb) {
client.bulk({ body: currentBatch }, function(err, response) {
if (err) {
helpers.exit(err);
}
if (response.error) {
helpers.exit('When executing bulk query: ' + response.error.toString());
}
// reset global variables
currentCount = 0;
currentBatch = '';
// exit or continue processing
if (isFileDone) {
console.log('Complete!');
process.exit();
} else {
cb();
}
});
>>>>>>>
var bulkImport = function(cb) {
client.bulk({ body: currentBatch }, function(err, response) {
if (err) {
helpers.exit(err);
}
if (response.error) {
helpers.exit('When executing bulk query: ' + response.error.toString());
}
// reset global variables
currentCount = 0;
currentBatch = '';
// exit or continue processing
if (isFileDone) {
console.log('Complete!');
process.exit();
} else {
cb();
}
}); |
<<<<<<<
class ChunkMock {
constructor(modules) {
this._modules = modules;
}
forEachModule(fn) {
_.forEach(this._modules, fn);
}
}
=======
const packagerMockFactory = {
create(sandbox) {
const packagerMock = {
lockfileName: 'mocked-lock.json',
rebaseLockfile: sandbox.stub(),
getProdDependencies: sandbox.stub(),
install: sandbox.stub(),
prune: sandbox.stub()
};
return packagerMock;
}
};
>>>>>>>
class ChunkMock {
constructor(modules) {
this._modules = modules;
}
forEachModule(fn) {
_.forEach(this._modules, fn);
}
}
const packagerMockFactory = {
create(sandbox) {
const packagerMock = {
lockfileName: 'mocked-lock.json',
rebaseLockfile: sandbox.stub(),
getProdDependencies: sandbox.stub(),
install: sandbox.stub(),
prune: sandbox.stub()
};
return packagerMock;
}
}; |
<<<<<<<
dy: 0,
retainExisting: true // disable if you want the collection of items to be replaced completely by incoming items.
=======
dy: 0,
maxWidth: 0
>>>>>>>
dy: 0,
maxWidth: 0,
retainExisting: true // disable if you want the collection of items to be replaced completely by incoming items.
<<<<<<<
rawObj.style.margin = '0';
if (!options.adjustWidth)
{
rawObj.style.width = sourceWidth;
}
rawObj.style.width = (width + 'px'); // sets the width to the current element with even if it has been changed by a responsive design
=======
rawObj.style.margin = '0';
>>>>>>>
rawObj.style.margin = '0';
if (!options.adjustWidth)
{
rawObj.style.width = sourceWidth;
}
rawObj.style.width = (width + 'px'); // sets the width to the current element with even if it has been changed by a responsive design
<<<<<<<
if (options.adjustWidth === 'dynamic') {
// If destination container has different width than source container
// the width can be animated, adjusting it to destination width
$sourceParent.animate({width: $dest.width()}, options.duration, options.easing);
} else if (options.adjustWidth === 'auto') {
destWidth = $dest.width();
if (parseFloat(sourceWidth) < parseFloat(destWidth)) {
// Adjust the height now so that the items don't move out of the container
$sourceParent.css('width', destWidth);
} else {
// Adjust later, on callback
adjustWidthOnCallback = true;
}
}
=======
>>>>>>>
if (options.adjustWidth === 'dynamic') {
// If destination container has different width than source container
// the width can be animated, adjusting it to destination width
$sourceParent.animate({width: $dest.width()}, options.duration, options.easing);
} else if (options.adjustWidth === 'auto') {
destWidth = $dest.width();
if (parseFloat(sourceWidth) < parseFloat(destWidth)) {
// Adjust the height now so that the items don't move out of the container
$sourceParent.css('width', destWidth);
} else {
// Adjust later, on callback
adjustWidthOnCallback = true;
}
} |
<<<<<<<
function get(){
var fs_url = url + '?f=' + ( options.format || 'json' );
if ( !options || !options.catalog || !options.service ){
if ( callback ) {
=======
function get() {
if (!options || !options.catalog || !options.service) {
if (callback) {
>>>>>>>
function get() {
if (!options || !options.catalog || !options.service) {
if (callback) {
<<<<<<<
requestHandler.get( fs_url, function( err, data ) {
if ( callback ) { callback( err, data ); }
});
=======
var url = [options.catalog, options.service, 'FeatureServer'].join('/') + (options.layer ? '/' + options.layer : '');
_featureservice.url = url;
_featureservice.token = options.token;
>>>>>>>
var url = [options.catalog, options.service, options.type].join('/') + (options.layer ? '/' + options.layer : '');
_featureservice.url = url;
_featureservice.token = options.token;
<<<<<<<
function update( params, callback ){
=======
>>>>>>> |
<<<<<<<
import { RendererContext, ThemeContext } from './context'
import { interceptDeprecation } from './_deprecate'
const Provider = interceptDeprecation(
RendererProvider,
'Importing `Provider` from preact-fela is deprecated. Import `RendererProvider` instead.\nSee http://fela.js.org/docs/api/bindings/renderer-provider'
)
const FelaRenderer = RendererContext.Consumer
=======
>>>>>>>
import { RendererContext, ThemeContext } from './context'
const FelaRenderer = RendererContext.Consumer |
<<<<<<<
var url = [ options.catalog, options.service, 'FeatureServer/0'].join('/').replace(/\s/g, '');
=======
var requestHandler = this.requestHandler;
>>>>>>>
var url = [ options.catalog, options.service, 'FeatureServer/0'].join('/').replace(/\s/g, '');
var requestHandler = this.requestHandler;
<<<<<<<
request.get( fs_url, function( err, data ) {
=======
var url = [ options.catalog, options.service, 'FeatureServer/0'].join('/') + '?f=' + ( options.format || 'json' );
_featureservice.url = url;
requestHandler.get( url, function( err, data ) {
>>>>>>>
requestHandler.get( fs_url, function( err, data ) { |
<<<<<<<
});
services.factory('GeographicZone', function ($resource) {
return $resource('/geographicZone/:id.json', {}, {update:{method:'PUT'}});
});
services.factory('CreateGeographicZone', function ($resource) {
return $resource('/geographicZone/insert.json', {}, {insert:{method:'POST'}});
});
services.factory('GeographicLevels', function($resource) {
return $resource('/geographicLevels.json',{},{});
});
services.factory('GetGeographicZone',function($resource){
return $resource('/geographicZone/getDetails/:id.json',{},{});
});
services.factory('SetGeographicZone',function($resource){
return $resource('/geographicZone/setDetails.json',{},{update:{method:'POST'}});
})
=======
});
services.factory('Supplylinelist', function ($resource) {
return $resource('/supplylineslist.json', {}, {});
});
services.factory('Supplylines', function ($resource) {
return $resource('/supplylines.json', {});
});
services.factory('Supplyline', function ($resource) {
return $resource('/supplylines/:id.json', {}, {update:{method:'PUT'}});
});
>>>>>>>
});
services.factory('GeographicZone', function ($resource) {
return $resource('/geographicZone/:id.json', {}, {update:{method:'PUT'}});
});
services.factory('CreateGeographicZone', function ($resource) {
return $resource('/geographicZone/insert.json', {}, {insert:{method:'POST'}});
});
services.factory('GeographicLevels', function($resource) {
return $resource('/geographicLevels.json',{},{});
});
services.factory('GetGeographicZone',function($resource){
return $resource('/geographicZone/getDetails/:id.json',{},{});
});
services.factory('SetGeographicZone',function($resource){
return $resource('/geographicZone/setDetails.json',{},{update:{method:'POST'}});
});
services.factory('Supplylinelist', function ($resource) {
return $resource('/supplylineslist.json', {}, {});
});
services.factory('Supplylines', function ($resource) {
return $resource('/supplylines.json', {});
});
services.factory('Supplyline', function ($resource) {
return $resource('/supplylines/:id.json', {}, {update:{method:'PUT'}});
}); |
<<<<<<<
});
//vaccine storage service
services.factory('CreateVaccineStorage', function ($resource) {
return $resource('/createVaccineStorage.json', {}, {post:{method:'POST'}});
});
services.factory('UpdateVaccineStorage', function ($resource) {
return $resource('/updateVaccineStorage.json', {}, {post:{method:'POST'}});
});
services.factory('VaccineStorageList', function ($resource) {
return $resource('/vaccineStorageList.json', {}, {});
});
services.factory('VaccineStorageDetail', function ($resource) {
return $resource('/vaccineStorageDetail/:id.json', {}, {post:{method:'GET'}});
});
services.factory('DeleteVaccineStorage', function ($resource) {
return $resource('/deleteVaccineStorage.json', {}, {post:{method:'POST'}});
});
services.factory('StorageTypeList', function ($resource) {
return $resource('/storageTypeList.json', {}, {});
});
services.factory('TempratureList', function ($resource) {
return $resource('/tempratureList.json', {}, {});
=======
});
services.factory('VaccineTargetUpdate', function ($resource) {
return $resource('/vaccine/target/create.json', {}, {post:{method:'POST'}});
});
services.factory('VaccineTargetList', function ($resource) {
return $resource('/vaccine/target/list.json', {}, {});
});
services.factory('GetVaccineTarget', function ($resource) {
return $resource('/vaccine/target/get/:id.json', {}, {});
});
services.factory('DeleteVaccineTarget', function ($resource) {
return $resource('/vaccine/target/delete/:id.json', {}, {});
>>>>>>>
});
services.factory('VaccineTargetUpdate', function ($resource) {
return $resource('/vaccine/target/create.json', {}, {post:{method:'POST'}});
});
services.factory('VaccineTargetList', function ($resource) {
return $resource('/vaccine/target/list.json', {}, {});
});
services.factory('GetVaccineTarget', function ($resource) {
return $resource('/vaccine/target/get/:id.json', {}, {});
});
services.factory('DeleteVaccineTarget', function ($resource) {
return $resource('/vaccine/target/delete/:id.json', {}, {});
});
//vaccine storage service
services.factory('CreateVaccineStorage', function ($resource) {
return $resource('/createVaccineStorage.json', {}, {post:{method:'POST'}});
});
services.factory('UpdateVaccineStorage', function ($resource) {
return $resource('/updateVaccineStorage.json', {}, {post:{method:'POST'}});
});
services.factory('VaccineStorageList', function ($resource) {
return $resource('/vaccineStorageList.json', {}, {});
});
services.factory('VaccineStorageDetail', function ($resource) {
return $resource('/vaccineStorageDetail/:id.json', {}, {post:{method:'GET'}});
});
services.factory('DeleteVaccineStorage', function ($resource) {
return $resource('/deleteVaccineStorage.json', {}, {post:{method:'POST'}});
});
services.factory('StorageTypeList', function ($resource) {
return $resource('/storageTypeList.json', {}, {});
});
services.factory('TempratureList', function ($resource) {
return $resource('/tempratureList.json', {}, {}); |
<<<<<<<
});
services.factory('VaccineQuantificationUpdate', function ($resource) {
return $resource('/vaccineQuantification/create.json', {}, {post:{method:'POST'}});
});
services.factory('VaccineQuantificationList', function ($resource) {
return $resource('/vaccineQuantification/list.json', {}, {});
});
services.factory('GetVaccineQuantification', function ($resource) {
return $resource('/vaccineQuantification/get/:id.json', {}, {});
});
services.factory('DeleteVaccineQuantification', function ($resource) {
return $resource('/vaccineQuantification/delete/:id.json', {}, {});
});
services.factory('VaccineQuantificationFormLookUps', function ($resource) {
return $resource('/vaccineQuantification/formLookups.json', {}, {});
=======
});
//storage type
services.factory('CreateStorageType', function ($resource) {
return $resource('/createStorageType.json', {}, {post:{method:'POST'}});
});
services.factory('UpdateStorageType', function ($resource) {
return $resource('/updateStorageType.json', {}, {post:{method:'POST'}});
});
services.factory('StorageTypeDetail', function ($resource) {
return $resource('/storageTypeDetail/:id.json', {}, {post:{method:'GET'}});
});
services.factory('DeleteStorageType', function ($resource) {
return $resource('/deleteStorageType.json', {}, {post:{method:'POST'}});
});
//temprature
services.factory('CreateTemprature', function ($resource) {
return $resource('/createTemprature.json', {}, {post:{method:'POST'}});
});
services.factory('UpdateTemprature', function ($resource) {
return $resource('/updateTemprature.json', {}, {post:{method:'POST'}});
});
services.factory('TempratureDetail', function ($resource) {
return $resource('/tempratureDetail/:id.json', {}, {post:{method:'GET'}});
});
services.factory('DeleteTemprature', function ($resource) {
return $resource('/deleteTemprature.json', {}, {post:{method:'POST'}});
>>>>>>>
});
services.factory('VaccineQuantificationUpdate', function ($resource) {
return $resource('/vaccineQuantification/create.json', {}, {post:{method:'POST'}});
});
services.factory('VaccineQuantificationList', function ($resource) {
return $resource('/vaccineQuantification/list.json', {}, {});
});
services.factory('GetVaccineQuantification', function ($resource) {
return $resource('/vaccineQuantification/get/:id.json', {}, {});
});
services.factory('DeleteVaccineQuantification', function ($resource) {
return $resource('/vaccineQuantification/delete/:id.json', {}, {});
});
services.factory('VaccineQuantificationFormLookUps', function ($resource) {
return $resource('/vaccineQuantification/formLookups.json', {}, {});
});
//storage type
services.factory('CreateStorageType', function ($resource) {
return $resource('/createStorageType.json', {}, {post:{method:'POST'}});
});
services.factory('UpdateStorageType', function ($resource) {
return $resource('/updateStorageType.json', {}, {post:{method:'POST'}});
});
services.factory('StorageTypeDetail', function ($resource) {
return $resource('/storageTypeDetail/:id.json', {}, {post:{method:'GET'}});
});
services.factory('DeleteStorageType', function ($resource) {
return $resource('/deleteStorageType.json', {}, {post:{method:'POST'}});
});
//temprature
services.factory('CreateTemprature', function ($resource) {
return $resource('/createTemprature.json', {}, {post:{method:'POST'}});
});
services.factory('UpdateTemprature', function ($resource) {
return $resource('/updateTemprature.json', {}, {post:{method:'POST'}});
});
services.factory('TempratureDetail', function ($resource) {
return $resource('/tempratureDetail/:id.json', {}, {post:{method:'GET'}});
});
services.factory('DeleteTemprature', function ($resource) {
return $resource('/deleteTemprature.json', {}, {post:{method:'POST'}}); |
<<<<<<<
});
services.factory('GetProductCategoryProductByProgramTree',function ($resource){
return $resource('/reports/productProgramCategoryTree/:programId', {}, {});
});
services.factory('GetYearSchedulePeriodTree',function ($resource){
return $resource('/reports/yearSchedulePeriod', {}, {});
=======
});
services.factory('OrderFillRateSummaryReport', function ($resource) {
return $resource('/reports/reportdata/orderFillRateReportSummary.json', {}, {});
});
services.factory('GetOrderFillRateSummary', function($resource){
return $resource('/reports/OrderFillRateSummary/program/:programId/period/:periodId/schedule/:scheduleId/facilityTypeId/:facilityTypeId/zone/:zoneId/status/:status/orderFillRateSummary.json',{},{});
>>>>>>>
});
services.factory('GetProductCategoryProductByProgramTree',function ($resource){
return $resource('/reports/productProgramCategoryTree/:programId', {}, {});
});
services.factory('GetYearSchedulePeriodTree',function ($resource){
return $resource('/reports/yearSchedulePeriod', {}, {});
services.factory('OrderFillRateSummaryReport', function ($resource) {
return $resource('/reports/reportdata/orderFillRateReportSummary.json', {}, {});
});
services.factory('GetOrderFillRateSummary', function($resource){
return $resource('/reports/OrderFillRateSummary/program/:programId/period/:periodId/schedule/:scheduleId/facilityTypeId/:facilityTypeId/zone/:zoneId/status/:status/orderFillRateSummary.json',{},{}); |
<<<<<<<
facilityApprovedProducts: facilityApprovedProducts, requisitionRights: requisitionRights, $routeParams: routeParams,
$rootScope: rootScope, localStorageService: localStorageService, pageSize: pageSize,
hideAdditionalCommoditiesTab: false,
hideSkippedProducts: false,
enableSkipPeriod: false,
comments: [],
equipmentOperationalStatus:[]});
=======
facilityApprovedNFSProducts: facilityApprovedNFSProducts, requisitionRights: requisitionRights, $routeParams: routeParams,
$rootScope: rootScope, localStorageService: localStorageService, pageSize: pageSize});
>>>>>>>
facilityApprovedNFSProducts: facilityApprovedNFSProducts, requisitionRights: requisitionRights, $routeParams: routeParams,
$rootScope: rootScope, localStorageService: localStorageService, pageSize: pageSize,
hideAdditionalCommoditiesTab: false,
hideSkippedProducts: false,
enableSkipPeriod: false,
comments: [],
equipmentOperationalStatus:[]});
<<<<<<<
ctrl = controller(CreateRequisitionController, {$scope: scope, $location: location, requisitionData: {rnr: rnr}, rnrColumns: [], regimenTemplate: regimenTemplate,
currency: '$', pageSize: pageSize, lossesAndAdjustmentsTypes: lossesAndAdjustmentTypes, facilityApprovedProducts: facilityApprovedProducts,
requisitionRights: requisitionRights, $routeParams: routeParams, $rootScope: rootScope, localStorageService: localStorageService,
hideAdditionalCommoditiesTab: false,
hideSkippedProducts: false,
enableSkipPeriod: false,
comments: [],
equipmentOperationalStatus:[]});
=======
ctrl = controller(CreateRequisitionController, {$scope: scope, $location: location, requisitionData: {rnr: rnr}, rnrColumns: rnrColumns, regimenTemplate: regimenTemplate,
currency: '$', pageSize: pageSize, lossesAndAdjustmentsTypes: lossesAndAdjustmentTypes, facilityApprovedNFSProducts: facilityApprovedNFSProducts,
requisitionRights: requisitionRights, $routeParams: routeParams, $rootScope: rootScope, localStorageService: localStorageService});
>>>>>>>
ctrl = controller(CreateRequisitionController, {$scope: scope, $location: location, requisitionData: {rnr: rnr}, rnrColumns: rnrColumns, regimenTemplate: regimenTemplate,
currency: '$', pageSize: pageSize, lossesAndAdjustmentsTypes: lossesAndAdjustmentTypes, facilityApprovedNFSProducts: facilityApprovedNFSProducts,
requisitionRights: requisitionRights, $routeParams: routeParams, $rootScope: rootScope, localStorageService: localStorageService,
hideAdditionalCommoditiesTab: false,
hideSkippedProducts: false,
enableSkipPeriod: false,
comments: [],
equipmentOperationalStatus:[]});
<<<<<<<
ctrl = controller(CreateRequisitionController, {$scope: scope, $location: location, requisitionData: {rnr: rnr}, rnrColumns: [], regimenTemplate: regimenTemplate,
currency: '$', pageSize: pageSize, lossesAndAdjustmentsTypes: lossesAndAdjustmentTypes, facilityApprovedProducts: facilityApprovedProducts,
requisitionRights: requisitionRights, $routeParams: routeParams, $rootScope: rootScope, localStorageService: localStorageService,
hideAdditionalCommoditiesTab: false,
hideSkippedProducts: false,
enableSkipPeriod: false,
comments: [],
equipmentOperationalStatus:[]});
=======
ctrl = controller(CreateRequisitionController, {$scope: scope, $location: location, requisitionData: {rnr: rnr}, rnrColumns: rnrColumns, regimenTemplate: regimenTemplate,
currency: '$', pageSize: pageSize, lossesAndAdjustmentsTypes: lossesAndAdjustmentTypes, facilityApprovedNFSProducts: facilityApprovedNFSProducts,
requisitionRights: requisitionRights, $routeParams: routeParams, $rootScope: rootScope, localStorageService: localStorageService});
>>>>>>>
ctrl = controller(CreateRequisitionController, {$scope: scope, $location: location, requisitionData: {rnr: rnr}, rnrColumns: rnrColumns, regimenTemplate: regimenTemplate,
currency: '$', pageSize: pageSize, lossesAndAdjustmentsTypes: lossesAndAdjustmentTypes, facilityApprovedNFSProducts: facilityApprovedNFSProducts,
requisitionRights: requisitionRights, $routeParams: routeParams, $rootScope: rootScope, localStorageService: localStorageService,
hideAdditionalCommoditiesTab: false,
hideSkippedProducts: false,
enableSkipPeriod: false,
comments: [],
equipmentOperationalStatus:[]});
<<<<<<<
ctrl = controller(CreateRequisitionController, {$scope: scope, $location: location, requisitionData: {rnr: rnr}, rnrColumns: [], regimenTemplate: regimenTemplate,
currency: '$', pageSize: pageSize, lossesAndAdjustmentsTypes: lossesAndAdjustmentTypes, facilityApprovedProducts: facilityApprovedProducts,
requisitionRights: requisitionRights, $routeParams: routeParams, $rootScope: rootScope, localStorageService: localStorageService,
hideAdditionalCommoditiesTab: false,
hideSkippedProducts: false,
enableSkipPeriod: false,
comments: [],
equipmentOperationalStatus:[]});
=======
ctrl = controller(CreateRequisitionController, {$scope: scope, $location: location, requisitionData: {rnr: rnr}, rnrColumns: rnrColumns, regimenTemplate: regimenTemplate,
currency: '$', pageSize: pageSize, lossesAndAdjustmentsTypes: lossesAndAdjustmentTypes, facilityApprovedNFSProducts: facilityApprovedNFSProducts,
requisitionRights: requisitionRights, $routeParams: routeParams, $rootScope: rootScope, localStorageService: localStorageService});
>>>>>>>
ctrl = controller(CreateRequisitionController, {$scope: scope, $location: location, requisitionData: {rnr: rnr}, rnrColumns: rnrColumns, regimenTemplate: regimenTemplate,
currency: '$', pageSize: pageSize, lossesAndAdjustmentsTypes: lossesAndAdjustmentTypes, facilityApprovedNFSProducts: facilityApprovedNFSProducts,
requisitionRights: requisitionRights, $routeParams: routeParams, $rootScope: rootScope, localStorageService: localStorageService,
hideAdditionalCommoditiesTab: false,
hideSkippedProducts: false,
enableSkipPeriod: false,
comments: [],
equipmentOperationalStatus:[]});
<<<<<<<
currency: '$', pageSize: pageSize, lossesAndAdjustmentsTypes: lossesAndAdjustmentTypes, facilityApprovedProducts: facilityApprovedProducts,
requisitionRights: requisitionRights, $routeParams: routeParams, $rootScope: rootScope, localStorageService: localStorageService,
hideAdditionalCommoditiesTab: false,
hideSkippedProducts: false,
enableSkipPeriod: false,
comments: [],
equipmentOperationalStatus:[]});
=======
currency: '$', pageSize: pageSize, lossesAndAdjustmentsTypes: lossesAndAdjustmentTypes, facilityApprovedNFSProducts: facilityApprovedNFSProducts,
requisitionRights: requisitionRights, $routeParams: routeParams, $rootScope: rootScope, localStorageService: localStorageService});
>>>>>>>
currency: '$', pageSize: pageSize, lossesAndAdjustmentsTypes: lossesAndAdjustmentTypes, facilityApprovedNFSProducts: facilityApprovedNFSProducts,
requisitionRights: requisitionRights, $routeParams: routeParams, $rootScope: rootScope, localStorageService: localStorageService,
hideAdditionalCommoditiesTab: false,
hideSkippedProducts: false,
enableSkipPeriod: false,
comments: [],
equipmentOperationalStatus:[]}); |
<<<<<<<
services.factory('RepairManagement', function ($resource) {
return $resource('/reports/reportdata/repairManagement.json', {}, {});
});
services.factory('RepairManagementEquipmentList', function ($resource) {
return $resource('/reports/reportdata/repairManagementEquipmentList.json', {}, {});
});
=======
services.factory('ReplacementPlanSummaryReport', function($resource){
return $resource('/reports/reportdata/replacementPlanSummary.json',{},{});
});
services.factory('EquipmentsInNeedForReplacement', function($resource){
return $resource('/reports/reportdata/equipmentsInNeedForReplacement.json',{},{});
});
>>>>>>>
services.factory('RepairManagement', function ($resource) {
return $resource('/reports/reportdata/repairManagement.json', {}, {});
});
services.factory('RepairManagementEquipmentList', function ($resource) {
return $resource('/reports/reportdata/repairManagementEquipmentList.json', {}, {});
services.factory('ReplacementPlanSummaryReport', function($resource){
return $resource('/reports/reportdata/replacementPlanSummary.json',{},{});
});
services.factory('EquipmentsInNeedForReplacement', function($resource){
return $resource('/reports/reportdata/equipmentsInNeedForReplacement.json',{},{});
}); |
<<<<<<<
while ( tracksByStart[tracks.startIndex] && tracksByStart[tracks.startIndex].start <= currentTime ) {
if ( tracksByStart[tracks.startIndex].end > currentTime && tracksByStart[tracks.startIndex]._running === false ) {
tracksByStart[tracks.startIndex]._running = true;
tracksByStart[tracks.startIndex]._natives.start.call( that, event, tracksByStart[tracks.startIndex] );
=======
while ( tracksByStart[ tracks.startIndex ] && tracksByStart[ tracks.startIndex ].start <= currentTime ) {
// if plugin does not exist on this instance, remove it
if ( !tracksByStart[ tracks.startIndex ]._natives || !!that[ tracksByStart[ tracks.startIndex ]._natives.type ] ) {
if ( tracksByStart[ tracks.startIndex ].end > currentTime && tracksByStart[ tracks.startIndex ]._running === false ) {
tracksByStart[ tracks.startIndex ]._running = true;
tracksByStart[ tracks.startIndex ]._natives.start.call( that, event, tracksByStart[ tracks.startIndex ] );
}
tracks.startIndex++;
} else {
// remove track event
Popcorn.removeTrackEvent( that, tracksByStart[ tracks.startIndex ]._id );
return;
>>>>>>>
while ( tracksByStart[ tracks.startIndex ] && tracksByStart[ tracks.startIndex ].start <= currentTime ) {
// if plugin does not exist on this instance, remove it
if ( !tracksByStart[ tracks.startIndex ]._natives || !!that[ tracksByStart[ tracks.startIndex ]._natives.type ] ) {
if ( tracksByStart[ tracks.startIndex ].end > currentTime && tracksByStart[ tracks.startIndex ]._running === false ) {
tracksByStart[ tracks.startIndex ]._running = true;
tracksByStart[ tracks.startIndex ]._natives.start.call( that, event, tracksByStart[ tracks.startIndex ] );
}
tracks.startIndex++;
} else {
// remove track event
Popcorn.removeTrackEvent( that, tracksByStart[ tracks.startIndex ]._id );
return;
<<<<<<<
while ( tracksByEnd[tracks.endIndex] && tracksByEnd[tracks.endIndex].end > currentTime ) {
if ( tracksByEnd[tracks.endIndex].start <= currentTime && tracksByEnd[tracks.endIndex]._running === false ) {
tracksByEnd[tracks.endIndex]._running = true;
tracksByEnd[tracks.endIndex]._natives.start.call( that, event, tracksByEnd[tracks.endIndex] );
=======
while ( tracksByEnd[ tracks.endIndex ] && tracksByEnd[ tracks.endIndex ].end > currentTime ) {
// if plugin does not exist on this instance, remove it
if ( !tracksByEnd[ tracks.endIndex ]._natives || !!that[ tracksByEnd[ tracks.endIndex ]._natives.type ] ) {
if ( tracksByEnd[ tracks.endIndex ].start <= currentTime && tracksByEnd[ tracks.endIndex ]._running === false ) {
tracksByEnd[ tracks.endIndex ]._running = true;
tracksByEnd[ tracks.endIndex ]._natives.start.call( that, event, tracksByEnd[tracks.endIndex] );
}
tracks.endIndex--;
} else {
// remove track event
Popcorn.removeTrackEvent( that, tracksByEnd[ tracks.endIndex ]._id );
return;
>>>>>>>
while ( tracksByEnd[ tracks.endIndex ] && tracksByEnd[ tracks.endIndex ].end > currentTime ) {
// if plugin does not exist on this instance, remove it
if ( !tracksByEnd[ tracks.endIndex ]._natives || !!that[ tracksByEnd[ tracks.endIndex ]._natives.type ] ) {
if ( tracksByEnd[ tracks.endIndex ].start <= currentTime && tracksByEnd[ tracks.endIndex ]._running === false ) {
tracksByEnd[ tracks.endIndex ]._running = true;
tracksByEnd[ tracks.endIndex ]._natives.start.call( that, event, tracksByEnd[tracks.endIndex] );
}
tracks.endIndex--;
} else {
// remove track event
Popcorn.removeTrackEvent( that, tracksByEnd[ tracks.endIndex ]._id );
return;
<<<<<<<
=======
>>>>>>>
<<<<<<<
var self = this,
guid = Popcorn.guid( "execCallback" ),
=======
var self = this,
guid = Popcorn.guid( "execCallback" ),
>>>>>>>
var self = this,
guid = Popcorn.guid( "execCallback" ),
<<<<<<<
if ( this.currentTime() >= time && !callback.fired ) {
=======
if ( Math.round( this.currentTime() ) === time && !callback.fired ) {
>>>>>>>
if ( Math.round( this.currentTime() ) === time && !callback.fired ) {
<<<<<<<
this.unlisten("timeupdate", guid );
=======
>>>>>>>
<<<<<<<
=======
// Enforce a once per second execution
setTimeout(function() {
callback.fired = false;
}, 1000 );
>>>>>>>
// Enforce a once per second execution
setTimeout(function() {
callback.fired = false;
}, 1000 );
<<<<<<<
},
removePlugin: function( name ) {
var byStart = this.data.trackEvents.byStart,
byEnd = this.data.trackEvents.byEnd,
idx, rl, sl;
delete Popcorn.p[ name ];
// remove plugin reference from registry
for ( idx = 0, rl = Popcorn.registry.length; idx < rl; idx++ ) {
if ( Popcorn.registry[ idx ].type === name ) {
Popcorn.registry.splice( idx, 1 );
break; // plugin found, stop checking
}
}
// remove all trackEvents
for ( idx = 0, sl = byStart.length; idx < sl; idx++ ) {
if ( ( byStart[ idx ] && byStart[ idx ]._natives && byStart[ idx ]._natives.type === name ) &&
( byEnd[ idx ] && byEnd[ idx ]._natives && byEnd[ idx ]._natives.type === name ) ) {
byStart.splice( idx, 1 );
byEnd.splice( idx, 1 );
// update for loop if something removed, but keep checking
idx--; sl--;
if ( this.data.trackEvents.startIndex <= idx ) {
this.data.trackEvents.startIndex--;
this.data.trackEvents.endIndex--;
}
}
}
return this;
=======
>>>>>>>
<<<<<<<
return this;
},
special: {
// handles timeline controllers
play: function () {
// renders all of the interally stored track commands
}
=======
return this;
>>>>>>>
return this;
<<<<<<<
var historyLen = obj.data.history.length,
indexWasAt = 0,
byStart = [],
byEnd = [],
history = [];
Popcorn.forEach( obj.data.trackEvents.byStart, function( o, i, context) {
=======
var historyLen = obj.data.history.length,
indexWasAt = 0,
byStart = [],
byEnd = [],
history = [];
Popcorn.forEach( obj.data.trackEvents.byStart, function( o, i, context ) {
>>>>>>>
var historyLen = obj.data.history.length,
indexWasAt = 0,
byStart = [],
byEnd = [],
history = [];
Popcorn.forEach( obj.data.trackEvents.byStart, function( o, i, context) {
<<<<<<<
if ( options.dataType && options.dataType.toLowerCase() === "jsonp" ) {
=======
if ( options.dataType &&
( options.dataType.toLowerCase() === "jsonp" ||
options.dataType.toLowerCase() === "script" ) ) {
>>>>>>>
if ( options.dataType &&
( options.dataType.toLowerCase() === "jsonp" ||
options.dataType.toLowerCase() === "script" ) ) {
<<<<<<<
Popcorn.xhr.getJSONP = function ( url, success ) {
=======
Popcorn.xhr.getJSONP = function ( url, success, isScript ) {
// If this is a script request, ensure that we do not call something that has already been loaded
if ( isScript ) {
var scripts = document.querySelectorAll('script[src="' + url + '"]');
// If there are scripts with this url loaded, early return
if ( scripts.length ) {
// Execute success callback and pass "exists" flag
success && success( true );
return;
}
}
>>>>>>>
Popcorn.xhr.getJSONP = function ( url, success, isScript ) {
// If this is a script request, ensure that we do not call something that has already been loaded
if ( isScript ) {
var scripts = document.querySelectorAll('script[src="' + url + '"]');
// If there are scripts with this url loaded, early return
if ( scripts.length ) {
// Execute success callback and pass "exists" flag
success && success( true );
return;
}
}
<<<<<<<
=======
>>>>>>>
<<<<<<<
if ( !paramStr ) {
=======
if ( !paramStr && !isScript ) {
>>>>>>>
if ( !paramStr && !isScript ) {
<<<<<<<
if ( callback ) {
=======
if ( callback && !isScript ) {
>>>>>>>
if ( callback && !isScript ) {
<<<<<<<
};
=======
};
>>>>>>>
}; |
<<<<<<<
=======
args.push(last.bind(this));
>>>>>>>
args.push(last.bind(this));
<<<<<<<
if (err) return this.respond(res, 500, err);
res.locals.items = items;
next();
res.status(res.statusCode).json(items);
=======
if (err) return this.setResponse(res, {status: 500, error: err}, next);
return this.setResponse(res, {status: res.statusCode, item: items}, next);
>>>>>>>
if (err) return this.setResponse(res, {status: 500, error: err}, next);
return this.setResponse(res, {status: res.statusCode, item: items}, next);
<<<<<<<
if (err) return this.respond(res, 500, err);
if (!item) return this.respond(res, 404);
res.locals.item = item;
next();
res.json(item);
=======
if (err) return this.setResponse(res, {status: 500, error: err}, next);
if (!item) return this.setResponse(res, {status: 404}, next);
return this.setResponse(res, {status: 200, item: item}, next);
>>>>>>>
if (err) return this.setResponse(res, {status: 500, error: err}, next);
if (!item) return this.setResponse(res, {status: 404}, next);
return this.setResponse(res, {status: 200, item: item}, next);
<<<<<<<
if (err) return this.respond(res, 400, err);
res.locals.item = item;
next();
res.status(201).json(item);
=======
if (err) return this.setResponse(res, {status: 400, error: err}, next);
return this.setResponse(res, {status: 201, item: item}, next);
>>>>>>>
if (err) return this.setResponse(res, {status: 400, error: err}, next);
return this.setResponse(res, {status: 201, item: item}, next);
<<<<<<<
if (err) return this.respond(res, 400, err);
res.locals.item = item;
next();
res.json(item);
}.bind(this));
}.bind(this));
}, options));
return this;
},
/**
* Patch (Partial Update) a resource.
*/
patch: function(options) {
this.methods.push('patch');
app.patch.apply(app, this.register(this.route + '/:' + this.name + 'Id', function(req, res, next) {
var query = req.modelQuery || this.model;
query.findOne({"_id": req.params[this.name + 'Id']}, function(err, item) {
if (err) return this.respond(res, 500, err);
if (!item) return this.respond(res, 404);
var patches = req.body
item.patch(patches, function (err) {
if (err) return this.respond(res, 400, err);
res.locals.item = item;
next();
res.json(item);
=======
if (err) return this.setResponse(res, {status: 400, error: err}, next);
return this.setResponse(res, {status: 200, item: item}, next);
>>>>>>>
if (err) return this.setResponse(res, {status: 400, error: err}, next);
return this.setResponse(res, {status: 200, item: item}, next);
}.bind(this));
}.bind(this));
}, options));
return this;
},
/**
* Patch (Partial Update) a resource.
*/
patch: function(options) {
this.methods.push('patch');
app.patch.apply(app, this.register(this.route + '/:' + this.name + 'Id', function(req, res, next) {
var query = req.modelQuery || this.model;
query.findOne({"_id": req.params[this.name + 'Id']}, function(err, item) {
if (err) return this.respond(res, 500, err);
if (!item) return this.respond(res, 404);
var patches = req.body
item.patch(patches, function (err) {
if (err) return this.setResponse(res, {status: 400, error: err}, next);
return this.setResponse(res, {status: 200, item: item}, next);
<<<<<<<
if (err) return this.respond(res, 400, err);
res.locals.item = item;
next();
res.status(204).json();
=======
if (err) return this.setResponse(res, {status: 400, error: err}, next);
return this.setResponse(res, {status: 204, item: 'deleted'}, next);
>>>>>>>
if (err) return this.setResponse(res, {status: 400, error: err}, next);
return this.setResponse(res, {status: 204, item: 'deleted'}, next); |
<<<<<<<
},
{
name: "remoteStorage.js",
size: "0.6k",
tags: ["events", "ajax", "storage" ],
description: "A library for adding remoteStorage support to your client-side app.",
url: "https://github.com/unhosted/remoteStorage.js",
source: "https://raw.github.com/unhosted/remoteStorage.js/master/src/remoteStorage.js"
},
{
name: "impress.js",
size: "2.5k",
tags: ["animation", "jsanimation", "css", "css3" ],
description: "A presentation framework based on the power of CSS3 transforms and transitions in modern browsers and inspired by the idea behind prezi.com.",
url: "https://github.com/bartaz/impress.js",
source: "https://raw.github.com/bartaz/impress.js/master/js/impress.js"
=======
},
{
name: "Jwerty",
size: "2k",
tags: ["events" ],
description: "Bind, fire and assert on keyboard events, with easy to use keyboard selector combos",
url: "https://github.com/keithamus/jwerty",
source: "https://raw.github.com/keithamus/jwerty/master/jwerty.js"
>>>>>>>
},
{
name: "remoteStorage.js",
size: "0.6k",
tags: ["events", "ajax", "storage" ],
description: "A library for adding remoteStorage support to your client-side app.",
url: "https://github.com/unhosted/remoteStorage.js",
source: "https://raw.github.com/unhosted/remoteStorage.js/master/src/remoteStorage.js"
},
{
name: "impress.js",
size: "2.5k",
tags: ["animation", "jsanimation", "css", "css3" ],
description: "A presentation framework based on the power of CSS3 transforms and transitions in modern browsers and inspired by the idea behind prezi.com.",
url: "https://github.com/bartaz/impress.js",
source: "https://raw.github.com/bartaz/impress.js/master/js/impress.js"
},
{
name: "Jwerty",
size: "2k",
tags: ["events" ],
description: "Bind, fire and assert on keyboard events, with easy to use keyboard selector combos",
url: "https://github.com/keithamus/jwerty",
source: "https://raw.github.com/keithamus/jwerty/master/jwerty.js" |
<<<<<<<
},
{
name: "keysort",
tags: ["array", "object", "sort", "keys", "sql", "where"],
description: "Sorts an Array of Objects with SQL ORDER BY clause",
url: "https://github.com/avoidwork/keysort",
source: "https://raw.github.com/avoidwork/keysort/master/lib/keysort.js"
},
{
name: "Lie",
tags: ["promise", "deferred","async"],
description: "A very small library for promises",
url: "https://github.com/calvinmetcalf/lie",
source: "https://raw.github.com/calvinmetcalf/lie/master/dist/lie.js"
},
{
name: "klud.js",
tags: ["testing", "unit test", "assert", "spy", "mock"],
description: "A minimal unit testing library.",
url: "https://bitbucket.org/zserge/klud.js/",
source: "https://bitbucket.org/zserge/klud.js/raw/default/klud.js"
},
{
name: "callbacks.js",
tags: ["callbacks", "events", "event manager"],
description: "Callbacks library similar to jQuery's Callbacks. There's also an event manager that allows you to use on(), one(), off() and trigger()",
url: "https://github.com/adrianmiu/callbacks",
source: "https://raw.github.com/adrianmiu/callbacks/master/src/callbacks.js"
},
{
name: "chronoman",
github: "gamtiq/chronoman",
tags: ["setTimeout", "setInterval", "timer", "timeout", "management", "utility"],
description: "Utility class to simplify use of timers created by setTimeout.",
url: "https://github.com/gamtiq/chronoman",
source: "https://raw.github.com/gamtiq/chronoman/master/dist/chronoman.js"
},
{
name: "basespace",
github: "gamtiq/basespace",
tags: ["namespace", "ns", "space", "object"],
description: "Functions to create namespaces inside objects.",
url: "https://github.com/gamtiq/basespace",
source: "https://raw.github.com/gamtiq/basespace/master/dist/basespace.js"
},
{
name: "mixing",
github: "gamtiq/mixing",
tags: ["mix", "merge", "mixin", "object"],
description: "Functions to mix objects.",
url: "https://github.com/gamtiq/mixing",
source: "https://raw.github.com/gamtiq/mixing/master/dist/mixing.js"
},
{
name: "extend",
github: "gamtiq/extend",
tags: ["extend", "inherit", "prototype", "inheritance", "class"],
description: "Make one class (constructor function) inherited from another.",
url: "https://github.com/gamtiq/extend",
source: "https://raw.github.com/gamtiq/extend/master/dist/extend.js"
},
{
name: "easter.js",
tags: ["easter-egg", "keys", "sequence"],
description: "Easter eggs made easy.",
url: "https://github.com/rkrupinski/easter.js",
source: "https://raw.github.com/rkrupinski/easter.js/master/easter.js"
},
{
name: "henka",
tags: ["responsive", "respond", "media", "query", "media-query", "queries"],
description: "Light weight, portable, single purpose responsive javascript library.",
url: "https://github.com/toxigenicpoem/henka",
source: "https://raw.github.com/toxigenicpoem/henka/master/src/js/henka-src.js"
},
{
name: "rssi",
tags: ["interpolation", "string", "formatting", "template", "templating"],
description: "Ruby-like simple string interpolation for Node.js and browsers.",
url: "https://github.com/mvasilkov/rssi",
source: "https://raw.github.com/mvasilkov/rssi/master/rssi.js"
=======
},
{
name: "trier.js",
tags: ["repeat", "retry", "predicate", "conditional", "invocation"],
description: "Because everyone loves a trier! Conditional and repeated task invocation for node and browser.",
url: "https://github.com/philbooth/trier.js",
source: "https://raw.github.com/philbooth/trier.js/master/src/trier.js"
>>>>>>>
},
{
name: "keysort",
tags: ["array", "object", "sort", "keys", "sql", "where"],
description: "Sorts an Array of Objects with SQL ORDER BY clause",
url: "https://github.com/avoidwork/keysort",
source: "https://raw.github.com/avoidwork/keysort/master/lib/keysort.js"
},
{
name: "Lie",
tags: ["promise", "deferred","async"],
description: "A very small library for promises",
url: "https://github.com/calvinmetcalf/lie",
source: "https://raw.github.com/calvinmetcalf/lie/master/dist/lie.js"
},
{
name: "klud.js",
tags: ["testing", "unit test", "assert", "spy", "mock"],
description: "A minimal unit testing library.",
url: "https://bitbucket.org/zserge/klud.js/",
source: "https://bitbucket.org/zserge/klud.js/raw/default/klud.js"
},
{
name: "callbacks.js",
tags: ["callbacks", "events", "event manager"],
description: "Callbacks library similar to jQuery's Callbacks. There's also an event manager that allows you to use on(), one(), off() and trigger()",
url: "https://github.com/adrianmiu/callbacks",
source: "https://raw.github.com/adrianmiu/callbacks/master/src/callbacks.js"
},
{
name: "chronoman",
github: "gamtiq/chronoman",
tags: ["setTimeout", "setInterval", "timer", "timeout", "management", "utility"],
description: "Utility class to simplify use of timers created by setTimeout.",
url: "https://github.com/gamtiq/chronoman",
source: "https://raw.github.com/gamtiq/chronoman/master/dist/chronoman.js"
},
{
name: "basespace",
github: "gamtiq/basespace",
tags: ["namespace", "ns", "space", "object"],
description: "Functions to create namespaces inside objects.",
url: "https://github.com/gamtiq/basespace",
source: "https://raw.github.com/gamtiq/basespace/master/dist/basespace.js"
},
{
name: "mixing",
github: "gamtiq/mixing",
tags: ["mix", "merge", "mixin", "object"],
description: "Functions to mix objects.",
url: "https://github.com/gamtiq/mixing",
source: "https://raw.github.com/gamtiq/mixing/master/dist/mixing.js"
},
{
name: "extend",
github: "gamtiq/extend",
tags: ["extend", "inherit", "prototype", "inheritance", "class"],
description: "Make one class (constructor function) inherited from another.",
url: "https://github.com/gamtiq/extend",
source: "https://raw.github.com/gamtiq/extend/master/dist/extend.js"
},
{
name: "easter.js",
tags: ["easter-egg", "keys", "sequence"],
description: "Easter eggs made easy.",
url: "https://github.com/rkrupinski/easter.js",
source: "https://raw.github.com/rkrupinski/easter.js/master/easter.js"
},
{
name: "henka",
tags: ["responsive", "respond", "media", "query", "media-query", "queries"],
description: "Light weight, portable, single purpose responsive javascript library.",
url: "https://github.com/toxigenicpoem/henka",
source: "https://raw.github.com/toxigenicpoem/henka/master/src/js/henka-src.js"
},
{
name: "rssi",
tags: ["interpolation", "string", "formatting", "template", "templating"],
description: "Ruby-like simple string interpolation for Node.js and browsers.",
url: "https://github.com/mvasilkov/rssi",
source: "https://raw.github.com/mvasilkov/rssi/master/rssi.js"
},
{
name: "trier.js",
tags: ["repeat", "retry", "predicate", "conditional", "invocation"],
description: "Because everyone loves a trier! Conditional and repeated task invocation for node and browser.",
url: "https://github.com/philbooth/trier.js",
source: "https://raw.github.com/philbooth/trier.js/master/src/trier.js" |
<<<<<<<
},
{
name: "EventoJS",
tags: ["dom events", "event", "evento"],
description: "An easy way to manipulate events on DOM.",
url: "https://github.com/gustavohenrique/eventojs",
source: "https://raw.githubusercontent.com/gustavohenrique/eventojs/master/src/evento.js"
},
{
name: "Carpet.js",
github: "mateuszgachowski/Carpet.js",
tags: ["module", "simple", "autoload", "context", "settings", "module pattern", "advice"],
description: "Small, easy-to-learn and modular JavaScript framework for big",
url: "https://github.com/mateuszgachowski/Carpet.js",
source: "https://raw.githubusercontent.com/mateuszgachowski/Carpet.js/master/src/carpet.js"
},
{
name: "keycharm",
tags: ["keyboard"],
description: "Simple, lightweight key-binding libw. MIT or Apache 2.0.",
url: "https://github.com/AlexDM0/keycharm",
source: "https://raw.githubusercontent.com/AlexDM0/keycharm/master/keycharm.js"
},
{
name: "hash-router",
tags: ["hash", "path", "route", "router"],
description: "Tiny and lightweight browser router library, developed with SPA in mind :)",
url: "https://github.com/michaelsogos/Hash-Router",
source: "https://github.com/michaelsogos/Hash-Router/blob/master/src/hash-router.js"
},
{
name: "JsDic",
tags: ["dependency", "injection", "container", "di", "dic"],
description: "Dependecy injection container inspired by Angular.js.",
url: "https://github.com/janmarek/JsDic",
source: "https://github.com/janmarek/JsDic/blob/master/jsdic.js"
},
{
name: "GreinerHormann",
tags: ["math", "geometry", "polygon", "clipping", "polyline"],
description: "Greiner-Hormann polygon clipping algorithm. Does AND, OR, XOR.",
url: "http://w8r.github.io/GreinerHormann/",
source: "https://raw.githubusercontent.com/w8r/GreinerHormann/master/dist/greiner-hormann.js"
},
{
name: "Core.js",
github: "mauriciosoares/microjs.com",
tags: ["framework", "lightweight", "scalable", "modular", "sandbox"],
description: "It helps you create scalable applications written in Javascript, giving you some structure and patterns to keep everything separated.",
url: "https://github.com/mauriciosoares/core.js",
source: "https://raw.githubusercontent.com/mauriciosoares/core.js/master/dist/core.js"
},
{
name: "js-mediator",
github: "markmarijnissen/js-mediator",
tags: ["mediator","module","design pattern","MVC"],
description: "Design pattern to write clean, reusable, decoupled, standalone Modules that are coupled with Mediators.",
url: "https://github.com/markmarijnissen/js-mediator",
source: "https://raw.githubusercontent.com/markmarijnissen/js-mediator/master/mediator.js"
=======
},
{
name: "wjs",
tags: ["ajax", "lazy", "loading", "remote", "package"],
description: "A JavaScript / PHP to manage lazy loading from server to client.",
url: "https://github.com/weeger/wjs",
source: "https://github.com/weeger/wjs/raw/master/wjs.min.js"
>>>>>>>
},
{
name: "EventoJS",
tags: ["dom events", "event", "evento"],
description: "An easy way to manipulate events on DOM.",
url: "https://github.com/gustavohenrique/eventojs",
source: "https://raw.githubusercontent.com/gustavohenrique/eventojs/master/src/evento.js"
},
{
name: "Carpet.js",
github: "mateuszgachowski/Carpet.js",
tags: ["module", "simple", "autoload", "context", "settings", "module pattern", "advice"],
description: "Small, easy-to-learn and modular JavaScript framework for big",
url: "https://github.com/mateuszgachowski/Carpet.js",
source: "https://raw.githubusercontent.com/mateuszgachowski/Carpet.js/master/src/carpet.js"
},
{
name: "keycharm",
tags: ["keyboard"],
description: "Simple, lightweight key-binding libw. MIT or Apache 2.0.",
url: "https://github.com/AlexDM0/keycharm",
source: "https://raw.githubusercontent.com/AlexDM0/keycharm/master/keycharm.js"
},
{
name: "hash-router",
tags: ["hash", "path", "route", "router"],
description: "Tiny and lightweight browser router library, developed with SPA in mind :)",
url: "https://github.com/michaelsogos/Hash-Router",
source: "https://github.com/michaelsogos/Hash-Router/blob/master/src/hash-router.js"
},
{
name: "JsDic",
tags: ["dependency", "injection", "container", "di", "dic"],
description: "Dependecy injection container inspired by Angular.js.",
url: "https://github.com/janmarek/JsDic",
source: "https://github.com/janmarek/JsDic/blob/master/jsdic.js"
},
{
name: "GreinerHormann",
tags: ["math", "geometry", "polygon", "clipping", "polyline"],
description: "Greiner-Hormann polygon clipping algorithm. Does AND, OR, XOR.",
url: "http://w8r.github.io/GreinerHormann/",
source: "https://raw.githubusercontent.com/w8r/GreinerHormann/master/dist/greiner-hormann.js"
},
{
name: "Core.js",
github: "mauriciosoares/microjs.com",
tags: ["framework", "lightweight", "scalable", "modular", "sandbox"],
description: "It helps you create scalable applications written in Javascript, giving you some structure and patterns to keep everything separated.",
url: "https://github.com/mauriciosoares/core.js",
source: "https://raw.githubusercontent.com/mauriciosoares/core.js/master/dist/core.js"
},
{
name: "js-mediator",
github: "markmarijnissen/js-mediator",
tags: ["mediator","module","design pattern","MVC"],
description: "Design pattern to write clean, reusable, decoupled, standalone Modules that are coupled with Mediators.",
url: "https://github.com/markmarijnissen/js-mediator",
source: "https://raw.githubusercontent.com/markmarijnissen/js-mediator/master/mediator.js"
},
{
name: "wjs",
tags: ["ajax", "lazy", "loading", "remote", "package"],
description: "A JavaScript / PHP to manage lazy loading from server to client.",
url: "https://github.com/weeger/wjs",
source: "https://github.com/weeger/wjs/raw/master/wjs.min.js" |
<<<<<<<
},
{
name: "color.js",
github: "brehaut/color-js",
tags: ["color", "color manipulation"],
description: "API for immutable color objects in RGB, HSV and HSL with optional alpha. Comprehensive CSS format parsing and output.",
url: "https://github.com/brehaut/color-js/",
source: "https://raw.github.com/brehaut/color-js/master/color.js"
},
{
name: "ScriptInclude",
tags: ["loader"],
description: "Simple includes in the browser.",
url: "https://github.com/EvanHahn/ScriptInclude",
source: "https://raw.github.com/EvanHahn/ScriptInclude/master/include.js"
},
{
name: "cssanimevent",
github: "magnetikonline/cssanimevent",
tags: ["animation", "css3", "events", "polyfill", "transitions"],
description: "CSS3 animation and transition DOM event handler with a simple fallback pattern for unsupported browsers.",
url: "https://github.com/magnetikonline/cssanimevent",
source: "https://raw.github.com/magnetikonline/cssanimevent/master/cssanimevent.js"
}
=======
},
{
name: "ClassJS",
tags: ["class", "inheritance", "namespace", "node"],
description: "JavaScript classical inheritance for the browser and Node.js. Super methods and namespaces",
url: "https://github.com/jimmynewtron/ClassJS",
source: "https://raw.github.com/jimmynewtron/ClassJS/master/src/core/Class.js"
},
>>>>>>>
},
{
name: "color.js",
github: "brehaut/color-js",
tags: ["color", "color manipulation"],
description: "API for immutable color objects in RGB, HSV and HSL with optional alpha. Comprehensive CSS format parsing and output.",
url: "https://github.com/brehaut/color-js/",
source: "https://raw.github.com/brehaut/color-js/master/color.js"
},
{
name: "ScriptInclude",
tags: ["loader"],
description: "Simple includes in the browser.",
url: "https://github.com/EvanHahn/ScriptInclude",
source: "https://raw.github.com/EvanHahn/ScriptInclude/master/include.js"
},
{
name: "cssanimevent",
github: "magnetikonline/cssanimevent",
tags: ["animation", "css3", "events", "polyfill", "transitions"],
description: "CSS3 animation and transition DOM event handler with a simple fallback pattern for unsupported browsers.",
url: "https://github.com/magnetikonline/cssanimevent",
source: "https://raw.github.com/magnetikonline/cssanimevent/master/cssanimevent.js"
},
{
name: "ClassJS",
tags: ["class", "inheritance", "namespace", "node"],
description: "JavaScript classical inheritance for the browser and Node.js. Super methods and namespaces",
url: "https://github.com/jimmynewtron/ClassJS",
source: "https://raw.github.com/jimmynewtron/ClassJS/master/src/core/Class.js"
}, |
<<<<<<<
},
{
name: "Head JS",
size: "2.8k",
tags: ["loader", "polyfill", "feature"],
description: "An asynchronous loader library, with HTML5 and CSS3 polyfills",
url: "http://headjs.com",
source: "https://github.com/headjs/headjs/raw/master/dist/head.min.js"
},
{
name: "Augment.js",
size: "1.4k",
tags: ["polyfill"],
description: "Enables use of modern JavaScript by augmenting built in objects with the latest JavaScript methods.",
url: "http://augmentjs.com"
},
{
name: "thumbs.js",
size: "0.6k",
tags: ["polyfill"],
description: "Add touch event support to the desktop and other mouse-based browsers.",
url: "http://mwbrooks.github.com/thumbs.js/",
source: "https://github.com/mwbrooks/thumbs.js/blob/master/lib/thumbs.js"
},
{
name: "DOMBuilder",
size: "2.8k",
tags: ["dom", "html"],
description: "Declarative builder with (mostly) interchangeable DOM or HTML output",
url: "https://github.com/insin/DOMBuilder",
source: "https://github.com/insin/DOMBuilder/raw/master/DOMBuilder.min.js"
},
{
name: "my.common.js",
size: "1.0k",
tags: ["loader", "commonjs"],
description: "A CommonJS-like script/module loader.",
url: "https://github.com/jiem/my-common",
source: "http://myjs.fr/my-common/my.common.min.js"
},
{
name: "my.class.js",
size: "0.6k",
tags: ["language", "class"],
description: "Probably the fastest JS class system. No wrappers.",
url: "https://github.com/jiem/my-class",
source: "http://myjs.fr/my-class/my.class.min.js"
},
{
name: "htmlentities.js",
size: "0.2k",
tags: ["htmlentities", "decode", "encode", "dom"],
description: "A minimal html entities decoder/encoder using DOM.",
url: "https://github.com/jussi-kalliokoski/htmlentities.js",
source: "https://github.com/jussi-kalliokoski/htmlentities.js/raw/master/htmlentities.min.js"
},
{
name: "binary.js",
size: "0.5k",
tags: ["binary", "decode", "encode"],
description: "A fast, small, robust and extensible binary conversion library.",
url: "https://github.com/jussi-kalliokoski/binary.js",
source: "https://github.com/jussi-kalliokoski/binary.js/raw/master/binary.min.js"
=======
},
{
name: "C-qwncr",
size: "0.5k",
tags: ["async", "jsanimation"],
description: "An animation sequencing library that prevents complex animations from starting again before they've completed.",
url: "https://github.com/vsa-partners/c-qwncr",
source: "https://github.com/vsa-partners/c-qwncr/blob/master/js/c-qwncr.js"
>>>>>>>
},
{
name: "Head JS",
size: "2.8k",
tags: ["loader", "polyfill", "feature"],
description: "An asynchronous loader library, with HTML5 and CSS3 polyfills",
url: "http://headjs.com",
source: "https://github.com/headjs/headjs/raw/master/dist/head.min.js"
},
{
name: "Augment.js",
size: "1.4k",
tags: ["polyfill"],
description: "Enables use of modern JavaScript by augmenting built in objects with the latest JavaScript methods.",
url: "http://augmentjs.com"
},
{
name: "thumbs.js",
size: "0.6k",
tags: ["polyfill"],
description: "Add touch event support to the desktop and other mouse-based browsers.",
url: "http://mwbrooks.github.com/thumbs.js/",
source: "https://github.com/mwbrooks/thumbs.js/blob/master/lib/thumbs.js"
},
{
name: "DOMBuilder",
size: "2.8k",
tags: ["dom", "html"],
description: "Declarative builder with (mostly) interchangeable DOM or HTML output",
url: "https://github.com/insin/DOMBuilder",
source: "https://github.com/insin/DOMBuilder/raw/master/DOMBuilder.min.js"
},
{
name: "my.common.js",
size: "1.0k",
tags: ["loader", "commonjs"],
description: "A CommonJS-like script/module loader.",
url: "https://github.com/jiem/my-common",
source: "http://myjs.fr/my-common/my.common.min.js"
},
{
name: "my.class.js",
size: "0.6k",
tags: ["language", "class"],
description: "Probably the fastest JS class system. No wrappers.",
url: "https://github.com/jiem/my-class",
source: "http://myjs.fr/my-class/my.class.min.js"
},
{
name: "htmlentities.js",
size: "0.2k",
tags: ["htmlentities", "decode", "encode", "dom"],
description: "A minimal html entities decoder/encoder using DOM.",
url: "https://github.com/jussi-kalliokoski/htmlentities.js",
source: "https://github.com/jussi-kalliokoski/htmlentities.js/raw/master/htmlentities.min.js"
},
{
name: "binary.js",
size: "0.5k",
tags: ["binary", "decode", "encode"],
description: "A fast, small, robust and extensible binary conversion library.",
url: "https://github.com/jussi-kalliokoski/binary.js",
source: "https://github.com/jussi-kalliokoski/binary.js/raw/master/binary.min.js"
},
{
name: "C-qwncr",
size: "0.5k",
tags: ["async", "jsanimation"],
description: "An animation sequencing library that prevents complex animations from starting again before they've completed.",
url: "https://github.com/vsa-partners/c-qwncr",
source: "https://github.com/vsa-partners/c-qwncr/blob/master/js/c-qwncr.js" |
<<<<<<<
name: "Plite",
tags: ["promise", "future", "callback", "library", "functional"],
description: "Tiny, fast, light-weight promises (370 bytes min+zipped)",
url: "https://github.com/chrisdavies/plite",
source: "https://raw.githubusercontent.com/chrisdavies/plite/master/plite.js"
},
{
name: "Rlite",
tags: ["rlite", "route", "routing", "router", "hash", "querystring", "named", "parameters"],
description: "Tiny, simple, light-weight routing (~500 bytes min+zipped)",
url: "https://github.com/chrisdavies/rlite",
source: "https://raw.githubusercontent.com/chrisdavies/rlite/master/rlite.js"
},
{
name: "Kwargs",
tags: ["python", "arguments", "kwargs", "defaults", "function", "syntactic sugar"],
description: "Smart python like argument management for javascript",
url: "https://github.com/serkanyersen/kwargsjs",
source: "https://raw.githubusercontent.com/serkanyersen/kwargsjs/master/kwargs.js"
},
{
name: "ifvisible.js",
tags: ["visibility", "idle", "coffee", "script", "interval", "requestAnimationFrame"],
description: "Crossbrowser & lightweight way to check if user is looking at the page or interacting with it.",
url: "https://github.com/serkanyersen/ifvisible.js",
source: "https://raw.githubusercontent.com/serkanyersen/ifvisible.js/master/src/ifvisible.js"
},
{
name: "ListOf",
tags: ["list", "collection", "array", "library", "c#"],
description: "A JavaScript implementation of the C# List<T> object.",
url: "https://github.com/joelalejandro/stuff",
source: "https://raw.githubusercontent.com/joelalejandro/stuff/master/ListOf.js"
},
{
name: "handlebars-autorenderer",
tags: ["handlebars", "rendering", "templating"],
description: "Tiny plugin for rendering and updating client-side handlebar templates. ",
url: "https://gist.github.com/ambrosechua/9e4455100c43a8a2cb1c",
source: "https://gist.githubusercontent.com/ambrosechua/9e4455100c43a8a2cb1c/raw/46c75a14cb3940e66bc5e6d7cbbfd959dd208ccd/handlebars-autorenderer.js"
},
{
name: "O.o.tree",
tags: ["rendering", "templating", "MutationObserver", "observer", "object"],
description: "Tiny O.o() wrapper to O.o() the whole object tree. ",
url: "https://gist.github.com/ambrosechua/5b6f804cef53118db28b",
source: "https://gist.githubusercontent.com/ambrosechua/5b6f804cef53118db28b/raw/7ec6141f642908a0392e0f9a6fb3dfb1975a6e82/O.o.tree.js"
},
{
name: "KolorWheel.js",
tags: ["jQuery", "color", "color manipulation", "gradient", "HSL"],
description: "KolorWheel.js generates color palette from a base color and chainable absolute/relative H-S-L transformation methods (incl. specified target color). Documentation contains live examples with editable parameters.",
url: "http://linkbroker.hu/stuff/kolorwheel.js",
source: "https://raw.githubusercontent.com/ern0/kolorwheel.js/master/KolorWheel.js"
},
{
name: "SimplyJS",
tags: ["simplyjs", "simply", "simple", "easy", "DOM", "events", "async", "asynchronous", "native", "prototype", "CSS"],
description: "Provides support for manipulating with DOM and events handling. Easy for use, optimized for performance, native browser's support first.",
url: "https://github.com/janelznic/simplyjs",
source: "https://raw.githubusercontent.com/janelznic/simplyjs/master/lib/simply.js"
},
{
name: "clone",
tags: ["clone", "copy", "duplicate"],
description: "Clones/copies arbitrary objects recursively",
url: "https://github.com/pvorb/node-clone",
source: "https://raw.githubusercontent.com/pvorb/node-clone/master/clone.js"
},
{
name: "tag",
tags: ["dom", "dom-elements"],
description: "Small utility for creating DOM elements",
url: "https://github.com/a-tarasyuk/tag",
source: "https://raw.githubusercontent.com/a-tarasyuk/tag/master/lib/tag.js"
},
{
name: "mutant.js",
tags: ["mutantobserver", "dom", "changes", "scroll", "observer", "change", "mutate"],
description: "DOM Modification observer",
url: "https://github.com/gitterHQ/mutant.js",
source: "https://raw.githubusercontent.com/gitterHQ/mutant.js/master/public/assets/mutant.js"
},
{
name: "NanoModal",
github: "kylepaulsen/NanoModal",
tags: ["modal", "dialog", "popup", "message"],
description: "A small, self-contained JavaScript modal library with some extra features.",
url: "https://github.com/kylepaulsen/NanoModal",
source: "https://raw.githubusercontent.com/kylepaulsen/NanoModal/master/nanomodal.js"
=======
name: "Rlite",
tags: ["rlite", "route", "routing", "router", "hash", "querystring", "named", "parameters"],
description: "Tiny, simple, light-weight routing",
url: "https://github.com/chrisdavies/rlite",
source: "https://raw.githubusercontent.com/chrisdavies/rlite/master/rlite.js"
},
{
name: "nanoajax",
tags: ["ajax","http"],
description: "Very basic cross-browser AJAX",
url: "https://github.com/yanatan16/nanoajax",
source: "https://raw.githubusercontent.com/yanatan16/nanoajax/master/index.js"
>>>>>>>
name: "Plite",
tags: ["promise", "future", "callback", "library", "functional"],
description: "Tiny, fast, light-weight promises (370 bytes min+zipped)",
url: "https://github.com/chrisdavies/plite",
source: "https://raw.githubusercontent.com/chrisdavies/plite/master/plite.js"
},
{
name: "Rlite",
tags: ["rlite", "route", "routing", "router", "hash", "querystring", "named", "parameters"],
description: "Tiny, simple, light-weight routing (~500 bytes min+zipped)",
url: "https://github.com/chrisdavies/rlite",
source: "https://raw.githubusercontent.com/chrisdavies/rlite/master/rlite.js"
},
{
name: "Kwargs",
tags: ["python", "arguments", "kwargs", "defaults", "function", "syntactic sugar"],
description: "Smart python like argument management for javascript",
url: "https://github.com/serkanyersen/kwargsjs",
source: "https://raw.githubusercontent.com/serkanyersen/kwargsjs/master/kwargs.js"
},
{
name: "ifvisible.js",
tags: ["visibility", "idle", "coffee", "script", "interval", "requestAnimationFrame"],
description: "Crossbrowser & lightweight way to check if user is looking at the page or interacting with it.",
url: "https://github.com/serkanyersen/ifvisible.js",
source: "https://raw.githubusercontent.com/serkanyersen/ifvisible.js/master/src/ifvisible.js"
},
{
name: "ListOf",
tags: ["list", "collection", "array", "library", "c#"],
description: "A JavaScript implementation of the C# List<T> object.",
url: "https://github.com/joelalejandro/stuff",
source: "https://raw.githubusercontent.com/joelalejandro/stuff/master/ListOf.js"
},
{
name: "handlebars-autorenderer",
tags: ["handlebars", "rendering", "templating"],
description: "Tiny plugin for rendering and updating client-side handlebar templates. ",
url: "https://gist.github.com/ambrosechua/9e4455100c43a8a2cb1c",
source: "https://gist.githubusercontent.com/ambrosechua/9e4455100c43a8a2cb1c/raw/46c75a14cb3940e66bc5e6d7cbbfd959dd208ccd/handlebars-autorenderer.js"
},
{
name: "O.o.tree",
tags: ["rendering", "templating", "MutationObserver", "observer", "object"],
description: "Tiny O.o() wrapper to O.o() the whole object tree. ",
url: "https://gist.github.com/ambrosechua/5b6f804cef53118db28b",
source: "https://gist.githubusercontent.com/ambrosechua/5b6f804cef53118db28b/raw/7ec6141f642908a0392e0f9a6fb3dfb1975a6e82/O.o.tree.js"
},
{
name: "KolorWheel.js",
tags: ["jQuery", "color", "color manipulation", "gradient", "HSL"],
description: "KolorWheel.js generates color palette from a base color and chainable absolute/relative H-S-L transformation methods (incl. specified target color). Documentation contains live examples with editable parameters.",
url: "http://linkbroker.hu/stuff/kolorwheel.js",
source: "https://raw.githubusercontent.com/ern0/kolorwheel.js/master/KolorWheel.js"
},
{
name: "SimplyJS",
tags: ["simplyjs", "simply", "simple", "easy", "DOM", "events", "async", "asynchronous", "native", "prototype", "CSS"],
description: "Provides support for manipulating with DOM and events handling. Easy for use, optimized for performance, native browser's support first.",
url: "https://github.com/janelznic/simplyjs",
source: "https://raw.githubusercontent.com/janelznic/simplyjs/master/lib/simply.js"
},
{
name: "clone",
tags: ["clone", "copy", "duplicate"],
description: "Clones/copies arbitrary objects recursively",
url: "https://github.com/pvorb/node-clone",
source: "https://raw.githubusercontent.com/pvorb/node-clone/master/clone.js"
},
{
name: "tag",
tags: ["dom", "dom-elements"],
description: "Small utility for creating DOM elements",
url: "https://github.com/a-tarasyuk/tag",
source: "https://raw.githubusercontent.com/a-tarasyuk/tag/master/lib/tag.js"
},
{
name: "mutant.js",
tags: ["mutantobserver", "dom", "changes", "scroll", "observer", "change", "mutate"],
description: "DOM Modification observer",
url: "https://github.com/gitterHQ/mutant.js",
source: "https://raw.githubusercontent.com/gitterHQ/mutant.js/master/public/assets/mutant.js"
},
{
name: "NanoModal",
github: "kylepaulsen/NanoModal",
tags: ["modal", "dialog", "popup", "message"],
description: "A small, self-contained JavaScript modal library with some extra features.",
url: "https://github.com/kylepaulsen/NanoModal",
source: "https://raw.githubusercontent.com/kylepaulsen/NanoModal/master/nanomodal.js"
},
{
name: "Rlite",
tags: ["rlite", "route", "routing", "router", "hash", "querystring", "named", "parameters"],
description: "Tiny, simple, light-weight routing",
url: "https://github.com/chrisdavies/rlite",
source: "https://raw.githubusercontent.com/chrisdavies/rlite/master/rlite.js"
},
{
name: "nanoajax",
tags: ["ajax","http"],
description: "Very basic cross-browser AJAX",
url: "https://github.com/yanatan16/nanoajax",
source: "https://raw.githubusercontent.com/yanatan16/nanoajax/master/index.js" |
<<<<<<<
description: "A lightweight 1-to-1 mobile slider. Optimized for touch devices.",
url: "https://github.com/bradbirdsall/Swipe",
source: "https://raw.github.com/bradbirdsall/Swipe/master/swipe.min.js"
},
<<<<<<< HEAD
{
name: "Happen",
size: "0.3k",
tags: ["events" ],
description: "General purpose event triggering",
url: "https://github.com/tmcw/happen",
source: "https://raw.github.com/tmcw/happen/master/src/happen.js"
},
{
name: "zest",
size: "2.2k",
tags: ["css", "selector", "dom"],
description: "An absurdly fast selector engine. Supports CSS3/CSS4 selectors - faster than Sizzle.",
url: "https://github.com/chjj/zest",
source: "https://raw.github.com/chjj/zest/master/lib/zest.js"
},
{
name: "Cookie Monster",
size: "0.7k",
tags: ["cookies", "data", "store"],
description: "A lightweight cookie library",
url: "https://github.com/jgallen23/cookie-monster",
source: "https://raw.github.com/jgallen23/cookie-monster/master/dist/monster.min.js"
},
{
name: "EditrJS",
size: "1.7k",
tags: ["manipulation","image", "editing"],
description: "A very simple image editing library with a chainable api.",
url: "https://github.com/narfdre/Editr",
source: "https://github.com/narfdre/Editr/blob/master/Editr.js"
},
{
name: "hsi.js",
size: "1.1k",
tags: ["color"],
description: "A small RGB <-> HSI converter.",
url: "https://github.com/e-/hsi.js",
source: "https://raw.github.com/e-/hsi.js/master/hsi.min.js"
=======
description: "a lightweight 1-to-1 mobile slider. optimized for touch devices.",
url: "https://github.com/bradbirdsall/swipe",
source: "https://raw.github.com/bradbirdsall/swipe/master/swipe.min.js"
},
{
name: "colorspaces.js",
size: "1.3k",
tags: ["color"],
description: "Convert between RGB and several CIE color spaces for smarter color manipulation.",
url: "http://boronine.github.com/colorspaces.js",
source: "https://raw.github.com/boronine/colorspaces.js/master/colorspaces.min.js"
>>>>>>>
description: "A lightweight 1-to-1 mobile slider. Optimized for touch devices.",
url: "https://github.com/bradbirdsall/Swipe",
source: "https://raw.github.com/bradbirdsall/Swipe/master/swipe.min.js"
},
{
name: "Happen",
size: "0.3k",
tags: ["events" ],
description: "General purpose event triggering",
url: "https://github.com/tmcw/happen",
source: "https://raw.github.com/tmcw/happen/master/src/happen.js"
},
{
name: "zest",
size: "2.2k",
tags: ["css", "selector", "dom"],
description: "An absurdly fast selector engine. Supports CSS3/CSS4 selectors - faster than Sizzle.",
url: "https://github.com/chjj/zest",
source: "https://raw.github.com/chjj/zest/master/lib/zest.js"
},
{
name: "Cookie Monster",
size: "0.7k",
tags: ["cookies", "data", "store"],
description: "A lightweight cookie library",
url: "https://github.com/jgallen23/cookie-monster",
source: "https://raw.github.com/jgallen23/cookie-monster/master/dist/monster.min.js"
},
{
name: "EditrJS",
size: "1.7k",
tags: ["manipulation","image", "editing"],
description: "A very simple image editing library with a chainable api.",
url: "https://github.com/narfdre/Editr",
source: "https://github.com/narfdre/Editr/blob/master/Editr.js"
},
{
name: "hsi.js",
size: "1.1k",
tags: ["color"],
description: "A small RGB <-> HSI converter.",
url: "https://github.com/e-/hsi.js",
source: "https://raw.github.com/e-/hsi.js/master/hsi.min.js"
},
{
name: "colorspaces.js",
size: "1.3k",
tags: ["color"],
description: "Convert between RGB and several CIE color spaces for smarter color manipulation.",
url: "http://boronine.github.com/colorspaces.js",
source: "https://raw.github.com/boronine/colorspaces.js/master/colorspaces.min.js" |
<<<<<<<
},
{
name: "keysort",
tags: ["array", "object", "sort", "keys", "sql", "where"],
description: "Sorts an Array of Objects with SQL ORDER BY clause",
url: "https://github.com/avoidwork/keysort",
source: "https://raw.github.com/avoidwork/keysort/master/lib/keysort.js"
},
{
name: "Lie",
tags: ["promise", "deferred","async"],
description: "A very small library for promises",
url: "https://github.com/calvinmetcalf/lie",
source: "https://raw.github.com/calvinmetcalf/lie/master/dist/lie.js"
},
{
name: "klud.js",
tags: ["testing", "unit test", "assert", "spy", "mock"],
description: "A minimal unit testing library.",
url: "https://bitbucket.org/zserge/klud.js/",
source: "https://bitbucket.org/zserge/klud.js/raw/default/klud.js"
},
{
name: "callbacks.js",
tags: ["callbacks", "events", "event manager"],
description: "Callbacks library similar to jQuery's Callbacks. There's also an event manager that allows you to use on(), one(), off() and trigger()",
url: "https://github.com/adrianmiu/callbacks",
source: "https://raw.github.com/adrianmiu/callbacks/master/src/callbacks.js"
},
{
name: "chronoman",
github: "gamtiq/chronoman",
tags: ["setTimeout", "setInterval", "timer", "timeout", "management", "utility"],
description: "Utility class to simplify use of timers created by setTimeout.",
url: "https://github.com/gamtiq/chronoman",
source: "https://raw.github.com/gamtiq/chronoman/master/dist/chronoman.js"
},
{
name: "basespace",
github: "gamtiq/basespace",
tags: ["namespace", "ns", "space", "object"],
description: "Functions to create namespaces inside objects.",
url: "https://github.com/gamtiq/basespace",
source: "https://raw.github.com/gamtiq/basespace/master/dist/basespace.js"
},
{
name: "mixing",
github: "gamtiq/mixing",
tags: ["mix", "merge", "mixin", "object"],
description: "Functions to mix objects.",
url: "https://github.com/gamtiq/mixing",
source: "https://raw.github.com/gamtiq/mixing/master/dist/mixing.js"
},
{
name: "extend",
github: "gamtiq/extend",
tags: ["extend", "inherit", "prototype", "inheritance", "class"],
description: "Make one class (constructor function) inherited from another.",
url: "https://github.com/gamtiq/extend",
source: "https://raw.github.com/gamtiq/extend/master/dist/extend.js"
},
{
name: "easter.js",
tags: ["easter-egg", "keys", "sequence"],
description: "Easter eggs made easy.",
url: "https://github.com/rkrupinski/easter.js",
source: "https://raw.github.com/rkrupinski/easter.js/master/easter.js"
}
=======
},
{
name: "henka",
tags: ["responsive", "respond", "media", "query", "media-query", "queries"],
description: "Light weight, portable, single purpose responsive javascript library.",
url: "https://github.com/toxigenicpoem/henka",
source: "https://raw.github.com/toxigenicpoem/henka/master/src/js/henka-src.js"
}
>>>>>>>
},
{
name: "keysort",
tags: ["array", "object", "sort", "keys", "sql", "where"],
description: "Sorts an Array of Objects with SQL ORDER BY clause",
url: "https://github.com/avoidwork/keysort",
source: "https://raw.github.com/avoidwork/keysort/master/lib/keysort.js"
},
{
name: "Lie",
tags: ["promise", "deferred","async"],
description: "A very small library for promises",
url: "https://github.com/calvinmetcalf/lie",
source: "https://raw.github.com/calvinmetcalf/lie/master/dist/lie.js"
},
{
name: "klud.js",
tags: ["testing", "unit test", "assert", "spy", "mock"],
description: "A minimal unit testing library.",
url: "https://bitbucket.org/zserge/klud.js/",
source: "https://bitbucket.org/zserge/klud.js/raw/default/klud.js"
},
{
name: "callbacks.js",
tags: ["callbacks", "events", "event manager"],
description: "Callbacks library similar to jQuery's Callbacks. There's also an event manager that allows you to use on(), one(), off() and trigger()",
url: "https://github.com/adrianmiu/callbacks",
source: "https://raw.github.com/adrianmiu/callbacks/master/src/callbacks.js"
},
{
name: "chronoman",
github: "gamtiq/chronoman",
tags: ["setTimeout", "setInterval", "timer", "timeout", "management", "utility"],
description: "Utility class to simplify use of timers created by setTimeout.",
url: "https://github.com/gamtiq/chronoman",
source: "https://raw.github.com/gamtiq/chronoman/master/dist/chronoman.js"
},
{
name: "basespace",
github: "gamtiq/basespace",
tags: ["namespace", "ns", "space", "object"],
description: "Functions to create namespaces inside objects.",
url: "https://github.com/gamtiq/basespace",
source: "https://raw.github.com/gamtiq/basespace/master/dist/basespace.js"
},
{
name: "mixing",
github: "gamtiq/mixing",
tags: ["mix", "merge", "mixin", "object"],
description: "Functions to mix objects.",
url: "https://github.com/gamtiq/mixing",
source: "https://raw.github.com/gamtiq/mixing/master/dist/mixing.js"
},
{
name: "extend",
github: "gamtiq/extend",
tags: ["extend", "inherit", "prototype", "inheritance", "class"],
description: "Make one class (constructor function) inherited from another.",
url: "https://github.com/gamtiq/extend",
source: "https://raw.github.com/gamtiq/extend/master/dist/extend.js"
},
{
name: "easter.js",
tags: ["easter-egg", "keys", "sequence"],
description: "Easter eggs made easy.",
url: "https://github.com/rkrupinski/easter.js",
source: "https://raw.github.com/rkrupinski/easter.js/master/easter.js"
},
{
name: "henka",
tags: ["responsive", "respond", "media", "query", "media-query", "queries"],
description: "Light weight, portable, single purpose responsive javascript library.",
url: "https://github.com/toxigenicpoem/henka",
source: "https://raw.github.com/toxigenicpoem/henka/master/src/js/henka-src.js"
} |
<<<<<<<
},
{
name: "MarmottAjax",
tags: ["ajax", "xhr", "json"],
description: "A tiny Ajax librairy with promises and some Marmot",
url: "https://github.com/marmottes/marmottajax",
source: "https://raw.githubusercontent.com/marmottes/marmottajax/master/marmottajax.js"
},
{
name: "datediff",
tags: ["date", "time"],
description: "Calculate difference between two dates",
url: "https://github.com/dmfilipenko/datediff",
source: "https://github.com/dmfilipenko/datediff/blob/master/datediff.min.js"
},
{
name: "lodash dom traverse",
github: "szarouski/lodash.dom-traverse",
tags: ["lodash", "dom", "traverse"],
description: "Dom traversing with lodash (1.28kb min, gzip)",
url: "http://szarouski.github.io/lodash.dom-traverse/",
source: "https://raw.githubusercontent.com/szarouski/lodash.dom-traverse/master/lodash.dom-traverse.min.js"
},
{
name: "Parse Form",
tags: ["form", "forms", "parse"],
description: "A micro library used to parse and manipulate forms",
url: "https://github.com/AdamBrodzinski/parse-form",
source: "https://raw.githubusercontent.com/AdamBrodzinski/parse-form/master/parse-form-min.js"
=======
},
{
name: "Deb.js",
tags: ["debugging", "console output", "stack trace", "time execution"],
description: "The tiniest debugger in the world",
url: "https://github.com/krasimir/deb.js",
source: "https://raw.githubusercontent.com/krasimir/deb.js/master/build/deb.min.js"
},
{
name: "Gifffer",
tags: ["gif", "play control", "stop", "first frame"],
description: "A tiny JavaScript library that prevents the autoplaying of the animated Gifs",
url: "https://github.com/krasimir/gifffer",
source: "https://raw.githubusercontent.com/krasimir/gifffer/master/build/gifffer.min.js"
>>>>>>>
},
{
name: "MarmottAjax",
tags: ["ajax", "xhr", "json"],
description: "A tiny Ajax librairy with promises and some Marmot",
url: "https://github.com/marmottes/marmottajax",
source: "https://raw.githubusercontent.com/marmottes/marmottajax/master/marmottajax.js"
},
{
name: "datediff",
tags: ["date", "time"],
description: "Calculate difference between two dates",
url: "https://github.com/dmfilipenko/datediff",
source: "https://github.com/dmfilipenko/datediff/blob/master/datediff.min.js"
},
{
name: "lodash dom traverse",
github: "szarouski/lodash.dom-traverse",
tags: ["lodash", "dom", "traverse"],
description: "Dom traversing with lodash (1.28kb min, gzip)",
url: "http://szarouski.github.io/lodash.dom-traverse/",
source: "https://raw.githubusercontent.com/szarouski/lodash.dom-traverse/master/lodash.dom-traverse.min.js"
},
{
name: "Parse Form",
tags: ["form", "forms", "parse"],
description: "A micro library used to parse and manipulate forms",
url: "https://github.com/AdamBrodzinski/parse-form",
source: "https://raw.githubusercontent.com/AdamBrodzinski/parse-form/master/parse-form-min.js"
},
{
name: "Deb.js",
tags: ["debugging", "console output", "stack trace", "time execution"],
description: "The tiniest debugger in the world",
url: "https://github.com/krasimir/deb.js",
source: "https://raw.githubusercontent.com/krasimir/deb.js/master/build/deb.min.js"
},
{
name: "Gifffer",
tags: ["gif", "play control", "stop", "first frame"],
description: "A tiny JavaScript library that prevents the autoplaying of the animated Gifs",
url: "https://github.com/krasimir/gifffer",
source: "https://raw.githubusercontent.com/krasimir/gifffer/master/build/gifffer.min.js" |
<<<<<<<
tags: ["progress", "bar", "progressbar"],
description: "A (animated) javascript progress bar without dependencies.",
url: "https://github.com/mdix/progress.js",
source: "https://raw.github.com/mdix/progress.js/master/progress.js"
},
{
name: "jph.js",
tags: ["jsonp", "network", "json", "manager", "loader"],
description: "A JS module for managing many asynchronous and synchronous JSONP requests, responses, timeouts and errors.",
url: "https://github.com/nokia-entertainment/JSONPHandler",
source: "https://raw.github.com/nokia-entertainment/JSONPHandler/master/jph.js"
=======
tags: ["progress", "bar", "progressbar"],
description: "A (animated) javascript progress bar without dependencies.",
url: "https://github.com/mdix/progress.js",
source: "https://raw.github.com/mdix/progress.js/master/progress.js"
},
{
name: "shotgun.js",
tags: ["shotgun", "events", "error", "observer", "pubsub", "publish", "subscribe", "node", "unsubscribe"],
description: "Nestable custom events, trappable internal events, functional try/catch abstraction, unsubscribable unnamed functions.",
url: "http://github.com/jgnewman/shotgun",
source: "https://raw.github.com/jgnewman/shotgun/master/shotgun.js"
>>>>>>>
tags: ["progress", "bar", "progressbar"],
description: "A (animated) javascript progress bar without dependencies.",
url: "https://github.com/mdix/progress.js",
source: "https://raw.github.com/mdix/progress.js/master/progress.js"
},
{
name: "jph.js",
tags: ["jsonp", "network", "json", "manager", "loader"],
description: "A JS module for managing many asynchronous and synchronous JSONP requests, responses, timeouts and errors.",
url: "https://github.com/nokia-entertainment/JSONPHandler",
source: "https://raw.github.com/nokia-entertainment/JSONPHandler/master/jph.js"
},
{
name: "shotgun.js",
tags: ["shotgun", "events", "error", "observer", "pubsub", "publish", "subscribe", "node", "unsubscribe"],
description: "Nestable custom events, trappable internal events, functional try/catch abstraction, unsubscribable unnamed functions.",
url: "http://github.com/jgnewman/shotgun",
source: "https://raw.github.com/jgnewman/shotgun/master/shotgun.js" |
<<<<<<<
},
{
name: "Pledges",
tags: ["promise", "pledge"],
description: "A JavaScript micro-library that provides promise functionality.",
url: "https://github.com/ryansmith94/Pledges",
source: "https://raw.github.com/ryansmith94/Pledges/master/src/core.js"
},
{
name: "SVGEventListener",
github: "madsgraphics/SVGEventListener",
tags: ["svg", "events", "animation", "polyfill"],
description: "A polyfill for animate events on SVG on non-supported browsers, like webkit engines",
url: "https://github.com/madsgraphics/SVGEventListener",
source: "https://raw.github.com/madsgraphics/SVGEventListener/master/SVGEventListener.js"
},
{
name: "chronology.js",
tags: ["undo", "redo", "history", "chronology"],
description: "A micro javascript library for managing an undo/redo history.",
url: "http://chronology.wout.co.uk",
source: "https://raw.github.com/wout/chronology.js/master/chronology.js"
},
{
name: "DoubleMetaphone",
tags: ["phonetic", "metaphone", "codec", "sounds", "like"],
description: "Phonetically encode w/ DoubleMetaphone algorithm ('Alexander' -> 'ALKS')",
url: "https://github.com/hgoebl/doublemetaphone",
source: "https://raw.github.com/hgoebl/doublemetaphone/master/doublemetaphone.js"
},
{
name: "Commuinst",
tags: ["worker", "parallel"],
description: "Web workers, but easy.",
url: "https://github.com/calvinmetcalf/catiline",
source: "https://raw.github.com/calvinmetcalf/catiline/master/dist/catiline.js"
=======
},
{
name: "civem.js",
tags: ["html5", "input", "validation"],
description: "Custom error messages for HTML5 form validation.",
url: "https://github.com/javanto/civem.js",
source: "https://raw.github.com/javanto/civem.js/master/src/civem.js"
>>>>>>>
},
{
name: "Pledges",
tags: ["promise", "pledge"],
description: "A JavaScript micro-library that provides promise functionality.",
url: "https://github.com/ryansmith94/Pledges",
source: "https://raw.github.com/ryansmith94/Pledges/master/src/core.js"
},
{
name: "SVGEventListener",
github: "madsgraphics/SVGEventListener",
tags: ["svg", "events", "animation", "polyfill"],
description: "A polyfill for animate events on SVG on non-supported browsers, like webkit engines",
url: "https://github.com/madsgraphics/SVGEventListener",
source: "https://raw.github.com/madsgraphics/SVGEventListener/master/SVGEventListener.js"
},
{
name: "chronology.js",
tags: ["undo", "redo", "history", "chronology"],
description: "A micro javascript library for managing an undo/redo history.",
url: "http://chronology.wout.co.uk",
source: "https://raw.github.com/wout/chronology.js/master/chronology.js"
},
{
name: "DoubleMetaphone",
tags: ["phonetic", "metaphone", "codec", "sounds", "like"],
description: "Phonetically encode w/ DoubleMetaphone algorithm ('Alexander' -> 'ALKS')",
url: "https://github.com/hgoebl/doublemetaphone",
source: "https://raw.github.com/hgoebl/doublemetaphone/master/doublemetaphone.js"
},
{
name: "Commuinst",
tags: ["worker", "parallel"],
description: "Web workers, but easy.",
url: "https://github.com/calvinmetcalf/catiline",
source: "https://raw.github.com/calvinmetcalf/catiline/master/dist/catiline.js"
},
{
name: "civem.js",
tags: ["html5", "input", "validation"],
description: "Custom error messages for HTML5 form validation.",
url: "https://github.com/javanto/civem.js",
source: "https://raw.github.com/javanto/civem.js/master/src/civem.js" |
<<<<<<<
},
{
name: "EventoJS",
tags: ["dom events", "event", "evento"],
description: "An easy way to manipulate events on DOM.",
url: "https://github.com/gustavohenrique/eventojs",
source: "https://raw.githubusercontent.com/gustavohenrique/eventojs/master/src/evento.js"
},
{
name: "Carpet.js",
github: "mateuszgachowski/Carpet.js",
tags: ["module", "simple", "autoload", "context", "settings", "module pattern", "advice"],
description: "Small, easy-to-learn and modular JavaScript framework for big",
url: "https://github.com/mateuszgachowski/Carpet.js",
source: "https://raw.githubusercontent.com/mateuszgachowski/Carpet.js/master/src/carpet.js"
},
{
name: "keycharm",
tags: ["keyboard"],
description: "Simple, lightweight key-binding libw. MIT or Apache 2.0.",
url: "https://github.com/AlexDM0/keycharm",
source: "https://raw.githubusercontent.com/AlexDM0/keycharm/master/keycharm.js"
},
{
name: "hash-router",
tags: ["hash", "path", "route", "router"],
description: "Tiny and lightweight browser router library, developed with SPA in mind :)",
url: "https://github.com/michaelsogos/Hash-Router",
source: "https://github.com/michaelsogos/Hash-Router/blob/master/src/hash-router.js"
}
=======
},
{
name: "JsDic",
tags: ["dependency", "injection", "container", "di", "dic"],
description: "Dependecy injection container inspired by Angular.js.",
url: "https://github.com/janmarek/JsDic",
source: "https://github.com/janmarek/JsDic/blob/master/jsdic.js"
}
>>>>>>>
},
{
name: "EventoJS",
tags: ["dom events", "event", "evento"],
description: "An easy way to manipulate events on DOM.",
url: "https://github.com/gustavohenrique/eventojs",
source: "https://raw.githubusercontent.com/gustavohenrique/eventojs/master/src/evento.js"
},
{
name: "Carpet.js",
github: "mateuszgachowski/Carpet.js",
tags: ["module", "simple", "autoload", "context", "settings", "module pattern", "advice"],
description: "Small, easy-to-learn and modular JavaScript framework for big",
url: "https://github.com/mateuszgachowski/Carpet.js",
source: "https://raw.githubusercontent.com/mateuszgachowski/Carpet.js/master/src/carpet.js"
},
{
name: "keycharm",
tags: ["keyboard"],
description: "Simple, lightweight key-binding libw. MIT or Apache 2.0.",
url: "https://github.com/AlexDM0/keycharm",
source: "https://raw.githubusercontent.com/AlexDM0/keycharm/master/keycharm.js"
},
{
name: "hash-router",
tags: ["hash", "path", "route", "router"],
description: "Tiny and lightweight browser router library, developed with SPA in mind :)",
url: "https://github.com/michaelsogos/Hash-Router",
source: "https://github.com/michaelsogos/Hash-Router/blob/master/src/hash-router.js"
},
{
name: "JsDic",
tags: ["dependency", "injection", "container", "di", "dic"],
description: "Dependecy injection container inspired by Angular.js.",
url: "https://github.com/janmarek/JsDic",
source: "https://github.com/janmarek/JsDic/blob/master/jsdic.js"
} |
<<<<<<<
},
{
name: "Animatelo",
github: "gibbok/animatelo",
tags: ["animation", "animate", "web animation"],
description: "Animatelo is a bunch of cool, fun, and cross-browser animations for you to use in your projects. This is a porting to Web Animation API of the fabulous animate.css project.",
url: "https://gibbok.github.io/animatelo/",
source: "https://raw.githubusercontent.com/gibbok/animatelo/master/dist/animatelo.min.js"
=======
},
{
name: "Picodom",
github: "picodom/picodom",
tags: ["virtual", "dom", "templating"],
description: "1kb JavaScript Virtual DOM builder and patch algorithm.",
url: "https://github.com/picodom/picodom",
source: "https://unpkg.com/picodom"
>>>>>>>
},
{
name: "Animatelo",
github: "gibbok/animatelo",
tags: ["animation", "animate", "web animation"],
description: "Animatelo is a bunch of cool, fun, and cross-browser animations for you to use in your projects. This is a porting to Web Animation API of the fabulous animate.css project.",
url: "https://gibbok.github.io/animatelo/",
source: "https://raw.githubusercontent.com/gibbok/animatelo/master/dist/animatelo.min.js"
},
{
name: "Picodom",
github: "picodom/picodom",
tags: ["virtual", "dom", "templating"],
description: "1kb JavaScript Virtual DOM builder and patch algorithm.",
url: "https://github.com/picodom/picodom",
source: "https://unpkg.com/picodom" |
<<<<<<<
name: "Carpet.js",
github: "mateuszgachowski/Carpet.js",
tags: ["module", "simple", "autoload", "context", "settings", "module pattern", "advice"],
description: "Small, easy-to-learn and modular JavaScript framework for big",
url: "https://github.com/mateuszgachowski/Carpet.js",
source: "https://raw.githubusercontent.com/mateuszgachowski/Carpet.js/master/src/carpet.js"
},
{
name: "keycharm",
tags: ["keyboard"],
description: "Simple, lightweight key-binding libw. MIT or Apache 2.0.",
url: "https://github.com/AlexDM0/keycharm",
source: "https://raw.githubusercontent.com/AlexDM0/keycharm/master/keycharm.js"
},
{
name: "hash-router",
tags: ["hash", "path", "route", "router"],
description: "Tiny and lightweight browser router library, developed with SPA in mind :)",
url: "https://github.com/michaelsogos/Hash-Router",
source: "https://github.com/michaelsogos/Hash-Router/blob/master/src/hash-router.js"
},
{
name: "JsDic",
tags: ["dependency", "injection", "container", "di", "dic"],
description: "Dependecy injection container inspired by Angular.js.",
url: "https://github.com/janmarek/JsDic",
source: "https://github.com/janmarek/JsDic/blob/master/jsdic.js"
},
{
name: "GreinerHormann",
tags: ["math", "geometry", "polygon", "clipping", "polyline"],
description: "Greiner-Hormann polygon clipping algorithm. Does AND, OR, XOR.",
url: "http://w8r.github.io/GreinerHormann/",
source: "https://raw.githubusercontent.com/w8r/GreinerHormann/master/dist/greiner-hormann.js"
},
{
name: "Core.js",
github: "mauriciosoares/microjs.com",
tags: ["framework", "lightweight", "scalable", "modular", "sandbox"],
description: "It helps you create scalable applications written in Javascript, giving you some structure and patterns to keep everything separated.",
url: "https://github.com/mauriciosoares/core.js",
source: "https://raw.githubusercontent.com/mauriciosoares/core.js/master/dist/core.js"
},
{
name: "js-mediator",
github: "markmarijnissen/js-mediator",
tags: ["mediator","module","design pattern","MVC"],
description: "Design pattern to write clean, reusable, decoupled, standalone Modules that are coupled with Mediators.",
url: "https://github.com/markmarijnissen/js-mediator",
source: "https://raw.githubusercontent.com/markmarijnissen/js-mediator/master/mediator.js"
=======
name: "Carpet.js",
github: "mateuszgachowski/Carpet.js",
tags: ["module", "simple", "autoload", "context", "settings", "module pattern", "advice"],
description: "Small, easy-to-learn and modular JavaScript framework for big",
url: "https://github.com/mateuszgachowski/Carpet.js",
source: "https://raw.githubusercontent.com/mateuszgachowski/Carpet.js/master/src/carpet.js"
},
{
name: "aja.js",
github: "krampstudio/aja.js",
tags: ["rest", "ajax", "xhr", "jsonp"],
description: "Ajax without XML : Asynchronous JavaScript and JavaScript/JSON(P)",
url: "http://krampstudio.com/aja.js/",
source: "https://raw.githubusercontent.com/krampstudio/aja.js/master/src/aja.js"
>>>>>>>
name: "Carpet.js",
github: "mateuszgachowski/Carpet.js",
tags: ["module", "simple", "autoload", "context", "settings", "module pattern", "advice"],
description: "Small, easy-to-learn and modular JavaScript framework for big",
url: "https://github.com/mateuszgachowski/Carpet.js",
source: "https://raw.githubusercontent.com/mateuszgachowski/Carpet.js/master/src/carpet.js"
},
{
name: "keycharm",
tags: ["keyboard"],
description: "Simple, lightweight key-binding libw. MIT or Apache 2.0.",
url: "https://github.com/AlexDM0/keycharm",
source: "https://raw.githubusercontent.com/AlexDM0/keycharm/master/keycharm.js"
},
{
name: "hash-router",
tags: ["hash", "path", "route", "router"],
description: "Tiny and lightweight browser router library, developed with SPA in mind :)",
url: "https://github.com/michaelsogos/Hash-Router",
source: "https://github.com/michaelsogos/Hash-Router/blob/master/src/hash-router.js"
},
{
name: "JsDic",
tags: ["dependency", "injection", "container", "di", "dic"],
description: "Dependecy injection container inspired by Angular.js.",
url: "https://github.com/janmarek/JsDic",
source: "https://github.com/janmarek/JsDic/blob/master/jsdic.js"
},
{
name: "GreinerHormann",
tags: ["math", "geometry", "polygon", "clipping", "polyline"],
description: "Greiner-Hormann polygon clipping algorithm. Does AND, OR, XOR.",
url: "http://w8r.github.io/GreinerHormann/",
source: "https://raw.githubusercontent.com/w8r/GreinerHormann/master/dist/greiner-hormann.js"
},
{
name: "Core.js",
github: "mauriciosoares/microjs.com",
tags: ["framework", "lightweight", "scalable", "modular", "sandbox"],
description: "It helps you create scalable applications written in Javascript, giving you some structure and patterns to keep everything separated.",
url: "https://github.com/mauriciosoares/core.js",
source: "https://raw.githubusercontent.com/mauriciosoares/core.js/master/dist/core.js"
},
{
name: "js-mediator",
github: "markmarijnissen/js-mediator",
tags: ["mediator","module","design pattern","MVC"],
description: "Design pattern to write clean, reusable, decoupled, standalone Modules that are coupled with Mediators.",
url: "https://github.com/markmarijnissen/js-mediator",
source: "https://raw.githubusercontent.com/markmarijnissen/js-mediator/master/mediator.js"
},
{
name: "Carpet.js",
github: "mateuszgachowski/Carpet.js",
tags: ["module", "simple", "autoload", "context", "settings", "module pattern", "advice"],
description: "Small, easy-to-learn and modular JavaScript framework for big",
url: "https://github.com/mateuszgachowski/Carpet.js",
source: "https://raw.githubusercontent.com/mateuszgachowski/Carpet.js/master/src/carpet.js"
},
{
name: "aja.js",
github: "krampstudio/aja.js",
tags: ["rest", "ajax", "xhr", "jsonp"],
description: "Ajax without XML : Asynchronous JavaScript and JavaScript/JSON(P)",
url: "http://krampstudio.com/aja.js/",
source: "https://raw.githubusercontent.com/krampstudio/aja.js/master/src/aja.js" |
<<<<<<<
},
{
name: "Happen",
size: "0.3k",
tags: ["events" ],
description: "General purpose event triggering",
url: "https://github.com/tmcw/happen",
source: "https://raw.github.com/tmcw/happen/master/src/happen.js"
=======
},
{
name: "zest",
size: "2.2k",
tags: ["css", "selector", "dom"],
description: "An absurdly fast selector engine. Supports CSS3/CSS4 selectors - faster than Sizzle.",
url: "https://github.com/chjj/zest",
source: "https://raw.github.com/chjj/zest/master/lib/zest.js"
>>>>>>>
},
{
name: "Happen",
size: "0.3k",
tags: ["events" ],
description: "General purpose event triggering",
url: "https://github.com/tmcw/happen",
source: "https://raw.github.com/tmcw/happen/master/src/happen.js"
},
{
name: "zest",
size: "2.2k",
tags: ["css", "selector", "dom"],
description: "An absurdly fast selector engine. Supports CSS3/CSS4 selectors - faster than Sizzle.",
url: "https://github.com/chjj/zest",
source: "https://raw.github.com/chjj/zest/master/lib/zest.js" |
<<<<<<<
},
{
name: "range.js",
tags: ["range"],
description: "JavaScript's missing range function.",
url: "https://github.com/js-coder/range.js",
source: "https://raw.github.com/js-coder/range.js/master/lib/range.js"
},
{
name: "Strukt",
tags: ["utilities"],
description: "Ruby inspired Structs for JavaScript.",
url: "https://github.com/js-coder/Strukt",
source: "https://raw.github.com/js-coder/Strukt/master/lib/strukt.js"
=======
},
{
name: "ipsum.js",
tags: ["content", "text", "helper", "tool", "developer tool"],
description: "Increases / decreases text quantity inside inline elements by pressing keys to check if the design can cope with different text length.",
url: "https://github.com/mdix/ipsum.js",
source: "https://raw.github.com/mdix/ipsum.js/master/ipsum.js"
>>>>>>>
},
{
name: "range.js",
tags: ["range"],
description: "JavaScript's missing range function.",
url: "https://github.com/js-coder/range.js",
source: "https://raw.github.com/js-coder/range.js/master/lib/range.js"
},
{
name: "Strukt",
tags: ["utilities"],
description: "Ruby inspired Structs for JavaScript.",
url: "https://github.com/js-coder/Strukt",
source: "https://raw.github.com/js-coder/Strukt/master/lib/strukt.js"
},
{
name: "ipsum.js",
tags: ["content", "text", "helper", "tool", "developer tool"],
description: "Increases / decreases text quantity inside inline elements by pressing keys to check if the design can cope with different text length.",
url: "https://github.com/mdix/ipsum.js",
source: "https://raw.github.com/mdix/ipsum.js/master/ipsum.js" |
<<<<<<<
name: "gradstop",
github: "Siddharth11/gradstop",
tags: ["colors", "palette", "gradient", "hex", "rgb", "hsl"],
description: "JavaScript micro library to generate gradient color stops",
url: "https://github.com/Siddharth11/gradstop",
source: "https://raw.githubusercontent.com/Siddharth11/gradstop/master/gradstopUMD.js",
},
{
=======
name: "easyrouter",
github: "aMarCruz/easyrouter",
tags: ["html5", "router", "routes", "browser", "location", "history", "hash"],
description: "Tiny, fast, easy, yet powerful hash router in JavaScript",
url: "https://github.com/aMarCruz/easyrouter",
source: "https://raw.githubusercontent.com/aMarCruz/easyrouter/master/dist/easyrouter.js"
},
{
>>>>>>>
name: "gradstop",
github: "Siddharth11/gradstop",
tags: ["colors", "palette", "gradient", "hex", "rgb", "hsl"],
description: "JavaScript micro library to generate gradient color stops",
url: "https://github.com/Siddharth11/gradstop",
source: "https://raw.githubusercontent.com/Siddharth11/gradstop/master/gradstopUMD.js",
},
{
name: "easyrouter",
github: "aMarCruz/easyrouter",
tags: ["html5", "router", "routes", "browser", "location", "history", "hash"],
description: "Tiny, fast, easy, yet powerful hash router in JavaScript",
url: "https://github.com/aMarCruz/easyrouter",
source: "https://raw.githubusercontent.com/aMarCruz/easyrouter/master/dist/easyrouter.js"
},
{ |
<<<<<<<
name: "css-time.js",
github: "philbooth/css-time.js",
tags: ["css", "time", "string", "milliseconds", "convert", "conversion"],
description: "A tiny library that converts milliseconds to and from CSS time strings.",
url: "https://github.com/philbooth/css-time.js",
source: "https://raw.github.com/philbooth/css-time.js/master/src/css-time.js"
},
{
=======
name: "accounting.js",
github: "josscrowcroft/accounting.js",
tags: ["math", "number", "money", "currency parsing", "currency formatting"],
description: "A lightweight JavaScript library for number, money and currency formatting - fully localisable, zero dependencies.",
url: "http://josscrowcroft.github.com/accounting.js/",
source: "https://raw.github.com/josscrowcroft/accounting.js/master/accounting.js"
},
{
>>>>>>>
name: "css-time.js",
github: "philbooth/css-time.js",
tags: ["css", "time", "string", "milliseconds", "convert", "conversion"],
description: "A tiny library that converts milliseconds to and from CSS time strings.",
url: "https://github.com/philbooth/css-time.js",
source: "https://raw.github.com/philbooth/css-time.js/master/src/css-time.js"
},
{
name: "accounting.js",
github: "josscrowcroft/accounting.js",
tags: ["math", "number", "money", "currency parsing", "currency formatting"],
description: "A lightweight JavaScript library for number, money and currency formatting - fully localisable, zero dependencies.",
url: "http://josscrowcroft.github.com/accounting.js/",
source: "https://raw.github.com/josscrowcroft/accounting.js/master/accounting.js"
},
{ |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.