Skip to content

Commit

Permalink
Fix package.json file. Fixed focus and blur actions order
Browse files Browse the repository at this point in the history
  • Loading branch information
Bene committed Feb 2, 2017
1 parent 71f51d1 commit 8370b40
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 11 deletions.
7 changes: 3 additions & 4 deletions assets/scripts/dist/bb.gmap.js
Original file line number Diff line number Diff line change
Expand Up @@ -2886,15 +2886,13 @@ BB.gmap.line.prototype.click = function( event )
// Scope
var that = this.bbobject;
var _data = that.data();
that.focus();

if (typeof _data.onclick == 'function') {
_data.onclick( that, event );
} else if (typeof _data.onclick == 'string' && typeof window[ _data.onclick ] == 'function') {
window[ _data.onclick ]( that, event );
}

that.focus();

};


Expand All @@ -2908,12 +2906,13 @@ BB.gmap.line.prototype.focus = function()
if (this.__DELETED) {
return false;
}
this.controller().set_focus( this );

var styles = this.get_data('styles');

if (typeof styles.focused == 'object') {
this.set_styles( styles.focused );
}
this.controller().set_focus( this );

// Markers when selected AND editable
if (this.data('editable')) {
Expand Down
4 changes: 2 additions & 2 deletions assets/scripts/dist/min/gmap.min.js

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions assets/scripts/src/Objects/bb.gmap.line.js
Original file line number Diff line number Diff line change
Expand Up @@ -569,15 +569,13 @@ BB.gmap.line.prototype.click = function( event )
// Scope
var that = this.bbobject;
var _data = that.data();
that.focus();

if (typeof _data.onclick == 'function') {
_data.onclick( that, event );
} else if (typeof _data.onclick == 'string' && typeof window[ _data.onclick ] == 'function') {
window[ _data.onclick ]( that, event );
}

that.focus();

};


Expand All @@ -591,12 +589,13 @@ BB.gmap.line.prototype.focus = function()
if (this.__DELETED) {
return false;
}
this.controller().set_focus( this );

var styles = this.get_data('styles');

if (typeof styles.focused == 'object') {
this.set_styles( styles.focused );
}
this.controller().set_focus( this );

// Markers when selected AND editable
if (this.data('editable')) {
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
},
"description": "- Description\r - Objects / Classes\r - BB.base\r - BB.data\r - BB.gmap.controller\r - BB.gmap.infobox\r - BB.gmap.obj\r - BB.gmap.line\r - BB.gmap.polygon\r - BB.gmap.marker\r - Examples [beneroch.com/gmap](http://beneroch.com/gmap \"Bene gmap\")\r - Map initialization\r - Add place\r - Marker\r - Line\r - Polygon\r - Add place by address\r - Change styles\r - Add callback functions for events\r - click\r - mouseover / mouseout",
"main": "Gruntfile.js",
"devDependencies": {},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
Expand Down

0 comments on commit 8370b40

Please sign in to comment.