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.

Sign up for GitHub

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

Tool tips #13

Open
wants to merge 4 commits into
base: ToolTips
Choose a base branch
from
Open

Tool tips #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92bcbf3
Corrected cases sensitive typos.
fabanc Mar 9, 2018
04f805c
Temp fix.
fabanc Mar 9, 2018
d186dd7
Renaming file with correct name and case.
fabanc Mar 9, 2018
ab5f9b2
Renaming the file with the correct name and case.
fabanc Mar 9, 2018
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
32 changes: 16 additions & 16 deletions js/GeoCoding/GeoCodingHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "esri/kernel",
"dijit/_WidgetBase", "dijit/_TemplatedMixin",
"dojo/on",
define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "esri/kernel",
"dijit/_WidgetBase", "dijit/_TemplatedMixin",
"dojo/on",
"esri/tasks/locator", "esri/geometry/webMercatorUtils",
"dojo/query",
"dojo/text!application/GeoCoding/templates/GeoCodingHeader.html",
"dojo/dom", "dojo/dom-class", "dojo/dom-attr", "dojo/dom-style", "dojo/dom-construct",
"dojo/query",
"dojo/text!application/GeoCoding/Templates/GeoCodingHeader.html",
"dojo/dom", "dojo/dom-class", "dojo/dom-attr", "dojo/dom-style", "dojo/dom-construct",
"dojo/parser", "dojo/ready",
"dojo/i18n!application/nls/PopupInfo",
"application/GeoCoding/GeoAddressTooltip",
"dojox/gfx"

], function (
Evented, declare, lang, has, esriNS,
_WidgetBase, _TemplatedMixin,
on,
_WidgetBase, _TemplatedMixin,
on,
Locator, webMercatorUtils,
query,
GeoCodingHeaderTemplate,
dom, domClass, domAttr, domStyle, domConstruct,
GeoCodingHeaderTemplate,
dom, domClass, domAttr, domStyle, domConstruct,
parser, ready,
i18n,
GeoAddressTooltip,
Expand All @@ -34,7 +34,7 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "es

options: {
map: null,
toolbar: null,
toolbar: null,
header: 'pageHeader_geoCoding',
id: 'geoCodingHeadrId',
popupInfo: null,
Expand Down Expand Up @@ -88,7 +88,7 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "es
this.loaded = true;

this.addressTooltipButton = query('#'+this.popupHeaderId+' .popupInfoButton.tooltips')[0];

if(this.addressTooltipButton) {
on(this.addressTooltipButton, 'click', lang.hitch(this, this.switchTooltips));
}
Expand All @@ -100,7 +100,7 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "es
buttons.forEach(lang.hitch(this, function (btn) {
on(btn,'keydown', lang.hitch(this, function(ev) {
switch(ev.keyCode) {
case 13:
case 13:
btn.click();
ev.stopPropagation();
ev.preventDefault();
Expand Down Expand Up @@ -140,7 +140,7 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "es

this.geoAddressTooltip = new GeoAddressTooltip({
map: this.map,
toolbar: this.toolbar,
toolbar: this.toolbar,
addressTooltipButton: this.addressTooltipButton,
iconColor: this.iconColor,
themeColor: this.themeColor,
Expand Down Expand Up @@ -221,7 +221,7 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "es
},

clearSuperNavigator: function() {
if(this.superNavigator)
if(this.superNavigator)
this.superNavigator.clearZone();
},

Expand Down
0 js/GeoCoding/Templates/geoCodingHeader.html → js/GeoCoding/Templates/GeoCodingHeader.html
View file
Open in desktop
File renamed without changes.
30 changes: 15 additions & 15 deletions js/PopupInfo/PopupInfoHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "esri/kernel",
define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "esri/kernel",
"dijit/_WidgetBase", "dijit/_TemplatedMixin", "dijit/registry",
"dojo/on",
"dojo/Deferred", "dojo/query",
"dojo/text!application/PopupInfo/templates/PopupInfoHeader.html",
"dojo/dom", "dojo/dom-class", "dojo/dom-attr", "dojo/dom-style", "dojo/dom-construct", "dojo/_base/event",
"dojo/on",
"dojo/Deferred", "dojo/query",
"dojo/text!application/PopupInfo/Templates/PopupInfoHeader.html",
"dojo/dom", "dojo/dom-class", "dojo/dom-attr", "dojo/dom-style", "dojo/dom-construct", "dojo/_base/event",
"dojo/parser", "dojo/ready",
"dijit/layout/ContentPane",
"dojo/string",
"dijit/layout/ContentPane",
"dojo/string",
"dojo/i18n!application/nls/PopupInfo",
"esri/domUtils",
"esri/dijit/Popup",
"dojo/NodeList-dom", "dojo/NodeList-traverse"

], function (
Evented, declare, lang, has, esriNS,
_WidgetBase, _TemplatedMixin, registry,
on,
on,
Deferred, query,
PopupInfoHeaderTemplate,
dom, domClass, domAttr, domStyle, domConstruct, event,
PopupInfoHeaderTemplate,
dom, domClass, domAttr, domStyle, domConstruct, event,
parser, ready,
ContentPane,
string,
Expand All @@ -37,7 +37,7 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "es

options: {
map: null,
toolbar: null,
toolbar: null,
header: 'pageHeader_infoPanel',
id: 'popupInfoHeadrId',
popupInfo: null,
Expand Down Expand Up @@ -95,7 +95,7 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "es
buttons.forEach(lang.hitch(this, function (btn) {
on(btn,'keydown', lang.hitch(this, function(ev) {
switch(ev.keyCode) {
case 13:
case 13:
btn.click();
ev.stopPropagation();
ev.preventDefault();
Expand Down Expand Up @@ -169,7 +169,7 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "es
if(!this.pagerIsVisible()) return;
var _prev = query('.popupInfoButton.prev')[0];
_prev.focus();
_prev.click();
_prev.click();
},

ToNext:function() {
Expand Down Expand Up @@ -269,7 +269,7 @@ define(["dojo/Evented", "dojo/_base/declare", "dojo/_base/lang", "dojo/has", "es
},

clearSuperNavigator: function() {
if(this.superNavigator)
if(this.superNavigator)
this.superNavigator.clearZone();
},

Expand Down