Browse Source

Merge remote-tracking branch 'origin/develop' into develop

flowchartTest
jos 9 years ago
parent
commit
ba4f2822d7
20 changed files with 631 additions and 35 deletions
  1. +3
    -0
      dist/vis.css
  2. +61
    -12
      dist/vis.js
  3. +1
    -1
      dist/vis.min.css
  4. +1
    -1
      docs/data/dataset.html
  5. +1
    -1
      docs/data/dataview.html
  6. +1
    -1
      docs/data/index.html
  7. +1
    -1
      docs/graph2d/index.html
  8. +1
    -1
      docs/graph3d/index.html
  9. +21
    -6
      docs/js/main.js
  10. +528
    -0
      docs/js/tipuesearch.js
  11. +1
    -1
      docs/network/configure.html
  12. +3
    -2
      docs/network/edges.html
  13. +1
    -1
      docs/network/groups.html
  14. +1
    -1
      docs/network/index.html
  15. +1
    -1
      docs/network/interaction.html
  16. +1
    -1
      docs/network/layout.html
  17. +1
    -1
      docs/network/manipulation.html
  18. +1
    -1
      docs/network/nodes.html
  19. +1
    -1
      docs/network/physics.html
  20. +1
    -1
      docs/timeline/index.html

+ 3
- 0
dist/vis.css View File

@ -320,6 +320,9 @@
position: absolute; position: absolute;
color: #4d4d4d; color: #4d4d4d;
padding: 3px; padding: 3px;
overflow: hidden;
box-sizing: border-box;
white-space: nowrap; white-space: nowrap;
} }

+ 61
- 12
dist/vis.js View File

@ -14269,9 +14269,13 @@ return /******/ (function(modules) { // webpackBootstrap
Range.prototype._onDragStart = function (event) { Range.prototype._onDragStart = function (event) {
this.deltaDifference = 0; this.deltaDifference = 0;
this.previousDelta = 0; this.previousDelta = 0;
// only allow dragging when configured as movable // only allow dragging when configured as movable
if (!this.options.moveable) return; if (!this.options.moveable) return;
// only start dragging when the mouse is inside the current range
if (!this._isInsideRange(event)) return;
// refuse to drag when we where pinching to prevent the timeline make a jump // refuse to drag when we where pinching to prevent the timeline make a jump
// when releasing the fingers in opposite order from the touch screen // when releasing the fingers in opposite order from the touch screen
if (!this.props.touch.allowDragging) return; if (!this.props.touch.allowDragging) return;
@ -14291,6 +14295,8 @@ return /******/ (function(modules) { // webpackBootstrap
* @private * @private
*/ */
Range.prototype._onDrag = function (event) { Range.prototype._onDrag = function (event) {
if (!this.props.touch.dragging) return;
// only allow dragging when configured as movable // only allow dragging when configured as movable
if (!this.options.moveable) return; if (!this.options.moveable) return;
@ -14342,6 +14348,8 @@ return /******/ (function(modules) { // webpackBootstrap
* @private * @private
*/ */
Range.prototype._onDragEnd = function (event) { Range.prototype._onDragEnd = function (event) {
if (!this.props.touch.dragging) return;
// only allow dragging when configured as movable // only allow dragging when configured as movable
if (!this.options.moveable) return; if (!this.options.moveable) return;
@ -14373,6 +14381,9 @@ return /******/ (function(modules) { // webpackBootstrap
// only allow zooming when configured as zoomable and moveable // only allow zooming when configured as zoomable and moveable
if (!(this.options.zoomable && this.options.moveable)) return; if (!(this.options.zoomable && this.options.moveable)) return;
// only zoom when the mouse is inside the current range
if (!this._isInsideRange(event)) return;
// retrieve delta // retrieve delta
var delta = 0; var delta = 0;
if (event.wheelDelta) { if (event.wheelDelta) {
@ -14471,6 +14482,23 @@ return /******/ (function(modules) { // webpackBootstrap
this.endToFront = true; // revert to default this.endToFront = true; // revert to default
}; };
/**
* Test whether the mouse from a mouse event is inside the visible window,
* between the current start and end date
* @param {Object} event
* @return {boolean} Returns true when inside the visible window
* @private
*/
Range.prototype._isInsideRange = function (event) {
// calculate the time where the mouse is, check whether inside
// and no scroll action should happen.
var clientX = event.center ? event.center.x : event.clientX;
var x = clientX - util.getAbsoluteLeft(this.body.dom.centerContainer);
var time = this.body.util.toTime(x);
return time >= this.start && time <= this.end;
};
/** /**
* Helper function to calculate the center date for zooming * Helper function to calculate the center date for zooming
* @param {{x: Number, y: Number}} pointer * @param {{x: Number, y: Number}} pointer
@ -15516,6 +15544,16 @@ return /******/ (function(modules) { // webpackBootstrap
return customTimes[0].getCustomTime(); return customTimes[0].getCustomTime();
}; };
/**
* Retrieve meta information from an event.
* Should be overridden by classes extending Core
* @param {Event} event
* @return {Object} An object with related information.
*/
Core.prototype.getEventProperties = function (event) {
return { event: event };
};
/** /**
* Add custom vertical bar * Add custom vertical bar
* @param {Date | String | Number} [time] A Date, unix timestamp, or * @param {Date | String | Number} [time] A Date, unix timestamp, or
@ -16379,7 +16417,7 @@ return /******/ (function(modules) { // webpackBootstrap
ItemSet.prototype.setOptions = function (options) { ItemSet.prototype.setOptions = function (options) {
if (options) { if (options) {
// copy all options that we know // copy all options that we know
var fields = ['type', 'align', 'order', 'stack', 'selectable', 'multiselect', 'groupOrder', 'dataAttributes', 'template', 'hide', 'snap'];
var fields = ['type', 'align', 'order', 'stack', 'selectable', 'multiselect', 'groupOrder', 'dataAttributes', 'template', 'groupTemplate', 'hide', 'snap'];
util.selectiveExtend(fields, this.options, options); util.selectiveExtend(fields, this.options, options);
if ('orientation' in options) { if ('orientation' in options) {
@ -17416,13 +17454,11 @@ return /******/ (function(modules) { // webpackBootstrap
if (this.touchParams.itemProps) { if (this.touchParams.itemProps) {
event.stopPropagation(); event.stopPropagation();
// prepare a change set for the changed items
var changes = [];
var me = this; var me = this;
var dataset = this.itemsData.getDataSet(); var dataset = this.itemsData.getDataSet();
var itemProps = this.touchParams.itemProps; var itemProps = this.touchParams.itemProps;
this.touchParams.itemProps = null; this.touchParams.itemProps = null;
itemProps.forEach(function (props) { itemProps.forEach(function (props) {
var id = props.item.id; var id = props.item.id;
var exists = me.itemsData.get(id, me.itemOptions) != null; var exists = me.itemsData.get(id, me.itemOptions) != null;
@ -17446,7 +17482,7 @@ return /******/ (function(modules) { // webpackBootstrap
if (itemData) { if (itemData) {
// apply changes // apply changes
itemData[dataset._fieldId] = id; // ensure the item contains its id (can be undefined) itemData[dataset._fieldId] = id; // ensure the item contains its id (can be undefined)
changes.push(itemData);
dataset.update(itemData);
} else { } else {
// restore original values // restore original values
props.item.setData(props.data); props.item.setData(props.data);
@ -17457,11 +17493,6 @@ return /******/ (function(modules) { // webpackBootstrap
}); });
} }
}); });
// apply the changes to the data (if there are changes)
if (changes.length) {
dataset.update(changes);
}
} }
}; };
@ -17808,8 +17839,15 @@ return /******/ (function(modules) { // webpackBootstrap
*/ */
Group.prototype.setData = function (data) { Group.prototype.setData = function (data) {
// update contents // update contents
var content = data && data.content;
var content;
if (this.itemSet.options && this.itemSet.options.groupTemplate) {
content = this.itemSet.options.groupTemplate(data);
} else {
content = data && data.content;
}
if (content instanceof Element) { if (content instanceof Element) {
this.dom.inner.appendChild(content);
while (this.dom.inner.firstChild) { while (this.dom.inner.firstChild) {
this.dom.inner.removeChild(this.dom.inner.firstChild); this.dom.inner.removeChild(this.dom.inner.firstChild);
} }
@ -20170,6 +20208,7 @@ return /******/ (function(modules) { // webpackBootstrap
var xPrev = 0; var xPrev = 0;
var width = 0; var width = 0;
var prevLine; var prevLine;
var prevText;
var xFirstMajorLabel = undefined; var xFirstMajorLabel = undefined;
var max = 0; var max = 0;
var className; var className;
@ -20188,9 +20227,12 @@ return /******/ (function(modules) { // webpackBootstrap
if (prevLine) { if (prevLine) {
prevLine.style.width = width + 'px'; prevLine.style.width = width + 'px';
} }
if (prevText) {
prevText.style.width = width + 'px';
}
if (this.options.showMinorLabels) { if (this.options.showMinorLabels) {
this._repaintMinorText(x, step.getLabelMinor(), orientation, className);
prevText = this._repaintMinorText(x, step.getLabelMinor(), orientation, className);
} }
if (isMajor && this.options.showMajorLabels) { if (isMajor && this.options.showMajorLabels) {
@ -20236,6 +20278,7 @@ return /******/ (function(modules) { // webpackBootstrap
* @param {String} text * @param {String} text
* @param {String} orientation "top" or "bottom" (default) * @param {String} orientation "top" or "bottom" (default)
* @param {String} className * @param {String} className
* @return {Element} Returns the HTML element of the created label
* @private * @private
*/ */
TimeAxis.prototype._repaintMinorText = function (x, text, orientation, className) { TimeAxis.prototype._repaintMinorText = function (x, text, orientation, className) {
@ -20257,6 +20300,8 @@ return /******/ (function(modules) { // webpackBootstrap
label.style.left = x + 'px'; label.style.left = x + 'px';
label.className = 'vis-text vis-minor ' + className; label.className = 'vis-text vis-minor ' + className;
//label.title = title; // TODO: this is a heavy operation //label.title = title; // TODO: this is a heavy operation
return label;
}; };
/** /**
@ -20265,6 +20310,7 @@ return /******/ (function(modules) { // webpackBootstrap
* @param {String} text * @param {String} text
* @param {String} orientation "top" or "bottom" (default) * @param {String} orientation "top" or "bottom" (default)
* @param {String} className * @param {String} className
* @return {Element} Returns the HTML element of the created label
* @private * @private
*/ */
TimeAxis.prototype._repaintMajorText = function (x, text, orientation, className) { TimeAxis.prototype._repaintMajorText = function (x, text, orientation, className) {
@ -20286,6 +20332,8 @@ return /******/ (function(modules) { // webpackBootstrap
label.style.top = orientation == 'top' ? '0' : this.props.minorLabelHeight + 'px'; label.style.top = orientation == 'top' ? '0' : this.props.minorLabelHeight + 'px';
label.style.left = x + 'px'; label.style.left = x + 'px';
return label;
}; };
/** /**
@ -22693,6 +22741,7 @@ return /******/ (function(modules) { // webpackBootstrap
snap: { 'function': 'function', 'null': 'null' }, snap: { 'function': 'function', 'null': 'null' },
start: { date: date, number: number, string: string, moment: moment }, start: { date: date, number: number, string: string, moment: moment },
template: { 'function': 'function' }, template: { 'function': 'function' },
groupTemplate: { 'function': 'function' },
timeAxis: { timeAxis: {
scale: { string: string, 'undefined': 'undefined' }, scale: { string: string, 'undefined': 'undefined' },
step: { number: number, 'undefined': 'undefined' }, step: { number: number, 'undefined': 'undefined' },

+ 1
- 1
dist/vis.min.css
File diff suppressed because it is too large
View File


+ 1
- 1
docs/data/dataset.html View File

@ -1018,6 +1018,6 @@ var positiveBalance = dataset.get({
<script src="../js/jquery.url.min.js"></script> <script src="../js/jquery.url.min.js"></script>
<!-- Tipue vendor js --> <!-- Tipue vendor js -->
<script src="../js/tipuesearch.config.js"></script> <script src="../js/tipuesearch.config.js"></script>
<script src="../js/tipuesearch.min.js"></script>
<script src="../js/tipuesearch.js"></script>
<!-- controller --> <!-- controller -->
<script src="../js/main.js"></script> <script src="../js/main.js"></script>

+ 1
- 1
docs/data/dataview.html View File

@ -408,6 +408,6 @@ view.on('*', function (event, properties, senderId) {
<script src="../js/jquery.url.min.js"></script> <script src="../js/jquery.url.min.js"></script>
<!-- Tipue vendor js --> <!-- Tipue vendor js -->
<script src="../js/tipuesearch.config.js"></script> <script src="../js/tipuesearch.config.js"></script>
<script src="../js/tipuesearch.min.js"></script>
<script src="../js/tipuesearch.js"></script>
<!-- controller --> <!-- controller -->
<script src="../js/main.js"></script> <script src="../js/main.js"></script>

+ 1
- 1
docs/data/index.html View File

@ -133,6 +133,6 @@
<script src="../js/jquery.url.min.js"></script> <script src="../js/jquery.url.min.js"></script>
<!-- Tipue vendor js --> <!-- Tipue vendor js -->
<script src="../js/tipuesearch.config.js"></script> <script src="../js/tipuesearch.config.js"></script>
<script src="../js/tipuesearch.min.js"></script>
<script src="../js/tipuesearch.js"></script>
<!-- controller --> <!-- controller -->
<script src="../js/main.js"></script> <script src="../js/main.js"></script>

+ 1
- 1
docs/graph2d/index.html View File

@ -1451,6 +1451,6 @@ Graph2d.off('rangechanged', onChange);
<script src="../js/jquery.url.min.js"></script> <script src="../js/jquery.url.min.js"></script>
<!-- Tipue vendor js --> <!-- Tipue vendor js -->
<script src="../js/tipuesearch.config.js"></script> <script src="../js/tipuesearch.config.js"></script>
<script src="../js/tipuesearch.min.js"></script>
<script src="../js/tipuesearch.js"></script>
<!-- controller --> <!-- controller -->
<script src="../js/main.js"></script> <script src="../js/main.js"></script>

+ 1
- 1
docs/graph3d/index.html View File

@ -787,6 +787,6 @@ graph3d.on('cameraPositionChange', onCameraPositionChange);
<script src="../js/jquery.url.min.js"></script> <script src="../js/jquery.url.min.js"></script>
<!-- Tipue vendor js --> <!-- Tipue vendor js -->
<script src="../js/tipuesearch.config.js"></script> <script src="../js/tipuesearch.config.js"></script>
<script src="../js/tipuesearch.min.js"></script>
<script src="../js/tipuesearch.js"></script>
<!-- controller --> <!-- controller -->
<script src="../js/main.js"></script> <script src="../js/main.js"></script>

+ 21
- 6
docs/js/main.js View File

@ -3,9 +3,23 @@ $(document).ready(function() {
vis.createBreadcrumbs($(".container.full").first()); vis.createBreadcrumbs($(".container.full").first());
vis.initSiteSearch(); vis.initSiteSearch();
vis.initKeywords(); vis.initKeywords();
$("#tipue_search_input").keyup(checkInput)
vis.typingTimeout = 0;
}); });
function checkInput() {
if (document.getElementById("tipue_search_input").value.length > 3) {
clearTimeout(vis.typingTimeout);
vis.typingTimeout = setTimeout(vis.initSiteSearch(true),300);
}
else {
document.getElementById("search-results-wrapper").style.display = "none";
}
}
// namespace // namespace
var vis = {}; var vis = {};
@ -57,17 +71,18 @@ vis.createBreadcrumbs = function(container) {
* *
* @author felixhayashi * @author felixhayashi
*/ */
vis.initSiteSearch = function() {
vis.initSiteSearch = function(dynamic) { // Added dynamic flag for live update ~ Alex
$("#tipue_search_input").tipuesearch({ $("#tipue_search_input").tipuesearch({
"mode": "live", "mode": "live",
"show": 3, "show": 3,
});
},dynamic);
var hasSearchMessage = $("#tipue_search_content").children().length > 0; var hasSearchMessage = $("#tipue_search_content").children().length > 0;
if(hasSearchMessage) { if(hasSearchMessage) {
// show result panel // show result panel
$("#search-results-wrapper").css("display", "block");
if ($("#search-results-wrapper").css("display") === 'none') {
$("#search-results-wrapper").css("display", "block");
}
// encode the keywords that were entered by the user // encode the keywords that were entered by the user
var keywords = $("#tipue_search_input").val().replace(/\s/g, ","); var keywords = $("#tipue_search_input").val().replace(/\s/g, ",");
// add keywords to result-urls // add keywords to result-urls
@ -117,7 +132,7 @@ vis.initKeywords = function() {
// do not cache hits outside the handler; creates problems with prettyfy lib // do not cache hits outside the handler; creates problems with prettyfy lib
// we use the first visible(!) hit at the time the button is clicked // we use the first visible(!) hit at the time the button is clicked
var firstHit = $(".highlight:visible").first(); var firstHit = $(".highlight:visible").first();
if(firstHit) {
if(firstHit.length) {
$("html, body").animate({ scrollTop: $(firstHit).offset().top }, 2000); $("html, body").animate({ scrollTop: $(firstHit).offset().top }, 2000);
} }
}); });

+ 528
- 0
docs/js/tipuesearch.js View File

@ -0,0 +1,528 @@
/*
Tipue Search 5.0
Copyright (c) 2015 Tipue
Tipue Search is released under the MIT License
http://www.tipue.com/search
*/
(function($) {
$.fn.tipuesearch = function(options,dynamic) {
var set = $.extend( {
'show' : 7,
'newWindow' : false,
'showURL' : true,
'showTitleCount' : true,
'minimumLength' : 3,
'descriptiveWords' : 25,
'highlightTerms' : true,
'highlightEveryTerm' : false,
'mode' : 'static',
'liveDescription' : '*',
'liveContent' : '*',
'contentLocation' : 'tipuesearch/tipuesearch_content.json',
'debug' : false
}, options);
if (dynamic === undefined) {
dynamic = false;
}
return this.each(function() {
var tipuesearch_in = {
pages: []
};
$.ajaxSetup({
async: false
});
var tipuesearch_t_c = 0;
if (set.mode == 'live')
{
for (var i = 0; i < tipuesearch_pages.length; i++)
{
$.get(tipuesearch_pages[i])
.done(function(html)
{
var cont = $(set.liveContent, html).text();
cont = cont.replace(/\s+/g, ' ');
var desc = $(set.liveDescription, html).text();
desc = desc.replace(/\s+/g, ' ');
var t_1 = html.toLowerCase().indexOf('<title>');
var t_2 = html.toLowerCase().indexOf('</title>', t_1 + 7);
if (t_1 != -1 && t_2 != -1)
{
var tit = html.slice(t_1 + 7, t_2);
}
else
{
var tit = tipuesearch_string_1;
}
tipuesearch_in.pages.push(
{
"title": tit,
"text": desc,
"tags": cont,
"url": tipuesearch_pages[i]
});
});
}
}
if (set.mode == 'json')
{
$.getJSON(set.contentLocation)
.done(function(json)
{
tipuesearch_in = $.extend({}, json);
});
}
if (set.mode == 'static')
{
tipuesearch_in = $.extend({}, tipuesearch);
}
var tipue_search_w = '';
if (set.newWindow)
{
tipue_search_w = ' target="_blank"';
}
function getURLP(name)
{
return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.search)||[,""])[1].replace(/\+/g, '%20')) || null;
}
// edit for live update ~ Alex de Mulder
if (getURLP('q') && dynamic === false)
{
$('#tipue_search_input').val(getURLP('q'));
getTipueSearch(0, true);
}
else if (dynamic === true) {
getTipueSearch(0, true);
}
$(this).keyup(function(event)
{
if(event.keyCode == '13')
{
getTipueSearch(0, true);
}
});
function getTipueSearch(start, replace)
{
$('#tipue_search_content').hide();
$('#tipue_search_content').html('<div class="tipue_search_spinner"><div class="tipue_search_rect1"></div><div class="tipue_search_rect2"></div><div class="rect3"></div></div>');
$('#tipue_search_content').show();
var out = '';
var results = '';
var show_replace = false;
var show_stop = false;
var standard = true;
var c = 0;
found = [];
var d = $('#tipue_search_input').val().toLowerCase();
d = $.trim(d);
if ((d.match("^\"") && d.match("\"$")) || (d.match("^'") && d.match("'$")))
{
standard = false;
}
if (standard)
{
var d_w = d.split(' ');
d = '';
for (var i = 0; i < d_w.length; i++)
{
var a_w = true;
for (var f = 0; f < tipuesearch_stop_words.length; f++)
{
if (d_w[i] == tipuesearch_stop_words[f])
{
a_w = false;
show_stop = true;
}
}
if (a_w)
{
d = d + ' ' + d_w[i];
}
}
d = $.trim(d);
d_w = d.split(' ');
}
else
{
d = d.substring(1, d.length - 1);
}
if (d.length >= set.minimumLength)
{
if (standard)
{
if (replace)
{
var d_r = d;
for (var i = 0; i < d_w.length; i++)
{
for (var f = 0; f < tipuesearch_replace.words.length; f++)
{
if (d_w[i] == tipuesearch_replace.words[f].word)
{
d = d.replace(d_w[i], tipuesearch_replace.words[f].replace_with);
show_replace = true;
}
}
}
d_w = d.split(' ');
}
var d_t = d;
for (var i = 0; i < d_w.length; i++)
{
for (var f = 0; f < tipuesearch_stem.words.length; f++)
{
if (d_w[i] == tipuesearch_stem.words[f].word)
{
d_t = d_t + ' ' + tipuesearch_stem.words[f].stem;
}
}
}
d_w = d_t.split(' ');
for (var i = 0; i < tipuesearch_in.pages.length; i++)
{
var score = 0;
var s_t = tipuesearch_in.pages[i].text;
for (var f = 0; f < d_w.length; f++)
{
var pat = new RegExp(d_w[f], 'gi');
if (tipuesearch_in.pages[i].title.search(pat) != -1)
{
var m_c = tipuesearch_in.pages[i].title.match(pat).length;
score += (20 * m_c);
}
if (tipuesearch_in.pages[i].text.search(pat) != -1)
{
var m_c = tipuesearch_in.pages[i].text.match(pat).length;
score += (20 * m_c);
}
if (set.highlightTerms)
{
if (set.highlightEveryTerm)
{
var patr = new RegExp('(' + d_w[f] + ')', 'gi');
}
else
{
var patr = new RegExp('(' + d_w[f] + ')', 'i');
}
s_t = s_t.replace(patr, "<span class=\"h01\">$1</span>");
}
if (tipuesearch_in.pages[i].tags.search(pat) != -1)
{
var m_c = tipuesearch_in.pages[i].tags.match(pat).length;
score += (10 * m_c);
}
if (tipuesearch_in.pages[i].url.search(pat) != -1)
{
score += 20;
}
if (score != 0)
{
for (var e = 0; e < tipuesearch_weight.weight.length; e++)
{
if (tipuesearch_in.pages[i].url == tipuesearch_weight.weight[e].url)
{
score += tipuesearch_weight.weight[e].score;
}
}
}
if (d_w[f].match('^-'))
{
pat = new RegExp(d_w[f].substring(1), 'i');
if (tipuesearch_in.pages[i].title.search(pat) != -1 || tipuesearch_in.pages[i].text.search(pat) != -1 || tipuesearch_in.pages[i].tags.search(pat) != -1)
{
score = 0;
}
}
}
if (score != 0)
{
found.push(
{
"score": score,
"title": tipuesearch_in.pages[i].title,
"desc": s_t,
"url": tipuesearch_in.pages[i].url
});
c++;
}
}
}
else
{
for (var i = 0; i < tipuesearch_in.pages.length; i++)
{
var score = 0;
var s_t = tipuesearch_in.pages[i].text;
var pat = new RegExp(d, 'gi');
if (tipuesearch_in.pages[i].title.search(pat) != -1)
{
var m_c = tipuesearch_in.pages[i].title.match(pat).length;
score += (20 * m_c);
}
if (tipuesearch_in.pages[i].text.search(pat) != -1)
{
var m_c = tipuesearch_in.pages[i].text.match(pat).length;
score += (20 * m_c);
}
if (set.highlightTerms)
{
if (set.highlightEveryTerm)
{
var patr = new RegExp('(' + d + ')', 'gi');
}
else
{
var patr = new RegExp('(' + d + ')', 'i');
}
s_t = s_t.replace(patr, "<span class=\"h01\">$1</span>");
}
if (tipuesearch_in.pages[i].tags.search(pat) != -1)
{
var m_c = tipuesearch_in.pages[i].tags.match(pat).length;
score += (10 * m_c);
}
if (tipuesearch_in.pages[i].url.search(pat) != -1)
{
score += 20;
}
if (score != 0)
{
for (var e = 0; e < tipuesearch_weight.weight.length; e++)
{
if (tipuesearch_in.pages[i].url == tipuesearch_weight.weight[e].url)
{
score += tipuesearch_weight.weight[e].score;
}
}
}
if (score != 0)
{
found.push(
{
"score": score,
"title": tipuesearch_in.pages[i].title,
"desc": s_t,
"url": tipuesearch_in.pages[i].url
});
c++;
}
}
}
if (c != 0)
{
if (set.showTitleCount && tipuesearch_t_c == 0)
{
var title = document.title;
// fix for no stacking of the counters ~ Alex
title = title.replace(/(\(.+\) )/g,"");
document.title = '(' + c + ') ' + title;
tipuesearch_t_c++;
}
if (show_replace == 1)
{
out += '<div id="tipue_search_warning">' + tipuesearch_string_2 + ' ' + d + '. ' + tipuesearch_string_3 + ' <a id="tipue_search_replaced">' + d_r + '</a></div>';
}
if (c == 1)
{
out += '<div id="tipue_search_results_count">' + tipuesearch_string_4 + '</div>';
}
else
{
c_c = c.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
out += '<div id="tipue_search_results_count">' + c_c + ' ' + tipuesearch_string_5 + '</div>';
}
found.sort(function(a, b) { return b.score - a.score } );
var l_o = 0;
for (var i = 0; i < found.length; i++)
{
if (l_o >= start && l_o < set.show + start)
{
out += '<div class="tipue_search_content_title"><a href="' + found[i].url + '"' + tipue_search_w + '>' + found[i].title + '</a></div>';
if (set.debug)
{
out += '<div class="tipue_search_content_debug">Score: ' + found[i].score + '</div>';
}
if (set.showURL)
{
var s_u = found[i].url.toLowerCase();
if(s_u.indexOf('http://') == 0)
{
s_u = s_u.slice(7);
}
out += '<div class="tipue_search_content_url"><a href="' + found[i].url + '"' + tipue_search_w + '>' + s_u + '</a></div>';
}
if (found[i].desc)
{
var t = found[i].desc;
var t_d = '';
var t_w = t.split(' ');
if (t_w.length < set.descriptiveWords)
{
t_d = t;
}
else
{
for (var f = 0; f < set.descriptiveWords; f++)
{
t_d += t_w[f] + ' ';
}
}
t_d = $.trim(t_d);
if (t_d.charAt(t_d.length - 1) != '.')
{
t_d += ' ...';
}
out += '<div class="tipue_search_content_text">' + t_d + '</div>';
}
}
l_o++;
}
if (c > set.show)
{
var pages = Math.ceil(c / set.show);
var page = (start / set.show);
out += '<div id="tipue_search_foot"><ul id="tipue_search_foot_boxes">';
if (start > 0)
{
out += '<li><a class="tipue_search_foot_box" id="' + (start - set.show) + '_' + replace + '">' + tipuesearch_string_6 + '</a></li>';
}
if (page <= 2)
{
var p_b = pages;
if (pages > 3)
{
p_b = 3;
}
for (var f = 0; f < p_b; f++)
{
if (f == page)
{
out += '<li class="current">' + (f + 1) + '</li>';
}
else
{
out += '<li><a class="tipue_search_foot_box" id="' + (f * set.show) + '_' + replace + '">' + (f + 1) + '</a></li>';
}
}
}
else
{
var p_b = page + 2;
if (p_b > pages)
{
p_b = pages;
}
for (var f = page - 1; f < p_b; f++)
{
if (f == page)
{
out += '<li class="current">' + (f + 1) + '</li>';
}
else
{
out += '<li><a class="tipue_search_foot_box" id="' + (f * set.show) + '_' + replace + '">' + (f + 1) + '</a></li>';
}
}
}
if (page + 1 != pages)
{
out += '<li><a class="tipue_search_foot_box" id="' + (start + set.show) + '_' + replace + '">' + tipuesearch_string_7 + '</a></li>';
}
out += '</ul></div>';
}
}
else
{
out += '<div id="tipue_search_warning">' + tipuesearch_string_8 + '</div>';
}
}
else
{
if (show_stop)
{
out += '<div id="tipue_search_warning">' + tipuesearch_string_8 + '. ' + tipuesearch_string_9 + '</div>';
}
else
{
out += '<div id="tipue_search_warning">' + tipuesearch_string_10 + '</div>';
if (set.minimumLength == 1)
{
out += '<div id="tipue_search_warning">' + tipuesearch_string_11 + '</div>';
}
else
{
out += '<div id="tipue_search_warning">' + tipuesearch_string_12 + ' ' + set.minimumLength + ' ' + tipuesearch_string_13 + '</div>';
}
}
}
$('#tipue_search_content').hide();
$('#tipue_search_content').html(out);
$('#tipue_search_content').slideDown(200);
$('#tipue_search_replaced').click(function()
{
getTipueSearch(0, false);
});
$('.tipue_search_foot_box').click(function()
{
var id_v = $(this).attr('id');
var id_a = id_v.split('_');
getTipueSearch(parseInt(id_a[0]), id_a[1]);
});
}
});
};
})(jQuery);

+ 1
- 1
docs/network/configure.html View File

@ -188,6 +188,6 @@ function (option, path) {
<script src="../js/jquery.url.min.js"></script> <script src="../js/jquery.url.min.js"></script>
<!-- Tipue vendor js --> <!-- Tipue vendor js -->
<script src="../js/tipuesearch.config.js"></script> <script src="../js/tipuesearch.config.js"></script>
<script src="../js/tipuesearch.min.js"></script>
<script src="../js/tipuesearch.js"></script>
<!-- controller --> <!-- controller -->
<script src="../js/main.js"></script> <script src="../js/main.js"></script>

+ 3
- 2
docs/network/edges.html View File

@ -68,7 +68,7 @@
</ul> </ul>
<form class="navbar-form navbar-right" role="search"> <form class="navbar-form navbar-right" role="search">
<input name="q" id="tipue_search_input" autocomplete="off" type="text" class="form-control" placeholder="Enter keywords"> <input name="q" id="tipue_search_input" autocomplete="off" type="text" class="form-control" placeholder="Enter keywords">
<button type="submit" class="btn btn-default">Go!</button>
<button type="button" class="btn btn-default" onclick="vis.initSiteSearch(true);">Go!</button>
</form> </form>
<div id="search-results-wrapper" class="panel panel-default"> <div id="search-results-wrapper" class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
@ -670,6 +670,7 @@ var options: {
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../js/keycharm.js"></script>
<script src="../js/jquery.min.js"></script> <script src="../js/jquery.min.js"></script>
<script src="../js/bootstrap.min.js"></script> <script src="../js/bootstrap.min.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
@ -679,6 +680,6 @@ var options: {
<script src="../js/jquery.url.min.js"></script> <script src="../js/jquery.url.min.js"></script>
<!-- Tipue vendor js --> <!-- Tipue vendor js -->
<script src="../js/tipuesearch.config.js"></script> <script src="../js/tipuesearch.config.js"></script>
<script src="../js/tipuesearch.min.js"></script>
<script src="../js/tipuesearch.js"></script>
<!-- controller --> <!-- controller -->
<script src="../js/main.js"></script> <script src="../js/main.js"></script>

+ 1
- 1
docs/network/groups.html View File

@ -172,6 +172,6 @@ var options = {
<script src="../js/jquery.url.min.js"></script> <script src="../js/jquery.url.min.js"></script>
<!-- Tipue vendor js --> <!-- Tipue vendor js -->
<script src="../js/tipuesearch.config.js"></script> <script src="../js/tipuesearch.config.js"></script>
<script src="../js/tipuesearch.min.js"></script>
<script src="../js/tipuesearch.js"></script>
<!-- controller --> <!-- controller -->
<script src="../js/main.js"></script> <script src="../js/main.js"></script>

+ 1
- 1
docs/network/index.html View File

@ -1585,6 +1585,6 @@ var network = new vis.Network(container, data, options);
<script src="../js/jquery.url.min.js"></script> <script src="../js/jquery.url.min.js"></script>
<!-- Tipue vendor js --> <!-- Tipue vendor js -->
<script src="../js/tipuesearch.config.js"></script> <script src="../js/tipuesearch.config.js"></script>
<script src="../js/tipuesearch.min.js"></script>
<script src="../js/tipuesearch.js"></script>
<!-- controller --> <!-- controller -->
<script src="../js/main.js"></script> <script src="../js/main.js"></script>

+ 1
- 1
docs/network/interaction.html View File

@ -167,6 +167,6 @@ network.setOptions(options);
<script src="../js/jquery.url.min.js"></script> <script src="../js/jquery.url.min.js"></script>
<!-- Tipue vendor js --> <!-- Tipue vendor js -->
<script src="../js/tipuesearch.config.js"></script> <script src="../js/tipuesearch.config.js"></script>
<script src="../js/tipuesearch.min.js"></script>
<script src="../js/tipuesearch.js"></script>
<!-- controller --> <!-- controller -->
<script src="../js/main.js"></script> <script src="../js/main.js"></script>

+ 1
- 1
docs/network/layout.html View File

@ -150,6 +150,6 @@ network.setOptions(options);
<script src="../js/jquery.url.min.js"></script> <script src="../js/jquery.url.min.js"></script>
<!-- Tipue vendor js --> <!-- Tipue vendor js -->
<script src="../js/tipuesearch.config.js"></script> <script src="../js/tipuesearch.config.js"></script>
<script src="../js/tipuesearch.min.js"></script>
<script src="../js/tipuesearch.js"></script>
<!-- controller --> <!-- controller -->
<script src="../js/main.js"></script> <script src="../js/main.js"></script>

+ 1
- 1
docs/network/manipulation.html View File

@ -199,6 +199,6 @@ var options = {
<script src="../js/jquery.url.min.js"></script> <script src="../js/jquery.url.min.js"></script>
<!-- Tipue vendor js --> <!-- Tipue vendor js -->
<script src="../js/tipuesearch.config.js"></script> <script src="../js/tipuesearch.config.js"></script>
<script src="../js/tipuesearch.min.js"></script>
<script src="../js/tipuesearch.js"></script>
<!-- controller --> <!-- controller -->
<script src="../js/main.js"></script> <script src="../js/main.js"></script>

+ 1
- 1
docs/network/nodes.html View File

@ -682,6 +682,6 @@ mySize = minSize + diff * scale;
<script src="../js/jquery.url.min.js"></script> <script src="../js/jquery.url.min.js"></script>
<!-- Tipue vendor js --> <!-- Tipue vendor js -->
<script src="../js/tipuesearch.config.js"></script> <script src="../js/tipuesearch.config.js"></script>
<script src="../js/tipuesearch.min.js"></script>
<script src="../js/tipuesearch.js"></script>
<!-- controller --> <!-- controller -->
<script src="../js/main.js"></script> <script src="../js/main.js"></script>

+ 1
- 1
docs/network/physics.html View File

@ -217,6 +217,6 @@ network.setOptions(options);
<script src="../js/jquery.url.min.js"></script> <script src="../js/jquery.url.min.js"></script>
<!-- Tipue vendor js --> <!-- Tipue vendor js -->
<script src="../js/tipuesearch.config.js"></script> <script src="../js/tipuesearch.config.js"></script>
<script src="../js/tipuesearch.min.js"></script>
<script src="../js/tipuesearch.js"></script>
<!-- controller --> <!-- controller -->
<script src="../js/main.js"></script> <script src="../js/main.js"></script>

+ 1
- 1
docs/timeline/index.html View File

@ -1638,6 +1638,6 @@ var options = {
<script src="../js/jquery.url.min.js"></script> <script src="../js/jquery.url.min.js"></script>
<!-- Tipue vendor js --> <!-- Tipue vendor js -->
<script src="../js/tipuesearch.config.js"></script> <script src="../js/tipuesearch.config.js"></script>
<script src="../js/tipuesearch.min.js"></script>
<script src="../js/tipuesearch.js"></script>
<!-- controller --> <!-- controller -->
<script src="../js/main.js"></script> <script src="../js/main.js"></script>

Loading…
Cancel
Save