JS code restructured
This commit is contained in:
parent
16f33037b7
commit
a2acd1a4cd
@ -2,9 +2,8 @@
|
|||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="aae153d8-808f-4371-b0e9-9ee7ff904cab" name="Default" comment="">
|
<list default="true" id="aae153d8-808f-4371-b0e9-9ee7ff904cab" name="Default" comment="">
|
||||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/js/data/Actions.js" />
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/data/Actions.js" afterPath="$PROJECT_DIR$/js/data/Actions.js" />
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/plugin.contactimporter.js" afterPath="$PROJECT_DIR$/js/plugin.contactimporter.js" />
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/dialogs/ImportPanel.js" afterPath="$PROJECT_DIR$/js/dialogs/ImportPanel.js" />
|
||||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/ui/ContextMenu.js" afterPath="$PROJECT_DIR$/js/ui/ContextMenu.js" />
|
|
||||||
</list>
|
</list>
|
||||||
<ignored path="contactimporter.iws" />
|
<ignored path="contactimporter.iws" />
|
||||||
<ignored path=".idea/workspace.xml" />
|
<ignored path=".idea/workspace.xml" />
|
||||||
@ -25,10 +24,10 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="FileEditorManager">
|
<component name="FileEditorManager">
|
||||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||||
<file leaf-file-name="ContextMenu.js" pinned="false" current-in-tab="true">
|
<file leaf-file-name="ContextMenu.js" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/js/ui/ContextMenu.js">
|
<entry file="file://$PROJECT_DIR$/js/ui/ContextMenu.js">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="1644">
|
<state relative-caret-position="1665">
|
||||||
<caret line="111" column="5" selection-start-line="111" selection-start-column="5" selection-end-line="111" selection-end-column="5" />
|
<caret line="111" column="5" selection-start-line="111" selection-start-column="5" selection-end-line="111" selection-end-column="5" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
@ -38,7 +37,7 @@
|
|||||||
<file leaf-file-name="plugin.contactimporter.js" pinned="false" current-in-tab="false">
|
<file leaf-file-name="plugin.contactimporter.js" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/js/plugin.contactimporter.js">
|
<entry file="file://$PROJECT_DIR$/js/plugin.contactimporter.js">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="1245">
|
<state relative-caret-position="-231">
|
||||||
<caret line="83" column="9" selection-start-line="83" selection-start-column="9" selection-end-line="83" selection-end-column="9" />
|
<caret line="83" column="9" selection-start-line="83" selection-start-column="9" selection-end-line="83" selection-end-column="9" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
@ -48,8 +47,8 @@
|
|||||||
<file leaf-file-name="Actions.js" pinned="false" current-in-tab="false">
|
<file leaf-file-name="Actions.js" pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/js/data/Actions.js">
|
<entry file="file://$PROJECT_DIR$/js/data/Actions.js">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="1030">
|
<state relative-caret-position="255">
|
||||||
<caret line="223" column="5" selection-start-line="111" selection-start-column="0" selection-end-line="223" selection-end-column="5" />
|
<caret line="17" column="26" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="26" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
@ -68,6 +67,42 @@
|
|||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
|
<file leaf-file-name="ImportPanel.js" pinned="false" current-in-tab="true">
|
||||||
|
<entry file="file://$PROJECT_DIR$/js/dialogs/ImportPanel.js">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="497">
|
||||||
|
<caret line="335" column="30" selection-start-line="335" selection-start-column="30" selection-end-line="335" selection-end-column="30" />
|
||||||
|
<folding>
|
||||||
|
<element signature="n#!!doc" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file leaf-file-name="ImportContentPanel.js" pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/js/dialogs/ImportContentPanel.js">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="474">
|
||||||
|
<caret line="44" column="20" selection-start-line="44" selection-start-column="20" selection-end-line="44" selection-end-column="55" />
|
||||||
|
<folding>
|
||||||
|
<element signature="n#!!doc" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file leaf-file-name="ResponseHandler.js" pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/js/data/ResponseHandler.js">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="744">
|
||||||
|
<caret line="80" column="13" selection-start-line="80" selection-start-column="8" selection-end-line="80" selection-end-column="13" />
|
||||||
|
<folding>
|
||||||
|
<element signature="n#!!doc" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
</leaf>
|
</leaf>
|
||||||
</component>
|
</component>
|
||||||
<component name="Git.Settings">
|
<component name="Git.Settings">
|
||||||
@ -79,7 +114,6 @@
|
|||||||
<option value="$PROJECT_DIR$/config.php" />
|
<option value="$PROJECT_DIR$/config.php" />
|
||||||
<option value="$PROJECT_DIR$/js/ABOUT.js" />
|
<option value="$PROJECT_DIR$/js/ABOUT.js" />
|
||||||
<option value="$PROJECT_DIR$/js/dialogs/ImportContentPanel.js" />
|
<option value="$PROJECT_DIR$/js/dialogs/ImportContentPanel.js" />
|
||||||
<option value="$PROJECT_DIR$/js/dialogs/ImportPanel.js" />
|
|
||||||
<option value="$PROJECT_DIR$/js/data/ResponseHandler.js" />
|
<option value="$PROJECT_DIR$/js/data/ResponseHandler.js" />
|
||||||
<option value="$PROJECT_DIR$/build.xml" />
|
<option value="$PROJECT_DIR$/build.xml" />
|
||||||
<option value="$PROJECT_DIR$/changelog.txt" />
|
<option value="$PROJECT_DIR$/changelog.txt" />
|
||||||
@ -89,9 +123,10 @@
|
|||||||
<option value="$PROJECT_DIR$/php/helper.php" />
|
<option value="$PROJECT_DIR$/php/helper.php" />
|
||||||
<option value="$PROJECT_DIR$/php/plugin.contactimporter.php" />
|
<option value="$PROJECT_DIR$/php/plugin.contactimporter.php" />
|
||||||
<option value="$PROJECT_DIR$/php/module.contact.php" />
|
<option value="$PROJECT_DIR$/php/module.contact.php" />
|
||||||
<option value="$PROJECT_DIR$/js/data/Actions.js" />
|
|
||||||
<option value="$PROJECT_DIR$/js/plugin.contactimporter.js" />
|
<option value="$PROJECT_DIR$/js/plugin.contactimporter.js" />
|
||||||
<option value="$PROJECT_DIR$/js/ui/ContextMenu.js" />
|
<option value="$PROJECT_DIR$/js/ui/ContextMenu.js" />
|
||||||
|
<option value="$PROJECT_DIR$/js/data/Actions.js" />
|
||||||
|
<option value="$PROJECT_DIR$/js/dialogs/ImportPanel.js" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
@ -327,12 +362,12 @@
|
|||||||
<workItem from="1480428199144" duration="44000" />
|
<workItem from="1480428199144" duration="44000" />
|
||||||
<workItem from="1480428259775" duration="69000" />
|
<workItem from="1480428259775" duration="69000" />
|
||||||
<workItem from="1480428330068" duration="6691000" />
|
<workItem from="1480428330068" duration="6691000" />
|
||||||
<workItem from="1480504955898" duration="2034000" />
|
<workItem from="1480504955898" duration="3734000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TimeTrackingManager">
|
<component name="TimeTrackingManager">
|
||||||
<option name="totallyTimeSpent" value="8838000" />
|
<option name="totallyTimeSpent" value="10538000" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ToolWindowManager">
|
<component name="ToolWindowManager">
|
||||||
<frame x="65" y="24" width="1792" height="999" extended-state="6" />
|
<frame x="65" y="24" width="1792" height="999" extended-state="6" />
|
||||||
@ -342,6 +377,7 @@
|
|||||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
||||||
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
|
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32900432" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||||
@ -352,7 +388,6 @@
|
|||||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
||||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
||||||
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||||
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||||
</layout>
|
</layout>
|
||||||
@ -370,7 +405,7 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="XDebuggerManager">
|
<component name="XDebuggerManager">
|
||||||
<breakpoint-manager>
|
<breakpoint-manager>
|
||||||
<option name="time" value="1" />
|
<option name="time" value="2" />
|
||||||
</breakpoint-manager>
|
</breakpoint-manager>
|
||||||
<watches-manager />
|
<watches-manager />
|
||||||
</component>
|
</component>
|
||||||
@ -462,23 +497,6 @@
|
|||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/js/dialogs/fields.txt" />
|
<entry file="file://$PROJECT_DIR$/js/dialogs/fields.txt" />
|
||||||
<entry file="file://$PROJECT_DIR$/js/dialogs/ImportContentPanel.js">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="474">
|
|
||||||
<caret line="44" column="20" selection-start-line="44" selection-start-column="20" selection-end-line="44" selection-end-column="55" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/js/data/ResponseHandler.js">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="1200">
|
|
||||||
<caret line="80" column="13" selection-start-line="80" selection-start-column="8" selection-end-line="80" selection-end-column="13" />
|
|
||||||
<folding>
|
|
||||||
<element signature="n#!!doc" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.po">
|
<entry file="file://$PROJECT_DIR$/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.po">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="0">
|
<state relative-caret-position="0">
|
||||||
@ -494,16 +512,6 @@
|
|||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/js/dialogs/ImportPanel.js">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="8415">
|
|
||||||
<caret line="581" column="8" selection-start-line="581" selection-start-column="8" selection-end-line="583" selection-end-column="8" />
|
|
||||||
<folding>
|
|
||||||
<element signature="n#!!doc" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/manifest.xml">
|
<entry file="file://$PROJECT_DIR$/manifest.xml">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="60">
|
<state relative-caret-position="60">
|
||||||
@ -597,27 +605,57 @@
|
|||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/js/ui/ContextMenu.js">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="1665">
|
||||||
|
<caret line="111" column="5" selection-start-line="111" selection-start-column="5" selection-end-line="111" selection-end-column="5" />
|
||||||
|
<folding />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/js/data/Actions.js">
|
<entry file="file://$PROJECT_DIR$/js/data/Actions.js">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="1030">
|
<state relative-caret-position="255">
|
||||||
<caret line="223" column="5" selection-start-line="111" selection-start-column="0" selection-end-line="223" selection-end-column="5" />
|
<caret line="17" column="26" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="26" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/js/plugin.contactimporter.js">
|
<entry file="file://$PROJECT_DIR$/js/plugin.contactimporter.js">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="1245">
|
<state relative-caret-position="-231">
|
||||||
<caret line="83" column="9" selection-start-line="83" selection-start-column="9" selection-end-line="83" selection-end-column="9" />
|
<caret line="83" column="9" selection-start-line="83" selection-start-column="9" selection-end-line="83" selection-end-column="9" />
|
||||||
<folding />
|
<folding />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/js/ui/ContextMenu.js">
|
<entry file="file://$PROJECT_DIR$/js/dialogs/ImportContentPanel.js">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="1644">
|
<state relative-caret-position="474">
|
||||||
<caret line="111" column="5" selection-start-line="111" selection-start-column="5" selection-end-line="111" selection-end-column="5" />
|
<caret line="44" column="20" selection-start-line="44" selection-start-column="20" selection-end-line="44" selection-end-column="55" />
|
||||||
<folding />
|
<folding>
|
||||||
|
<element signature="n#!!doc" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/js/data/ResponseHandler.js">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="744">
|
||||||
|
<caret line="80" column="13" selection-start-line="80" selection-start-column="8" selection-end-line="80" selection-end-column="13" />
|
||||||
|
<folding>
|
||||||
|
<element signature="n#!!doc" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/js/dialogs/ImportPanel.js">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="497">
|
||||||
|
<caret line="335" column="30" selection-start-line="335" selection-start-column="30" selection-end-line="335" selection-end-column="30" />
|
||||||
|
<folding>
|
||||||
|
<element signature="n#!!doc" expanded="true" />
|
||||||
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
|
@ -111,22 +111,24 @@ Zarafa.plugins.contactimporter.data.Actions = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get all calendar folders.
|
* Get all contact folders.
|
||||||
* @param {boolean} asDropdownStore If true, a simple array store will be returned.
|
* @param {boolean} asDropdownStore If true, a simple array store will be returned.
|
||||||
* @returns {*}
|
* @returns {*}
|
||||||
*/
|
*/
|
||||||
getAllCalendarFolders: function (asDropdownStore) {
|
getAllContactFolders: function (asDropdownStore) {
|
||||||
asDropdownStore = Ext.isEmpty(asDropdownStore) ? false : asDropdownStore;
|
asDropdownStore = Ext.isEmpty(asDropdownStore) ? false : asDropdownStore;
|
||||||
|
|
||||||
var allFolders = [];
|
var allFolders = [];
|
||||||
|
|
||||||
|
var defaultContactFolder = container.getHierarchyStore().getDefaultFolder('contact');
|
||||||
|
|
||||||
var inbox = container.getHierarchyStore().getDefaultStore();
|
var inbox = container.getHierarchyStore().getDefaultStore();
|
||||||
var pub = container.getHierarchyStore().getPublicStore();
|
var pub = container.getHierarchyStore().getPublicStore();
|
||||||
|
|
||||||
if (!Ext.isEmpty(inbox.subStores) && inbox.subStores.folders.totalLength > 0) {
|
if (!Ext.isEmpty(inbox.subStores) && inbox.subStores.folders.totalLength > 0) {
|
||||||
for (var i = 0; i < inbox.subStores.folders.totalLength; i++) {
|
for (var i = 0; i < inbox.subStores.folders.totalLength; i++) {
|
||||||
var folder = inbox.subStores.folders.getAt(i);
|
var folder = inbox.subStores.folders.getAt(i);
|
||||||
if (!Ext.isEmpty(folder) && folder.get("container_class") == "IPF.Appointment") {
|
if (!Ext.isEmpty(folder) && folder.get("container_class") == "IPF.Contact") {
|
||||||
if (asDropdownStore) {
|
if (asDropdownStore) {
|
||||||
allFolders.push([
|
allFolders.push([
|
||||||
folder.get("entryid"),
|
folder.get("entryid"),
|
||||||
@ -147,7 +149,7 @@ Zarafa.plugins.contactimporter.data.Actions = {
|
|||||||
if (!Ext.isEmpty(pub.subStores) && pub.subStores.folders.totalLength > 0) {
|
if (!Ext.isEmpty(pub.subStores) && pub.subStores.folders.totalLength > 0) {
|
||||||
for (var j = 0; j < pub.subStores.folders.totalLength; j++) {
|
for (var j = 0; j < pub.subStores.folders.totalLength; j++) {
|
||||||
var folder = pub.subStores.folders.getAt(j);
|
var folder = pub.subStores.folders.getAt(j);
|
||||||
if (!Ext.isEmpty(folder) && folder.get("container_class") == "IPF.Appointment") {
|
if (!Ext.isEmpty(folder) && folder.get("container_class") == "IPF.Contact") {
|
||||||
if (asDropdownStore) {
|
if (asDropdownStore) {
|
||||||
allFolders.push([
|
allFolders.push([
|
||||||
folder.get("entryid"),
|
folder.get("entryid"),
|
||||||
@ -172,40 +174,6 @@ Zarafa.plugins.contactimporter.data.Actions = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
|
||||||
* Return a calendar folder element by name.
|
|
||||||
* @param {string} name
|
|
||||||
* @returns {*}
|
|
||||||
*/
|
|
||||||
getCalendarFolderByName: function (name) {
|
|
||||||
var folders = Zarafa.plugins.contactimporter.data.Actions.getAllCalendarFolders(false);
|
|
||||||
|
|
||||||
for (var i = 0; i < folders.length; i++) {
|
|
||||||
if (folders[i].display_name == name) {
|
|
||||||
return folders[i];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return container.getHierarchyStore().getDefaultFolder('calendar');
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return a calendar folder element by entryid.
|
|
||||||
* @param {string} entryid
|
|
||||||
* @returns {*}
|
|
||||||
*/
|
|
||||||
getCalendarFolderByEntryid: function (entryid) {
|
|
||||||
var folders = Zarafa.plugins.contactimporter.data.Actions.getAllCalendarFolders(false);
|
|
||||||
|
|
||||||
for (var i = 0; i < folders.length; i++) {
|
|
||||||
if (folders[i].entryid == entryid) {
|
|
||||||
return folders[i];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return container.getHierarchyStore().getDefaultFolder('calendar');
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Dynamic sort function, sorts by property name.
|
* Dynamic sort function, sorts by property name.
|
||||||
* @param {string|int} property
|
* @param {string|int} property
|
||||||
@ -221,5 +189,39 @@ Zarafa.plugins.contactimporter.data.Actions = {
|
|||||||
var result = (a[property].toLowerCase() < b[property].toLowerCase()) ? -1 : (a[property].toLowerCase() > b[property].toLowerCase()) ? 1 : 0;
|
var result = (a[property].toLowerCase() < b[property].toLowerCase()) ? -1 : (a[property].toLowerCase() > b[property].toLowerCase()) ? 1 : 0;
|
||||||
return result * sortOrder;
|
return result * sortOrder;
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return a contact folder element by name.
|
||||||
|
* @param {string} name
|
||||||
|
* @returns {*}
|
||||||
|
*/
|
||||||
|
getContactFolderByName: function (name) {
|
||||||
|
var folders = Zarafa.plugins.contactimporter.data.Actions.getAllContactFolders(false);
|
||||||
|
|
||||||
|
for (var i = 0; i < folders.length; i++) {
|
||||||
|
if (folders[i].display_name == name) {
|
||||||
|
return folders[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return container.getHierarchyStore().getDefaultFolder('contact');
|
||||||
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return a contact folder element by entryid.
|
||||||
|
* @param {string} entryid
|
||||||
|
* @returns {*}
|
||||||
|
*/
|
||||||
|
getContactFolderByEntryid: function (entryid) {
|
||||||
|
var folders = Zarafa.plugins.contactimporter.data.Actions.getAllContactFolders(false);
|
||||||
|
|
||||||
|
for (var i = 0; i < folders.length; i++) {
|
||||||
|
if (folders[i].entryid == entryid) {
|
||||||
|
return folders[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return container.getHierarchyStore().getDefaultFolder('contact');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -132,121 +132,6 @@ Zarafa.plugins.contactimporter.dialogs.ImportPanel = Ext.extend(Ext.Panel, {
|
|||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
|
||||||
* Get all contact folders.
|
|
||||||
* @param {boolean} asDropdownStore If true, a simple array store will be returned.
|
|
||||||
* @returns {*}
|
|
||||||
*/
|
|
||||||
getAllContactFolders: function (asDropdownStore) {
|
|
||||||
asDropdownStore = Ext.isEmpty(asDropdownStore) ? false : asDropdownStore;
|
|
||||||
|
|
||||||
var allFolders = [];
|
|
||||||
|
|
||||||
var defaultContactFolder = container.getHierarchyStore().getDefaultFolder('contact');
|
|
||||||
|
|
||||||
var inbox = container.getHierarchyStore().getDefaultStore();
|
|
||||||
var pub = container.getHierarchyStore().getPublicStore();
|
|
||||||
|
|
||||||
if (!Ext.isEmpty(inbox.subStores) && inbox.subStores.folders.totalLength > 0) {
|
|
||||||
for (var i = 0; i < inbox.subStores.folders.totalLength; i++) {
|
|
||||||
var folder = inbox.subStores.folders.getAt(i);
|
|
||||||
if (!Ext.isEmpty(folder) && folder.get("container_class") == "IPF.Contact") {
|
|
||||||
if (asDropdownStore) {
|
|
||||||
allFolders.push([
|
|
||||||
folder.get("entryid"),
|
|
||||||
folder.get("display_name")
|
|
||||||
]);
|
|
||||||
} else {
|
|
||||||
allFolders.push({
|
|
||||||
display_name: folder.get("display_name"),
|
|
||||||
entryid: folder.get("entryid"),
|
|
||||||
store_entryid: folder.get("store_entryid"),
|
|
||||||
is_public: false
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!Ext.isEmpty(pub.subStores) && pub.subStores.folders.totalLength > 0) {
|
|
||||||
for (var j = 0; j < pub.subStores.folders.totalLength; j++) {
|
|
||||||
var folder = pub.subStores.folders.getAt(j);
|
|
||||||
if (!Ext.isEmpty(folder) && folder.get("container_class") == "IPF.Contact") {
|
|
||||||
if (asDropdownStore) {
|
|
||||||
allFolders.push([
|
|
||||||
folder.get("entryid"),
|
|
||||||
folder.get("display_name") + " (Public)"
|
|
||||||
]);
|
|
||||||
} else {
|
|
||||||
allFolders.push({
|
|
||||||
display_name: folder.get("display_name"),
|
|
||||||
entryid: folder.get("entryid"),
|
|
||||||
store_entryid: folder.get("store_entryid"),
|
|
||||||
is_public: true
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (asDropdownStore) {
|
|
||||||
return allFolders.sort(this.dynamicSort(1));
|
|
||||||
} else {
|
|
||||||
return allFolders;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Dynamic sort function, sorts by property name.
|
|
||||||
* @param {string|int} property
|
|
||||||
* @returns {Function}
|
|
||||||
*/
|
|
||||||
dynamicSort: function (property) {
|
|
||||||
var sortOrder = 1;
|
|
||||||
if (property[0] === "-") {
|
|
||||||
sortOrder = -1;
|
|
||||||
property = property.substr(1);
|
|
||||||
}
|
|
||||||
return function (a, b) {
|
|
||||||
var result = (a[property].toLowerCase() < b[property].toLowerCase()) ? -1 : (a[property].toLowerCase() > b[property].toLowerCase()) ? 1 : 0;
|
|
||||||
return result * sortOrder;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return a contact folder element by name.
|
|
||||||
* @param {string} name
|
|
||||||
* @returns {*}
|
|
||||||
*/
|
|
||||||
getContactFolderByName: function (name) {
|
|
||||||
var folders = this.getAllContactFolders(false);
|
|
||||||
|
|
||||||
for (var i = 0; i < folders.length; i++) {
|
|
||||||
if (folders[i].display_name == name) {
|
|
||||||
return folders[i];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return container.getHierarchyStore().getDefaultFolder('contact');
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return a contact folder element by entryid.
|
|
||||||
* @param {string} entryid
|
|
||||||
* @returns {*}
|
|
||||||
*/
|
|
||||||
getContactFolderByEntryid: function (entryid) {
|
|
||||||
var folders = this.getAllContactFolders(false);
|
|
||||||
|
|
||||||
for (var i = 0; i < folders.length; i++) {
|
|
||||||
if (folders[i].entryid == entryid) {
|
|
||||||
return folders[i];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return container.getHierarchyStore().getDefaultFolder('contact');
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reloads the data of the grid
|
* Reloads the data of the grid
|
||||||
* @private
|
* @private
|
||||||
@ -313,14 +198,14 @@ Zarafa.plugins.contactimporter.dialogs.ImportPanel = Ext.extend(Ext.Panel, {
|
|||||||
* @returns {*}
|
* @returns {*}
|
||||||
*/
|
*/
|
||||||
createSelectBox: function () {
|
createSelectBox: function () {
|
||||||
var myStore = this.getAllContactFolders(true);
|
var myStore = Zarafa.plugins.contactimporter.data.Actions.getAllContactFolders(true);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
xtype: "selectbox",
|
xtype: "selectbox",
|
||||||
ref: 'addressbookSelector',
|
ref: 'addressbookSelector',
|
||||||
editable: false,
|
editable: false,
|
||||||
name: "choosen_addressbook",
|
name: "choosen_addressbook",
|
||||||
value: Ext.isEmpty(this.folder) ? this.getContactFolderByName(container.getSettingsModel().get("zarafa/v1/plugins/contactimporter/default_addressbook")).entryid : this.folder,
|
value: Ext.isEmpty(this.folder) ? Zarafa.plugins.contactimporter.data.Actions.getContactFolderByName(container.getSettingsModel().get("zarafa/v1/plugins/contactimporter/default_addressbook")).entryid : this.folder,
|
||||||
width: 100,
|
width: 100,
|
||||||
fieldLabel: dgettext('plugin_contactimporter', 'Select folder'),
|
fieldLabel: dgettext('plugin_contactimporter', 'Select folder'),
|
||||||
store: myStore,
|
store: myStore,
|
||||||
@ -430,7 +315,7 @@ Zarafa.plugins.contactimporter.dialogs.ImportPanel = Ext.extend(Ext.Panel, {
|
|||||||
this.submitAllButton.disable();
|
this.submitAllButton.disable();
|
||||||
Zarafa.common.dialogs.MessageBox.show({
|
Zarafa.common.dialogs.MessageBox.show({
|
||||||
title: dgettext('plugin_contactimporter', 'Error'),
|
title: dgettext('plugin_contactimporter', 'Error'),
|
||||||
msg: _(action.result.error),
|
msg: action.result.error,
|
||||||
icon: Zarafa.common.dialogs.MessageBox.ERROR,
|
icon: Zarafa.common.dialogs.MessageBox.ERROR,
|
||||||
buttons: Zarafa.common.dialogs.MessageBox.OK
|
buttons: Zarafa.common.dialogs.MessageBox.OK
|
||||||
});
|
});
|
||||||
@ -542,7 +427,7 @@ Zarafa.plugins.contactimporter.dialogs.ImportPanel = Ext.extend(Ext.Panel, {
|
|||||||
buttons: Zarafa.common.dialogs.MessageBox.OK
|
buttons: Zarafa.common.dialogs.MessageBox.OK
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
var contactFolder = this.getContactFolderByEntryid(folderValue);
|
var contactFolder = Zarafa.plugins.contactimporter.data.Actions.getContactFolderByEntryid(folderValue);
|
||||||
|
|
||||||
this.loadMask.show();
|
this.loadMask.show();
|
||||||
var uids = [];
|
var uids = [];
|
||||||
|
Loading…
Reference in New Issue
Block a user