Skip to content

Commit e071266

Browse files
author
Peter Hasitschka
committed
Merge conflicts
2 parents 9c0d3b7 + eb91dbb commit e071266

38 files changed

+18186
-27427
lines changed

‎Dashboard/Geochart/geochart.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ function Geochart(root, visTemplate) {
508508
GEO.map.closePopup();
509509
if (dataToHighlightIds)
510510
dataToHighlightIds.forEach(function (id) {
511-
var item = _.find(GEO.Input.data, function (d) { return d.id == id; });
511+
var item = underscore.find(GEO.Input.data, function (d) { return d.id == id; });
512512
GEO.markersGroup.zoomToShowLayer(item.geoMarker, function () {
513513
item.geoMarker.openPopup();
514514
});

‎Dashboard/Plugins/FilterVisCategoryHex.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
return;
4141
}
4242
var base, svg, focus = null;
43-
var categoryValues = _(filters).map('categoryValues');
44-
var selectedData = _(filters).map('dataWithinFilter');
43+
var categoryValues = underscore(filters).map('categoryValues');
44+
var selectedData = underscore(filters).map('dataWithinFilter');
4545
var category = "";
4646
if (filters.length > 0)
4747
category = filters[0].category;

‎Dashboard/Plugins/FilterVisKeywords.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@
99
FilterVisKeywords.draw = function (allData, inputData, $container, filters) {
1010

1111
//var categoryValues = filters[0]['categoryValues'];
12-
var categoryValues = _(filters).map('categoryValues');
13-
categoryValues = _(categoryValues).flatten();
14-
categoryValues = _(categoryValues).uniq();
15-
var selectedData = _(filters).map('dataWithinFilter');
12+
var categoryValues = underscore.chain(filters).map('categoryValues').flatten().uniq().value();
13+
var selectedData = underscore(filters).map('dataWithinFilter');
1614

1715
var $vis = $container.find('.FilterVisKeywords');
1816

‎Dashboard/Plugins/FilterVisTime.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
}
4848
var fromYear = settings.minYear;
4949
var toYear = settings.maxYear;
50-
var selectedData = _(filters).map('dataWithinFilter');
50+
var selectedData = underscore(filters).map('dataWithinFilter');
5151
selectedData.reverse();
52-
var currentMinYear = _.min(_([filters[filters.length -1]]).map('from'));
53-
var currentMaxYear = _.max(_([filters[filters.length -1]]).map('to'));
52+
var currentMinYear = underscore.min(underscore([filters[filters.length -1]]).map('from'));
53+
var currentMaxYear = underscore.max(underscore([filters[filters.length -1]]).map('to'));
5454
var noTick = false;
5555
if ((currentMaxYear === currentMinYear) && fromYear ||
5656
(currentMaxYear === currentMinYear) && toYear) {

‎Dashboard/Plugins/TestMiniVizCategory.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
$container.append($vis);
1515
}
1616

17-
$vis.html(category + ': ' + _(categoryValues).join(', ') + '<br />Highlighted: ' + selectedData.length);
17+
$vis.html(category + ': ' + underscore(categoryValues).join(', ') + '<br />Highlighted: ' + selectedData.length);
1818
};
1919

2020
TestMiniViz.finalize = function(){

‎Dashboard/Plugins/TestMiniVizList.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
var items = "";
1616
var previews = "";
17-
_.forEach(selectedData, function(item, i){
17+
underscore.forEach(selectedData, function(item, i){
1818
var src = 'media/no-img.png';
1919
if (item.data.previewImage)
2020
src = item.data.previewImage;

‎Dashboard/Timeline/timeline.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ function Timeline( root, visTemplate ){
135135
var brushExtent = [x.invert(0), x.invert(width)];
136136
TIMEVIS.Evt.filterListPerTime(brushExtent[0].getFullYear(),brushExtent[1].getFullYear());
137137
};
138-
var zoomingDebounce = _.debounce(TIMEVIS.Evt.zoomingEndDelay, 500);
138+
var zoomingDebounce = underscore.debounce(TIMEVIS.Evt.zoomingEndDelay, 500);
139139

140140

141141

‎Dashboard/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<script type="text/javascript" src="libs/jquery-dropdown/jquery.dropdown.min.js"></script>
1515
<script type="text/javascript" src="libs/jquery-ui/jquery-ui.min.js"></script>
1616
<script type="text/javascript" src="localStorageAdapter.js"></script>
17-
<!--<script type="text/javascript" src="libs/lodash.js"></script>-->
18-
<script type="text/javascript" src="uRank/modules/tagcloud/landscape/js/libs/underscore.js"></script>
17+
<script type="text/javascript" src="libs/underscore-compatibility.js"></script>
18+
<!--<script type="text/javascript" src="uRank/modules/tagcloud/landscape/js/libs/underscore.js"></script>-->
1919
<link rel="stylesheet" type="text/css" href="libs/jquery-ui/jquery-ui.css" />
2020
<link rel="stylesheet" type="text/css" href="libs/jquery-dropdown/jquery.dropdown.min.css" />
2121
<link rel="stylesheet" type="text/css" href="libs/leaflet/leaflet.css" />

‎Dashboard/js/filterhandler.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ var FilterHandler = {
3232

3333
initializeData: function (orignalData, mapping) {;
3434
var selectedColorDimension;
35-
var colorMapping = _.filter(mapping, { 'visualattribute': 'color' });
35+
var colorMapping = underscore.filter(mapping, { 'visualattribute': 'color' });
3636
if (colorMapping.length > 0)
3737
selectedColorDimension = colorMapping[0].facet;
3838

@@ -52,7 +52,7 @@ var FilterHandler = {
5252
if (timeSettings.maxYear < currentYear)
5353
timeSettings.maxYear = currentYear;
5454
}
55-
if (!_.includes(categorySettings.dimensionValues, orignalData[i].facets[selectedColorDimension])) {
55+
if (!underscore.includes(categorySettings.dimensionValues, orignalData[i].facets[selectedColorDimension])) {
5656
categorySettings.dimensionValues.push(orignalData[i].facets[selectedColorDimension]);
5757
}
5858
}
@@ -133,13 +133,13 @@ var FilterHandler = {
133133
},
134134

135135
setActiveFilters: function(){
136-
var filterTypes = _(FilterHandler.filters).map(function(f){
136+
var filterTypes = underscore(FilterHandler.filters).map(function(f){
137137
return f.type;
138138
});
139139
if (FilterHandler.currentFilter != null)
140140
filterTypes.push(FilterHandler.currentFilter.type);
141141

142-
FilterHandler.activeFiltersNames = _(filterTypes).uniq();
142+
FilterHandler.activeFiltersNames = underscore(filterTypes).uniq();
143143
//console.log('filters set: ');
144144
//console.log(FilterHandler.activeFiltersNames);
145145
},
@@ -178,7 +178,7 @@ var FilterHandler = {
178178

179179
getAllFilters: function (type) {
180180
var filters = [];
181-
filters = _(FilterHandler.filters).filter({ 'type': type });
181+
filters = underscore(FilterHandler.filters).filter({ 'type': type });
182182
if (FilterHandler.currentFilter != null && FilterHandler.currentFilter.type == type)
183183
filters.push(FilterHandler.currentFilter);
184184

@@ -255,7 +255,7 @@ var FilterHandler = {
255255

256256
if (selectedWithAddingKey) {
257257
// look if already selected before.
258-
var existingItemIndex = _.findIndex(FilterHandler.listFilter.itemsClicked, function (d) { return d.data.id == dataItemSelected.id; });
258+
var existingItemIndex = underscore.findIndex(FilterHandler.listFilter.itemsClicked, function (d) { return d.data.id == dataItemSelected.id; });
259259
if (existingItemIndex >= 0) {
260260
FilterHandler.listFilter.itemsClicked.splice(existingItemIndex, 1);
261261
} else {
@@ -274,7 +274,7 @@ var FilterHandler = {
274274
FilterHandler.listFilter.itemsClicked = [{ data: dataItemSelected, selectionMode: "single" }];
275275
}
276276

277-
FilterHandler.listFilter.dataWithinFilter = _.map(FilterHandler.listFilter.itemsClicked, function (d) { return d.data; });
277+
FilterHandler.listFilter.dataWithinFilter = underscore.map(FilterHandler.listFilter.itemsClicked, function (d) { return d.data; });
278278
FilterHandler.refreshListFilter();
279279
FilterHandler.scrollToShowFilter('list');
280280
},
@@ -358,7 +358,7 @@ var FilterHandler = {
358358
return;
359359

360360
var type = FilterHandler.currentFilter.type;
361-
if (!_(FilterHandler.filters).some(function(item){ return item.type == type; })){
361+
if (!underscore(FilterHandler.filters).some(function(item){ return item.type == type; })){
362362
FilterHandler.clearType(type);
363363
} else {
364364
FilterHandler.currentFilter = null;
@@ -390,7 +390,7 @@ var FilterHandler = {
390390
FilterHandler.filterVisualisations[type] = null;
391391
FilterHandler.getFilterArea(type).find('.filter-keep, .filter-remove').removeClass('active');
392392

393-
FilterHandler.filters = _(FilterHandler.filters).filter(function(item){ return item.type != type; });
393+
FilterHandler.filters = underscore(FilterHandler.filters).filter(function(item){ return item.type != type; });
394394
if (FilterHandler.currentFilter != null && FilterHandler.currentFilter.type == type){
395395
FilterHandler.currentFilter = null;
396396
}
@@ -426,7 +426,7 @@ var FilterHandler = {
426426
}
427427

428428
// remove all previous filters of this type, as there is only one filter (and one brush) for each type.
429-
FilterHandler.filters = _(FilterHandler.filters).filter(function(filter){ return filter.type != FilterHandler.currentFilter.type; });
429+
FilterHandler.filters = underscore(FilterHandler.filters).filter(function(filter){ return filter.type != FilterHandler.currentFilter.type; });
430430
FilterHandler.filters.push(FilterHandler.currentFilter);
431431
FilterHandler.currentFilter = null;
432432
FilterHandler.ext.filterData(FilterHandler.mergeFilteredDataIds());
@@ -499,12 +499,12 @@ var FilterHandler = {
499499
if (FilterHandler.currentFilter != null)
500500
filters.push(FilterHandler.currentFilter);
501501

502-
var filterGroups = _.groupBy(filters, function (f) { return f.type; })
502+
var filterGroups = underscore.groupBy(filters, function (f) { return f.type; })
503503
var filterGroupsDataIds = [];
504-
_.forEach(filterGroups, function (filterGroupList, type) {
504+
underscore.forEach(filterGroups, function (filterGroupList, type) {
505505
var filterGroupDataIds = [];
506506
for (var i = 0; i < filterGroupList.length; i++) {
507-
filterGroupDataIds = _.union(filterGroupDataIds, _.map(filterGroupList[i].dataWithinFilter, mapId));
507+
filterGroupDataIds = underscore.union(filterGroupDataIds, underscore.map(filterGroupList[i].dataWithinFilter, mapId));
508508
}
509509
filterGroupsDataIds.push(filterGroupDataIds);
510510
});
@@ -513,7 +513,7 @@ var FilterHandler = {
513513
dataToHighlightIds = filterGroupsDataIds[0];
514514
for (var i = 1; i < filterGroupsDataIds.length; i++) {
515515
var currentList = filterGroupsDataIds[i];
516-
dataToHighlightIds = _.filter(dataToHighlightIds, function (id) { return _.contains(currentList, id); });
516+
dataToHighlightIds = underscore.filter(dataToHighlightIds, function (id) { return underscore.some(currentList, id); });
517517
}
518518
}
519519

@@ -533,11 +533,11 @@ var FilterHandler = {
533533
if (FilterHandler.listFilter.itemsClicked.length == 1 && FilterHandler.listFilter.itemsClicked[0].selectionMode == "single")
534534
return [FilterHandler.listFilter.itemsClicked[0].data.id];
535535

536-
var idsToRemove = _.map(_.filter(FilterHandler.listFilter.itemsClicked, function (item) { return item.selectionMode == "remove"; }), function (d) { return d.data.id; });
537-
var idsToAdd = _.map(_.filter(FilterHandler.listFilter.itemsClicked, function (item) { return item.selectionMode == "single" || item.selectionMode == "add"; }), function (d) { return d.data.id; });
536+
var idsToRemove = underscore.map(underscore.filter(FilterHandler.listFilter.itemsClicked, function (item) { return item.selectionMode == "remove"; }), function (d) { return d.data.id; });
537+
var idsToAdd = underscore.map(underscore.filter(FilterHandler.listFilter.itemsClicked, function (item) { return item.selectionMode == "single" || item.selectionMode == "add"; }), function (d) { return d.data.id; });
538538

539-
dataToHighlightIds = _.difference(dataToHighlightIds, idsToRemove);
540-
dataToHighlightIds = _.union(dataToHighlightIds, idsToAdd);
539+
dataToHighlightIds = underscore.difference(dataToHighlightIds, idsToRemove);
540+
dataToHighlightIds = underscore.union(dataToHighlightIds, idsToAdd);
541541

542542
}
543543

‎Dashboard/js/logginghandler.js

Lines changed: 79 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ var LoggingHandler = {
8686
actVis : LoggingHandler.visExt.getSelectedChartName(),
8787
actFltrs : FilterHandler.activeFiltersNames,
8888
browser: {name: LoggingHandler.browser.name, vers: LoggingHandler.browser.majorVersion},
89-
v:'2' // Loggin v2 changed mouseoverTimes, and added Filter hints.
89+
// Loggin v2 changed mouseoverTimes, and added Filter hints.
90+
// Loggin v3 changed to parent-logging
91+
v:'3'
9092
};
9193
// Enhancing the object passed
9294
$.extend(logDefaults, logobject);
@@ -137,24 +139,94 @@ var LoggingHandler = {
137139
},
138140

139141
sendBuffer: function(){
140-
api2.moduleStatisticsCollected(LoggingHandler.origin, {logs: LoggingHandler.buffer}, globals.queryID);
142+
//api2.moduleStatisticsCollected(LoggingHandler.origin, {logs: LoggingHandler.buffer}, globals.queryID);
143+
LoggingHandler.visExt.sendMsgAll({event:'eexcess.log.moduleStatisticsCollected', data: {
144+
origin: LoggingHandler.origin,
145+
content: { logs: LoggingHandler.buffer },
146+
queryID: globals.queryID
147+
}});
141148
//console.debug('SendBuffer');
142149
LoggingHandler.buffer = [];
143150
},
144151

145152
directLog: function(logobject){
146153
if (logobject.action == "Item opened"){
147-
api2.itemOpened(LoggingHandler.origin, { id: logobject.itemid }, globals.queryID);
154+
//api2.itemOpened(LoggingHandler.origin, { id: logobject.itemid }, globals.queryID);
155+
LoggingHandler.visExt.sendMsgAll({event:'eexcess.log.itemOpened', data: {
156+
origin: LoggingHandler.origin,
157+
content: {
158+
documentBadge: { id: logobject.itemid }
159+
},
160+
queryID: globals.queryID
161+
}});
148162
} else if (logobject.action == "Link item clicked"){
149-
api2.itemCitedAsHyperlink(LoggingHandler.origin, { id: logobject.itemid }, globals.queryID);
163+
//api2.itemCitedAsHyperlink(LoggingHandler.origin, { id: logobject.itemid }, globals.queryID);
164+
LoggingHandler.visExt.sendMsgAll({event:'eexcess.log.itemCitedAsHyperlink', data: {
165+
origin: LoggingHandler.origin,
166+
content: {
167+
documentBadge: { id: logobject.itemid }
168+
},
169+
queryID: globals.queryID
170+
}});
150171
} else if (logobject.action == 'Link item image clicked'){
151-
api2.itemCitedAsImage(LoggingHandler.origin, { id: logobject.itemid }, globals.queryID);
172+
//api2.itemCitedAsImage(LoggingHandler.origin, { id: logobject.itemid }, globals.queryID);
173+
LoggingHandler.visExt.sendMsgAll({event:'eexcess.log.itemCitedAsImage', data: {
174+
origin: LoggingHandler.origin,
175+
content: {
176+
documentBadge: { id: logobject.itemid }
177+
},
178+
queryID: globals.queryID
179+
}});
152180
} else if (logobject.action == 'Dashboard opened'){
153-
api2.moduleOpened(LoggingHandler.origin, "RecDashboard");
181+
//api2.moduleOpened(LoggingHandler.origin, "RecDashboard");
182+
LoggingHandler.visExt.sendMsgAll({event:'eexcess.log.moduleOpened', data: {
183+
origin: LoggingHandler.origin,
184+
content: {
185+
name: "RecDashboard"
186+
}
187+
}});
154188
} else if (logobject.action == 'Window is closing'){
155-
api2.moduleClosed(LoggingHandler.origin, 'RecDashboard', logobject.duration);
189+
//api2.moduleClosed(LoggingHandler.origin, 'RecDashboard', logobject.duration);
190+
LoggingHandler.visExt.sendMsgAll({event:'eexcess.log.moduleClosed', data: {
191+
origin: LoggingHandler.origin,
192+
content: {
193+
name: 'RecDashboard',
194+
duration: logobject.duration
195+
},
196+
queryID: globals.queryID
197+
}});
156198
}
157199
}
200+
201+
/*
202+
case 'eexcess.log.moduleOpened':
203+
api.sendLog(api.logInteractionType.moduleOpened, e.data.data);
204+
break;
205+
case 'eexcess.log.moduleClosed':
206+
api.sendLog(api.logInteractionType.moduleClosed, e.data.data);
207+
break;
208+
case 'eexcess.log.moduleStatisticsCollected':
209+
api.sendLog(api.logInteractionType.moduleStatisticsCollected, e.data.data);
210+
break;
211+
case 'eexcess.log.itemOpened':
212+
api.sendLog(api.logInteractionType.itemOpened, e.data.data);
213+
break;
214+
case 'eexcess.log.itemClosed':
215+
api.sendLog(api.logInteractionType.itemClosed, e.data.data);
216+
break;
217+
case 'eexcess.log.itemCitedAsImage':
218+
api.sendLog(api.logInteractionType.itemCitedAsImage, e.data.data);
219+
break;
220+
case 'eexcess.log.itemCitedAsText':
221+
api.sendLog(api.logInteractionType.itemCitedAsText, e.data.data);
222+
break;
223+
case 'eexcess.log.itemCitedAsHyperlink':
224+
api.sendLog(api.logInteractionType.itemCitedAsHyperlink, e.data.data);
225+
break;
226+
case 'eexcess.log.itemRated':
227+
api.sendLog(api.logInteractionType.itemRated, e.data.data);
228+
break;
229+
*/
158230
};
159231

160232

0 commit comments

Comments
 (0)