Skip to content
GitLab
Commit 53e8437d authored by Abbey Joy Roelofs's avatar Abbey Joy Roelofs
Browse files

Removing .idea files, changing to OBJECTID_1, adding response css file

parent a8329a1c
Hide whitespace changes
Inline Side-by-side
.idea/JavaScriptWorkingGroup.iml deleted 100644 → 0
View file @ a8329a1c
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
.idea/codeStyles/codeStyleConfig.xml deleted 100644 → 0
View file @ a8329a1c
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
</state>
</component>
\ No newline at end of file
.idea/misc.xml deleted 100644 → 0
View file @ a8329a1c
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
</project>
\ No newline at end of file
.idea/modules.xml deleted 100644 → 0
View file @ a8329a1c
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/JavaScriptWorkingGroup.iml" filepath="$PROJECT_DIR$/.idea/JavaScriptWorkingGroup.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/workspace.xml deleted 100644 → 0
View file @ a8329a1c
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="48d96818-eb35-42f7-b915-7526a88d4402" name="Default Changelist" comment="" />
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FUSProjectUsageTrigger">
<session id="781527946">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="1" />
<entry key="project.open.time.2" value="1" />
<entry key="project.opened" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="css" value="1" />
<entry key="html" value="9" />
<entry key="js" value="2" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="1" />
<entry key="HTML" value="9" />
<entry key="JavaScript" value="2" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="14" />
<entry key="html" value="1279" />
<entry key="js" value="627" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="14" />
<entry key="HTML" value="1279" />
<entry key="JavaScript" value="627" />
</counts>
</usages-collector>
</session>
</component>
<component name="FileEditorManager">
<leaf>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/composite_views.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-7">
<caret line="149" column="29" selection-start-line="149" selection-start-column="29" selection-end-line="149" selection-end-column="29" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test2.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="146" selection-start-line="146" selection-end-line="146" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test3.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="162" selection-start-line="162" selection-end-line="184" selection-end-column="19" />
<folding>
<element signature="e#2166#2237#0" />
<element signature="e#2306#2330#0" />
<element signature="e#2433#2496#0" />
<element signature="e#2508#2533#0" />
<element signature="e#2637#2774#0" />
<element signature="e#2922#3084#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sharedAir.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sharedAir.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="435">
<caret line="29" column="7" lean-forward="true" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="7" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/sharedAir.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="14" lean-forward="true" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
<folding>
<element signature="e#941#965#0" />
<element signature="e#1072#1141#0" />
<element signature="e#1155#1180#0" />
<element signature="e#1288#1439#0" />
<element signature="e#1591#1767#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/scratch.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="16" lean-forward="true" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="16" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/sandbox_example.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="18" column="5" lean-forward="true" selection-start-line="13" selection-start-column="4" selection-end-line="18" selection-end-column="5" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-line="205" />
<folding>
<element signature="e#2166#2237#0" />
<element signature="e#2306#2330#0" />
<element signature="e#2433#2496#0" />
<element signature="e#2508#2533#0" />
<element signature="e#2637#2774#0" />
<element signature="e#2922#3084#0" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="CSS File" />
<option value="HTML File" />
<option value="JavaScript File" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>mainView</find>
<find>highlight</find>
</findStrings>
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/composite_views.html" />
<option value="$PROJECT_DIR$/composite.html" />
<option value="$PROJECT_DIR$/test.html" />
<option value="$PROJECT_DIR$/test2.html" />
<option value="$PROJECT_DIR$/test3.html" />
<option value="$PROJECT_DIR$/sandbox_example.html" />
<option value="$PROJECT_DIR$/sharedAir.js" />
<option value="$PROJECT_DIR$/sharedAir.html" />
<option value="$PROJECT_DIR$/sharedAir.css" />
<option value="$PROJECT_DIR$/scratch.js" />
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="9" />
<option name="y" value="52" />
<option name="width" value="1416" />
<option name="height" value="1010" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="JavaScriptWorkingGroup" type="b2602c69:ProjectViewProjectNode" />
<item name="JavaScriptWorkingGroup" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="list.type.of.created.stylesheet" value="CSS" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="preferences.sourceCode.HTML" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="48d96818-eb35-42f7-b915-7526a88d4402" name="Default Changelist" comment="" />
<created>1584563621435</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1584563621435</updated>
<workItem from="1584563623596" duration="10821000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="10821000" />
</component>
<component name="ToolWindowManager">
<frame x="9" y="52" width="1416" height="1010" extended-state="0" />
<layout>
<window_info id="Favorites" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29677418" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Docker" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
<window_info anchor="bottom" id="Terminal" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/composite.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="145" selection-start-line="145" selection-end-line="145" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="145" column="12" selection-start-line="145" selection-start-column="12" selection-end-line="145" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test2.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="146" selection-start-line="146" selection-end-line="146" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret selection-end-line="205" />
<folding>
<element signature="e#2166#2237#0" />
<element signature="e#2306#2330#0" />
<element signature="e#2433#2496#0" />
<element signature="e#2508#2533#0" />
<element signature="e#2637#2774#0" />
<element signature="e#2922#3084#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test3.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="162" selection-start-line="162" selection-end-line="184" selection-end-column="19" />
<folding>
<element signature="e#2166#2237#0" />
<element signature="e#2306#2330#0" />
<element signature="e#2433#2496#0" />
<element signature="e#2508#2533#0" />
<element signature="e#2637#2774#0" />
<element signature="e#2922#3084#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/composite_views.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-7">
<caret line="149" column="29" selection-start-line="149" selection-start-column="29" selection-end-line="149" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sandbox_example.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="18" column="5" lean-forward="true" selection-start-line="13" selection-start-column="4" selection-end-line="18" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scratch.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="16" lean-forward="true" selection-start-line="10" selection-start-column="16" selection-end-line="10" selection-end-column="16" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sharedAir.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sharedAir.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="435">
<caret line="29" column="7" lean-forward="true" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/sharedAir.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="14" lean-forward="true" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
<folding>
<element signature="e#941#965#0" />
<element signature="e#1072#1141#0" />
<element signature="e#1155#1180#0" />
<element signature="e#1288#1439#0" />
<element signature="e#1591#1767#0" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
sharedAir.js
View file @ 53e8437d
......@@ -221,19 +221,18 @@ require([
// and display its attributes in the popup
// if no features are returned, then close the popup
var id = null;
if (response.results.length) {
var feature = response.results.filter(function(result) {
return result.graphic.layer === layer;
})[0].graphic;
console.log(feature);
feature.popupTemplate = layer.popupTemplate;
id = feature.attributes.OBJECTID;
id = feature.attributes.OBJECTID_1;
//Caitlin: Does hovering over a feature return it's ObjectID?
console.log(feature.attributes.OBJECTID); //This is coming up as undefined
console.log(feature.attributes.OBJECTID_1); //This is coming up as undefined
highlight = layerView.highlight([id]);
var selectionId = mainView.popup.selectedFeature
? mainView.popup.selectedFeature.attributes.OBJECTID
? mainView.popup.selectedFeature.attributes.OBJECTID_1
: null;
if (highlight && id !== selectionId) {
......@@ -316,4 +315,4 @@ require([
});
}
});
\ No newline at end of file
});
sharedAir_responsive.css 0 → 100644
View file @ 53e8437d
html,
body {
padding: 0px;
margin: 0px;
height: 100%;
width: 100%;
}
.action {
color: blue;
cursor: pointer;
text-decoration: underline;
}
#anonymous-view {
display: block;
position: absolute;
left: 50%;
transform: translate(-50%, 0);
padding: 10px;
margin: 0px;
height: 100%;
width: 100%;
text-align: center;
}
#authenticated-view {
display: none;
padding: 0px;
margin: 0px;
height: 100%;
width: 100%;
}
#title-view {
position: absolute;
padding: 10px;
left: 50%;
transform: translate(-50%, 0);
background-color: white;
opacity: 0.6;
z-index: 2;
}
#username {
font-weight: bold;
}
#mainViewDiv {
position: relative;
z-index: 1;
padding: 0px;
margin: 0px;
height: 100%;
width: 100%;
}
#akViewDiv {
display: none;
}
#hiViewDiv {
display: none;
}
@media only screen and (min-width: 600px) {
#akViewDiv {
padding: 0;
margin: 0;
height: 255px;
width: 300px;
background-color: rgba(255,255,255,0.8)
}
#hiViewDiv {
padding: 0;
margin: 0;
height: 135px;
width: 200px;
background-color: rgba(255,255,255,0.8)
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment