Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove internal pub/sub #52

Merged
merged 1 commit into from
Aug 17, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/js/constants.js
Original file line number Diff line number Diff line change
@@ -25,9 +25,6 @@ export const defaultOptions = {
default_items: true
};

// internal pub/sub
export const events = utils.events();

export const defaultItems = [
{
text: 'Zoom In',
@@ -76,4 +73,4 @@ export const defaultItems = [
view.setZoom(+view.getZoom() - 1);
}
}
];
];
6 changes: 1 addition & 5 deletions src/js/html.js
Original file line number Diff line number Diff line change
@@ -123,11 +123,7 @@ export class Html {
data: item.data || null
};

// publish to add listener
constants.events.publish(constants.eventType.ADD_MENU_ENTRY, {
index: index,
element: element
});
$internal.setItemListener(element, index);

return element;
}
7 changes: 0 additions & 7 deletions src/js/internal.js
Original file line number Diff line number Diff line change
@@ -30,9 +30,7 @@ export class Internal {

init(map) {
this.map = map;
// subscribe
this.setListeners();
// publish
this.Base.constructor.Html.createMenu();
this.lineHeight = this.getItemsLength() > 0 ?
this.Base.container.offsetHeight / this.getItemsLength() :
@@ -158,11 +156,6 @@ export class Internal {
}, false);
};
canvas.addEventListener('contextmenu', menu, false);

// subscribe to later menu entries
constants.events.subscribe(constants.eventType.ADD_MENU_ENTRY, obj => {
this_.setItemListener(obj.element, obj.index);
});
}

setItemListener(li, index) {
31 changes: 0 additions & 31 deletions src/js/utils.js
Original file line number Diff line number Diff line change
@@ -215,36 +215,5 @@ export default {
}
throw message; // Fallback
}
},
events() {
let topics = {};
const hOP = topics.hasOwnProperty;

return {
subscribe: function(topic, listener) {
// Create the topic's object if not yet created
if(!hOP.call(topics, topic)) topics[topic] = [];

// Add the listener to queue
let index = topics[topic].push(listener) -1;

// Provide handle back for removal of topic
return {
remove: function() {
delete topics[topic][index];
}
};
},
publish: function(topic, info) {
// If the topic doesn't exist, or there's no listeners
// in queue, just leave
if(!hOP.call(topics, topic)) return;

// Cycle through topics queue, fire!
topics[topic].forEach(item => {
item(info !== undefined ? info : {});
});
}
};
}
};