Skip to content

Руслан Ибрагимов / yescenter

Go to a project
Commit 6d160f59 by Ruha
Options

additional fixes

1 parent bd17719e
Pipeline #2604 for 6d160f59 skipped in 0 seconds
Inline Side-by-side
Showing 7 changed files with 2020 additions and 133 deletions
.idea/deployment.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="PublishConfigData"> <component name="PublishConfigData" autoUpload="Always" serverName="myjino.ru">
<serverData> <serverData>
<paths name="flux.loc"> <paths name="flux.loc">
<serverdata> <serverdata>
...@@ -45,5 +45,6 @@ ...@@ -45,5 +45,6 @@
</serverdata> </serverdata>
</paths> </paths>
</serverData> </serverData>
<option name="myAutoUpload" value="ALWAYS" />
</component> </component>
</project> </project>
\ No newline at end of file \ No newline at end of file
.idea/workspace.xml
...@@ -2,13 +2,10 @@ ...@@ -2,13 +2,10 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f27ea491-44a7-4742-b6b4-1d473d258e2e" name="Default" comment=""> <list default="true" id="f27ea491-44a7-4742-b6b4-1d473d258e2e" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/jsLibraryMappings.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/handler.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/deployment.xml" afterPath="$PROJECT_DIR$/.idea/deployment.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/deployment.xml" afterPath="$PROJECT_DIR$/.idea/deployment.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/yescenter.iml" afterPath="$PROJECT_DIR$/.idea/yescenter.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/additional.css" afterPath="$PROJECT_DIR$/css/additional.css" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/additional.css" afterPath="$PROJECT_DIR$/css/additional.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/handler.php" afterPath="$PROJECT_DIR$/handler.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/common.js" afterPath="$PROJECT_DIR$/js/common.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/common.js" afterPath="$PROJECT_DIR$/js/common.js" />
</list> </list>
...@@ -32,43 +29,31 @@ ...@@ -32,43 +29,31 @@
</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="app.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="277">
<caret line="2" column="23334" selection-start-line="2" selection-start-column="23330" selection-end-line="2" selection-end-column="23334" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false"> <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="715"> <state relative-caret-position="1980">
<caret line="319" column="49" selection-start-line="319" selection-start-column="49" selection-end-line="319" selection-end-column="49" /> <caret line="103" column="36" selection-start-line="103" selection-start-column="36" selection-end-line="103" selection-end-column="36" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="additional.css" pinned="false" current-in-tab="false"> <file leaf-file-name="additional.css" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/css/additional.css"> <entry file="file://$PROJECT_DIR$/css/additional.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="451"> <state relative-caret-position="240">
<caret line="67" column="16" selection-start-line="67" selection-start-column="16" selection-end-line="67" selection-end-column="16" /> <caret line="88" column="16" selection-start-line="88" selection-start-column="16" selection-end-line="88" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="common.js" pinned="false" current-in-tab="true"> <file leaf-file-name="common.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/common.js"> <entry file="file://$PROJECT_DIR$/js/common.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="212"> <state relative-caret-position="-184">
<caret line="186" column="36" selection-start-line="186" selection-start-column="36" selection-end-line="186" selection-end-column="36" /> <caret line="189" column="22" selection-start-line="189" selection-start-column="22" selection-end-line="189" selection-end-column="22" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
</folding> </folding>
...@@ -79,8 +64,8 @@ ...@@ -79,8 +64,8 @@
<file leaf-file-name="handler.php" pinned="false" current-in-tab="false"> <file leaf-file-name="handler.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/handler.php"> <entry file="file://$PROJECT_DIR$/handler.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="427"> <state relative-caret-position="667">
<caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" /> <caret line="115" column="102" selection-start-line="115" selection-start-column="102" selection-end-line="115" selection-end-column="102" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -101,10 +86,11 @@ ...@@ -101,10 +86,11 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/css/additional.css" /> <option value="$PROJECT_DIR$/css/style.css" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/handler.php" />
<option value="$PROJECT_DIR$/js/common.js" /> <option value="$PROJECT_DIR$/js/common.js" />
<option value="$PROJECT_DIR$/handler.php" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/css/additional.css" />
</list> </list>
</option> </option>
</component> </component>
...@@ -114,6 +100,9 @@ ...@@ -114,6 +100,9 @@
<detection-done>true</detection-done> <detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting> <sorting>DEFINITION_ORDER</sorting>
</component> </component>
<component name="PhpServers">
<servers />
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="-8" /> <option name="x" value="-8" />
...@@ -147,6 +136,7 @@ ...@@ -147,6 +136,7 @@
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" /> <pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
...@@ -175,13 +165,12 @@ ...@@ -175,13 +165,12 @@
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="js" /> <option name="myItemId" value="css" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scratches" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -233,26 +222,34 @@ ...@@ -233,26 +222,34 @@
<editor active="false" /> <editor active="false" />
<layout> <layout>
<window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995737" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32995737" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2553305" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25799572" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<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="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3293348" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3293348" sideWeight="0.5" order="8" 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="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="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="0" 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" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" 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="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" 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="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" 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="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="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="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" />
</layout> </layout>
</component> </component>
<component name="Vcs.Log.UiProperties">
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
</component>
<component name="VcsContentAnnotationSettings"> <component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
...@@ -273,41 +270,41 @@ ...@@ -273,41 +270,41 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6336"> <state relative-caret-position="7656">
<caret line="264" column="26" selection-start-line="264" selection-start-column="16" selection-end-line="264" selection-end-column="26" /> <caret line="319" column="49" selection-start-line="319" selection-start-column="49" selection-end-line="319" selection-end-column="49" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/css/additional.css"> <entry file="file://$PROJECT_DIR$/css/additional.css">
<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="1608">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="67" column="16" selection-start-line="67" selection-start-column="16" selection-end-line="67" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/js/common.js"> <entry file="file://$PROJECT_DIR$/js/common.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3240"> <state relative-caret-position="0">
<caret line="135" column="36" selection-start-line="135" selection-start-column="36" selection-end-line="135" selection-end-column="36" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/css/style.css"> <entry file="file://$PROJECT_DIR$/handler.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-7488"> <state relative-caret-position="1224">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/js/app.js"> <entry file="file://$PROJECT_DIR$/js/app.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="277"> <state relative-caret-position="48">
<caret line="2" column="23334" selection-start-line="2" selection-start-column="23330" selection-end-line="2" selection-end-column="23334" /> <caret line="2" column="23334" selection-start-line="2" selection-start-column="23330" selection-end-line="2" selection-end-column="23334" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
...@@ -315,39 +312,83 @@ ...@@ -315,39 +312,83 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6336">
<caret line="264" column="26" selection-start-line="264" selection-start-column="16" selection-end-line="264" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/additional.css"> <entry file="file://$PROJECT_DIR$/css/additional.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="451"> <state relative-caret-position="0">
<caret line="67" column="16" selection-start-line="67" selection-start-column="16" selection-end-line="67" selection-end-column="16" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/js/common.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="715"> <state relative-caret-position="3240">
<caret line="319" column="49" selection-start-line="319" selection-start-column="49" selection-end-line="319" selection-end-column="49" /> <caret line="135" column="36" selection-start-line="135" selection-start-column="36" selection-end-line="135" selection-end-column="36" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2005">
<caret line="2" column="23334" selection-start-line="2" selection-start-column="23330" selection-end-line="2" selection-end-column="23334" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-684">
<caret line="587" column="180" selection-start-line="587" selection-start-column="180" selection-end-line="587" selection-end-column="181" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/handler.php"> <entry file="file://$PROJECT_DIR$/handler.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="427"> <state relative-caret-position="667">
<caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" /> <caret line="115" column="102" selection-start-line="115" selection-start-column="102" selection-end-line="115" selection-end-column="102" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1980">
<caret line="103" column="36" selection-start-line="103" selection-start-column="36" selection-end-line="103" selection-end-column="36" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/js/common.js"> <entry file="file://$PROJECT_DIR$/js/common.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="212"> <state relative-caret-position="-184">
<caret line="186" column="36" selection-start-line="186" selection-start-column="36" selection-end-line="186" selection-end-column="36" /> <caret line="189" column="22" selection-start-line="189" selection-start-column="22" selection-end-line="189" selection-end-column="22" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/css/additional.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="88" column="16" selection-start-line="88" selection-start-column="16" selection-end-line="88" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file \ No newline at end of file
css/additional.css
...@@ -9,12 +9,13 @@ ...@@ -9,12 +9,13 @@
.modal { .modal {
z-index: 5000; z-index: 5000;
width: 416px; width: 416px;
margin: 0 auto;
background: #fff; background: #fff;
position: fixed; position: fixed;
top:10%; left: 50%;
left: 40%; top: 50%;
padding: 0px 0 48px 0; transform: translate(-50%,-50%);
padding: 0 0 12px 0;
border-radius: 8px;
} }
.hidden { .hidden {
...@@ -35,8 +36,11 @@ ...@@ -35,8 +36,11 @@
font-size: 15px; font-size: 15px;
font-weight: 500; font-weight: 500;
margin: 0 auto; margin: 0 auto;
margin-top: 17px;
}
#callback-form .button {
margin-top:10px;
} }
.modal-head { .modal-head {
text-align: right; text-align: right;
height: 28px; height: 28px;
...@@ -48,6 +52,7 @@ ...@@ -48,6 +52,7 @@
padding: 18px; padding: 18px;
position: relative; position: relative;
background: url("/img/modal/close.svg") no-repeat 96% 15px; background: url("/img/modal/close.svg") no-repeat 96% 15px;
cursor:pointer;
} }
.modal-body-header { .modal-body-header {
...@@ -66,12 +71,30 @@ ...@@ -66,12 +71,30 @@
font-weight: bold; font-weight: bold;
margin:auto; margin:auto;
padding:0 40px; padding:0 40px;
margin-bottom: 2px;
}
#success .modal-body-header {
padding-top:36px;
}
#success small {
display: block;
padding-top:18px;
} }
.time { .time {
width:152px; width:152px;
display: inline-block; display: inline-block;
float:left; float:left;
} }
fieldset {
max-height: 89px;
min-height: 40px;
}
#order-form fieldset{
min-height:86px;
}
#order-form fieldset:last-of-type {
min-height: 94px;
}
.time .input {width:100%; display: inline-block} .time .input {width:100%; display: inline-block}
.tm {margin-left:40px;} .tm {margin-left:40px;}
.arrow-up{ .arrow-up{
...@@ -82,7 +105,7 @@ ...@@ -82,7 +105,7 @@
height: 30px; height: 30px;
width: 30px; width: 30px;
top: 30px; top: 30px;
right: -110px; right: -115px;
background-size: cover; background-size: cover;
margin-top: -32px; margin-top: -32px;
} }
...@@ -94,7 +117,7 @@ ...@@ -94,7 +117,7 @@
height: 30px; height: 30px;
width: 30px; width: 30px;
top: 50px; top: 50px;
right: -110px; right: -115px;
background-size: cover; background-size: cover;
margin-top: -32px; margin-top: -32px;
} }
...@@ -112,9 +135,38 @@ ...@@ -112,9 +135,38 @@
font-size: 15px; font-size: 15px;
color: #333; color: #333;
box-sizing: border-box; box-sizing: border-box;
padding: 16px; padding: 4px 16px;
}
.error { color: #ed1c24;}
label.error {
position: relative;
height:0;
top: -84px;
left: 148px;
display:inline-block;
width:55%;
text-align:right;
font-size:13px;
}
#footer-form label {
padding:0 0px;
}
input:disabled,
input[disabled]{
border: 1px solid #999999;
background-color: #EEEEEE!important;
color: #000!important;
cursor: not-allowed;
}
input.error {
border-color: #ed1c24!important;
} }
input.valid {
border-color: #18FF00!important;
}
.input input[type="text"] { .input input[type="text"] {
font-size: 15px; font-size: 15px;
color: #333; color: #333;
...@@ -124,3 +176,31 @@ ...@@ -124,3 +176,31 @@
width: 100%; width: 100%;
height: 46px; height: 46px;
} }
.last {padding-top:18px;}
@media (max-width: 480px) {
.modal {width:360px;}
.map-ct1 {padding-top:0px;}
#footer-form input{width:328px;}
.last {padding-top:18px;}
.modal-label {
}
#order-form label {
padding: 0 13px;
}
.time {
width: 42%;
display: inline-block;
}
.tm {margin-left:12px;}
}
@media (max-width: 769px) and (min-width:481px) {
.map-ct1 {padding-top:0px;}
#footer-form input{width:282px;}
#footer-form label.error { left: 127px}
}
handler.php
...@@ -15,7 +15,6 @@ switch ($type) { ...@@ -15,7 +15,6 @@ switch ($type) {
$data = ['phone' => $phone, 'from' => $from, 'till' => $till]; $data = ['phone' => $phone, 'from' => $from, 'till' => $till];
$callback = new callback($data); $callback = new callback($data);
$callback->send($data); $callback->send($data);
echo json_encode(array('type'=>'success_send', 'text'=>'Ваша заявка успешно отправлена'));
break; break;
case 'order': case 'order':
...@@ -74,6 +73,20 @@ class callback extends Form { ...@@ -74,6 +73,20 @@ class callback extends Form {
$this->till = $data['till']; $this->till = $data['till'];
$this->from = $data['from']; $this->from = $data['from'];
} }
public function send(){
global $mailTo;
$headers = 'MIME-Version: 1.0' . "\r\n";
$headers .= 'Content-type: text/html; charset=utf-8' . "\r\n";
$headers .= 'From: Landing_Page <testmail@test.ru>';
$subject = "Заявка на франшизу";
$message = 'Телефон: '. $this->phone . '<br>';
$message .= 'Звонить с ' . $this->till . '<br>';
$message .= 'До ' . $this->from . '<br>';
if (mail($mailTo, $subject, $message, $headers)) {
echo json_encode(array('type'=>'success_send', 'text'=>'Ваша заявка успешно отправлена'));
}
}
} }
class order extends Form { class order extends Form {
...@@ -89,6 +102,20 @@ class order extends Form { ...@@ -89,6 +102,20 @@ class order extends Form {
$this->city = $data['city']; $this->city = $data['city'];
$this->email = Form::validate($data['email'], 'email'); $this->email = Form::validate($data['email'], 'email');
} }
public function send(){
global $mailTo;
$headers = 'MIME-Version: 1.0' . "\r\n";
$headers .= 'Content-type: text/html; charset=utf-8' . "\r\n";
$headers .= 'From: Landing_Page <testmail@test.ru>';
$subject = "Заявка на франшизу";
$message = 'Клиента зовут: '. $this->name . '<br>';
$message .= 'Почтовый ящик: ' . $this->email . '<br>';
$message .= 'Город: ' . $this->city . '<br>';
if (mail($mailTo, $subject, $message, $headers)) {
echo json_encode(array('type'=>'success_send', 'text'=>'Ваша заявка успешно отправлена'));
}
}
} }
......
index.html
...@@ -8,9 +8,8 @@ ...@@ -8,9 +8,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen, projection"/> <link rel="stylesheet" href="css/style.css" type="text/css" media="screen, projection"/>
<link rel="stylesheet" href="css/additional.css" type="text/css" media="screen, projection"/> <link rel="stylesheet" href="css/additional.css" type="text/css" media="screen, projection"/>
<!--[if lt IE 9]>
<link href="css/ie8.css" rel="stylesheet" media="all"/> <![endif]-->
<script type="text/javascript" src="js/app.js"></script> <script type="text/javascript" src="js/app.js"></script>
<script type="text/javascript" src="js/jquery.validate.js"></script>
</head> </head>
<body> <body>
...@@ -31,7 +30,7 @@ ...@@ -31,7 +30,7 @@
<div class="t1">Франшиза школы <br>иностранных языков</div> <div class="t1">Франшиза школы <br>иностранных языков</div>
<div class="ov"> <div class="ov">
<div><span>18</span><i>филиалов крупной сети <br>языковых школ</i></div> <div><span>18</span><i>филиалов крупной сети <br>языковых школ</i></div>
<div><span>9</span><i>действующих <br>франчиз</i></div> <div><span>9</span><i>действующих <br>франшиз</i></div>
<div><span>16</span><i>лет оптыта <br>работы</i></div> <div><span>16</span><i>лет оптыта <br>работы</i></div>
</div> </div>
</div> </div>
...@@ -67,12 +66,12 @@ ...@@ -67,12 +66,12 @@
</li> </li>
</ul> </ul>
</div> </div>
<a href="" class="ord2-1" >Получить план открытия школы</a> <a href="" class="ord2-1">Получить план открытия школы</a>
</div> </div>
</div> </div>
<div class="b3"> <div class="b3">
<div class="ct"> <div class="ct">
<div class="t1">Почему наша фрашиза лучше?</div> <div class="t1">Почему наша франшиза лучше?</div>
<div class="ov1"> <div class="ov1">
<div class="item1 j1"> <div class="item1 j1">
<div> <div>
...@@ -86,7 +85,7 @@ ...@@ -86,7 +85,7 @@
<div> <div>
<span>Предоставляем уже сгенерированый поток клиентов</span> <span>Предоставляем уже сгенерированый поток клиентов</span>
<p>Мы создадим страницу вашей школы на нашем сайте, поможем привлечь клиентов и будем передавать <p>Мы создадим страницу вашей школы на нашем сайте, поможем привлечь клиентов и будем передавать
заявки для вашей школы из общекорпоративного call-центра.Ваша школа только откроется, а к заявки для вашей школы из общекорпоративного call-центра. Ваша школа только откроется, а к
вам уже пойдут учиться!</p> вам уже пойдут учиться!</p>
</div> </div>
</div> </div>
...@@ -227,16 +226,28 @@ ...@@ -227,16 +226,28 @@
<div id="map" class="map-ct1"> <div id="map" class="map-ct1">
<div class="ct"> <div class="ct">
<div class="form1"> <div class="form1">
<input type="hidden" name="type" value="order">
<div class="t1">Как стать франчайзи <br>языковых школ YES</div> <div class="t1">Как стать франчайзи <br>языковых школ YES</div>
<div class="t2">Оставьте заявку, и мы свяжемся с вами для обсуждения бизнес-плана.</div> <div class="t2">Оставьте заявку, и мы свяжемся с вами для обсуждения бизнес-плана.</div>
<p>Ваше имя *</p> <form id="footer-form">
<div class="ip"><span><input type="text" placeholder=""></span></div> <fieldset>
<p>Электронная почта *</p> <input type="hidden" name="type" value="order">
<div class="ip"><span><input type="text" placeholder=""></span></div> <label for="name" class="modal-label">Ваше имя *</label>
<p>Ваш город</p> <input type="text" name="name" id="name" class="input">
<div class="ip"><span><input type="text" placeholder=""></span></div> </fieldset>
<div class="hh1"></div> <fieldset>
<input type="submit" value="Отправить заявку"> <label for="email" class="modal-label">Электронная почта *</label>
<input type="text" name="email" id="email" class="input">
</fieldset>
<fieldset>
<label for="city" class="modal-label">Ваш город</label>
<input type="text" name="city" id="city" class="input">
</fieldset>
<fieldset class="last">
<input type="submit" value="Отправить заявку" class="button">
</fieldset>
</form>
</div> </div>
</div> </div>
</div> </div>
...@@ -262,7 +273,9 @@ ...@@ -262,7 +273,9 @@
<!-- callback --> <!-- callback -->
<div class="modal hidden" id="callback"> <div class="modal hidden" id="callback">
<div class="modal-head"> <div class="modal-head">
<div class="modal-close"><div class="modal-close-xray"></div></div> <div class="modal-close">
<div class="modal-close-xray"></div>
</div>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="modal-body-header"> <div class="modal-body-header">
...@@ -273,16 +286,17 @@ ...@@ -273,16 +286,17 @@
<form id="callback-form"> <form id="callback-form">
<fieldset> <fieldset>
<input type="hidden" name="type" value="callback"> <input type="hidden" name="type" value="callback">
<label for="phone">&nbsp;</label>
<input type="text" name="phone" id="phone" class="input" placeholder="+7"> <input type="text" name="phone" id="phone" class="input" placeholder="+7">
</fieldset> </fieldset>
<fieldset class="time tm"> <fieldset class="time tm">
<label for="from"></label> <label for="from">&nbsp;</label>
<span class="arrow-up"></span> <span class="arrow-up"></span>
<span class="arrow-down"></span> <span class="arrow-down"></span>
<input type="text" id="from" name="from" class="input" value="12:00"> <input type="text" id="from" name="from" class="input" value="12:00">
</fieldset> </fieldset>
<fieldset class="time tm2"> <fieldset class="time tm2">
<label for="till"></label> <label for="till">&nbsp;</label>
<span class="arrow-up"></span> <span class="arrow-up"></span>
<span class="arrow-down"></span> <span class="arrow-down"></span>
<input type="text" id="till" name="till" class="input" value="12:30"> <input type="text" id="till" name="till" class="input" value="12:30">
...@@ -297,7 +311,9 @@ ...@@ -297,7 +311,9 @@
<!-- bid --> <!-- bid -->
<div class="modal hidden" id="bid"> <div class="modal hidden" id="bid">
<div class="modal-head"> <div class="modal-head">
<div class="modal-close"><div class="modal-close-xray"></div></div> <div class="modal-close">
<div class="modal-close-xray"></div>
</div>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="modal-body-header"> <div class="modal-body-header">
...@@ -312,8 +328,8 @@ ...@@ -312,8 +328,8 @@
<input type="text" name="name" id="name" class="input"> <input type="text" name="name" id="name" class="input">
</fieldset> </fieldset>
<fieldset> <fieldset>
<label for="mail" class="modal-label">Электронная почта *</label> <label for="email" class="modal-label">Электронная почта *</label>
<input type="text" name="email" id="mail" class="input"> <input type="text" name="email" id="email" class="input">
</fieldset> </fieldset>
<fieldset> <fieldset>
<label for="city" class="modal-label">Ваш город</label> <label for="city" class="modal-label">Ваш город</label>
...@@ -327,13 +343,27 @@ ...@@ -327,13 +343,27 @@
</div> </div>
</div> </div>
<script type="text/javascript" src="js/common.js"></script> <!-- success -->
<div class="modal hidden" id="success">
<div class="modal-head">
<div class="modal-close">
<div class="modal-close-xray"></div>
</div>
</div>
<div class="modal-body">
<div class="modal-body-header">
Спасибо,<br>
Ваша заявка <br>
принята! <br>
<small>Ближайшее время<br> наш менеджер свяжется с вами</small>
</div>
</div>
</div>
<script type="text/javascript" src="https://api-maps.yandex.ru/2.1/?lang=ru_RU"></script> <script type="text/javascript" src="https://api-maps.yandex.ru/2.1/?lang=ru_RU"></script>
<script> <script>
var myMap, data = [], geodata = []; var myMap, data = [], geodata = [];
var mark_counter = 1; var mark_counter = 1;
function fromString (val) { function fromString(val) {
var parts = val.split(','); var parts = val.split(',');
return [parseFloat(parts[1]), parseFloat(parts[0])]; return [parseFloat(parts[1]), parseFloat(parts[0])];
} }
...@@ -343,92 +373,109 @@ ...@@ -343,92 +373,109 @@
name: 'метро Кузьминки', name: 'метро Кузьминки',
text: 'метро Кузьминки<br/>8-925-006-60-62<br/><a href="https://www.yescenter.ru/schools/kuzminki/">страница школы</a><br/>ул. Васильцовский Стан, д.11', text: 'метро Кузьминки<br/>8-925-006-60-62<br/><a href="https://www.yescenter.ru/schools/kuzminki/">страница школы</a><br/>ул. Васильцовский Стан, д.11',
coords: '37.751188,55.716701', coords: '37.751188,55.716701',
geodata:'ул. Васильцовский Стан, д.11' geodata: 'ул. Васильцовский Стан, д.11'
};data[1] = { };
data[1] = {
name: 'Люберцы', name: 'Люберцы',
text: 'Люберцы<br/>8-925-006-63-23<br/><a href="https://www.yescenter.ru/schools/lubertsy/">страница школы</a><br/>Октябрьский пр-т., д. 127, ТЦ Millenium Plaza', text: 'Люберцы<br/>8-925-006-63-23<br/><a href="https://www.yescenter.ru/schools/lubertsy/">страница школы</a><br/>Октябрьский пр-т., д. 127, ТЦ Millenium Plaza',
coords: '37.88702,55.682423', coords: '37.88702,55.682423',
geodata:'Октябрьский пр-т., д. 127, ТЦ Millenium Plaza' geodata: 'Октябрьский пр-т., д. 127, ТЦ Millenium Plaza'
};data[2] = { };
data[2] = {
name: 'Раменское', name: 'Раменское',
text: 'Раменское<br/>8-925-006-63-24<br/><a href="https://www.yescenter.ru/schools/ramenskoe/">страница школы</a><br/>ул. Красноармейская, д. 15а', text: 'Раменское<br/>8-925-006-63-24<br/><a href="https://www.yescenter.ru/schools/ramenskoe/">страница школы</a><br/>ул. Красноармейская, д. 15а',
coords: '38.23726,55.572207', coords: '38.23726,55.572207',
geodata:'ул. Красноармейская, д. 15а' geodata: 'ул. Красноармейская, д. 15а'
};data[3] = { };
data[3] = {
name: 'Жуковский', name: 'Жуковский',
text: 'Жуковский<br/>8-925-006-63-13<br/><a href="https://www.yescenter.ru/schools/jucovsky/">страница школы</a><br/>ул. Гудкова, д. 21', text: 'Жуковский<br/>8-925-006-63-13<br/><a href="https://www.yescenter.ru/schools/jucovsky/">страница школы</a><br/>ул. Гудкова, д. 21',
coords: '38.086361,55.599732', coords: '38.086361,55.599732',
geodata:'ул. Гудкова, д. 21' geodata: 'ул. Гудкова, д. 21'
};data[4] = { };
data[4] = {
name: 'Балашиха', name: 'Балашиха',
text: 'Балашиха<br/>8-925-006-63-21<br/><a href="https://www.yescenter.ru/schools/balashikha/">страница школы</a><br/>ш. Энтузиастов, д. 30, 3 этаж', text: 'Балашиха<br/>8-925-006-63-21<br/><a href="https://www.yescenter.ru/schools/balashikha/">страница школы</a><br/>ш. Энтузиастов, д. 30, 3 этаж',
coords: '37.935707,55.792882', coords: '37.935707,55.792882',
geodata:'ш. Энтузиастов, д. 30, 3 этаж' geodata: 'ш. Энтузиастов, д. 30, 3 этаж'
};data[5] = { };
data[5] = {
name: 'Подольск', name: 'Подольск',
text: 'Подольск<br/>8-925-006-63-18<br/><a href="https://www.yescenter.ru/schools/podolsk/">страница школы</a><br/>ул. 50 лет ВЛКСМ, д.16', text: 'Подольск<br/>8-925-006-63-18<br/><a href="https://www.yescenter.ru/schools/podolsk/">страница школы</a><br/>ул. 50 лет ВЛКСМ, д.16',
coords: '37.537173,55.42588', coords: '37.537173,55.42588',
geodata:'ул. 50 лет ВЛКСМ, д.16' geodata: 'ул. 50 лет ВЛКСМ, д.16'
};data[6] = { };
data[6] = {
name: 'Королев', name: 'Королев',
text: 'Королев<br/>8-925-006-63-17<br/><a href="https://www.yescenter.ru/schools/korolev/">страница школы</a><br/>ул. Карла Маркса, д.1а', text: 'Королев<br/>8-925-006-63-17<br/><a href="https://www.yescenter.ru/schools/korolev/">страница школы</a><br/>ул. Карла Маркса, д.1а',
coords: '37.820558,55.924837', coords: '37.820558,55.924837',
geodata:'ул. Карла Маркса, д.1а' geodata: 'ул. Карла Маркса, д.1а'
};data[7] = { };
data[7] = {
name: 'Пушкино', name: 'Пушкино',
text: 'Пушкино<br/>8-925-006-63-10<br/><a href="https://www.yescenter.ru/schools/pushkino/">страница школы</a><br/>ул. Чехова д.12, ТОЦ «ВИТ»', text: 'Пушкино<br/>8-925-006-63-10<br/><a href="https://www.yescenter.ru/schools/pushkino/">страница школы</a><br/>ул. Чехова д.12, ТОЦ «ВИТ»',
coords: '37.852029,56.008547', coords: '37.852029,56.008547',
geodata:'ул. Чехова д.12, ТОЦ «ВИТ»' geodata: 'ул. Чехова д.12, ТОЦ «ВИТ»'
};data[8] = { };
data[8] = {
name: 'Егорьевск', name: 'Егорьевск',
text: 'Егорьевск<br/>7-925-809-00-85<br/><a href="https://www.yescenter.ru/schools/egorievsk/">страница школы</a><br/>Откройте собственную школу YES в Егорьевске по франшизе Центра иностранных языков YES http://www.yescenter.ru/franchising/', text: 'Егорьевск<br/>7-925-809-00-85<br/><a href="https://www.yescenter.ru/schools/egorievsk/">страница школы</a><br/>Откройте собственную школу YES в Егорьевске по франшизе Центра иностранных языков YES http://www.yescenter.ru/franchising/',
coords: '39.025935,55.382419', coords: '39.025935,55.382419',
geodata:'Откройте собственную школу YES в Егорьевске по франшизе Центра иностранных языков YES http://www.yescenter.ru/franchising/' geodata: 'Откройте собственную школу YES в Егорьевске по франшизе Центра иностранных языков YES http://www.yescenter.ru/franchising/'
};data[9] = { };
data[9] = {
name: 'Солнцево', name: 'Солнцево',
text: 'Солнцево<br/>8-929-936-76-65<br/><a href="https://www.yescenter.ru/schools/solncevo/">страница школы</a><br/>ул. Солнцевский пр-т, д.6. корп.1', text: 'Солнцево<br/>8-929-936-76-65<br/><a href="https://www.yescenter.ru/schools/solncevo/">страница школы</a><br/>ул. Солнцевский пр-т, д.6. корп.1',
coords: '37.400153,55.653908', coords: '37.400153,55.653908',
geodata:'ул. Солнцевский пр-т, д.6. корп.1' geodata: 'ул. Солнцевский пр-т, д.6. корп.1'
};data[10] = { };
data[10] = {
name: 'Ховрино', name: 'Ховрино',
text: 'Ховрино<br/>8-925-800-73-43<br/><a href="https://www.yescenter.ru/schools/khovrino/">страница школы</a><br/>ул. Дыбенко, д.6', text: 'Ховрино<br/>8-925-800-73-43<br/><a href="https://www.yescenter.ru/schools/khovrino/">страница школы</a><br/>ул. Дыбенко, д.6',
coords: '37.485843,55.868435', coords: '37.485843,55.868435',
geodata:'ул. Дыбенко, д.6' geodata: 'ул. Дыбенко, д.6'
};data[11] = { };
data[11] = {
name: 'метро Павелецкая', name: 'метро Павелецкая',
text: 'метро Павелецкая<br/>8-495-984-97-10<br/><a href="https://www.yescenter.ru/schools/paveleckaya/">страница школы</a><br/>ул. Кожевническая, д. 7, стр.2, 2 этаж, офис 202', text: 'метро Павелецкая<br/>8-495-984-97-10<br/><a href="https://www.yescenter.ru/schools/paveleckaya/">страница школы</a><br/>ул. Кожевническая, д. 7, стр.2, 2 этаж, офис 202',
coords: '37.636635,55.719936', coords: '37.636635,55.719936',
geodata:'ул. Кожевническая, д. 7, стр.2, 2 этаж, офис 202' geodata: 'ул. Кожевническая, д. 7, стр.2, 2 этаж, офис 202'
};data[12] = { };
data[12] = {
name: 'Александров', name: 'Александров',
text: 'Александров<br/>8-900-590-88-90<br/><a href="https://www.yescenter.ru/schools/aleksandrov/">страница школы</a><br/>улица Свердлова, 34', text: 'Александров<br/>8-900-590-88-90<br/><a href="https://www.yescenter.ru/schools/aleksandrov/">страница школы</a><br/>улица Свердлова, 34',
coords: '38.719554,56.396653', coords: '38.719554,56.396653',
geodata:'улица Свердлова, 34' geodata: 'улица Свердлова, 34'
};data[13] = { };
data[13] = {
name: 'Тула', name: 'Тула',
text: 'Тула<br/>8-915-685-39-27<br/><a href="https://www.yescenter.ru/schools/tula/">страница школы</a><br/>ул. Арсенальная, 18', text: 'Тула<br/>8-915-685-39-27<br/><a href="https://www.yescenter.ru/schools/tula/">страница школы</a><br/>ул. Арсенальная, 18',
coords: '37.603702,54.212492', coords: '37.603702,54.212492',
geodata:'ул. Арсенальная, 18' geodata: 'ул. Арсенальная, 18'
};data[14] = { };
data[14] = {
name: 'метро Перово', name: 'метро Перово',
text: 'метро Перово<br/>8-499-755-56-16<br/><a href="https://www.yescenter.ru/schools/metro-perovo/">страница школы</a><br/>ул. Перовская д.66 корп. 7', text: 'метро Перово<br/>8-499-755-56-16<br/><a href="https://www.yescenter.ru/schools/metro-perovo/">страница школы</a><br/>ул. Перовская д.66 корп. 7',
coords: '37.804224,55.743461', coords: '37.804224,55.743461',
geodata:'ул. Перовская д.66 корп. 7' geodata: 'ул. Перовская д.66 корп. 7'
};data[15] = { };
data[15] = {
name: 'Санкт-Петербург', name: 'Санкт-Петербург',
text: 'Санкт-Петербург<br/>7-925-809-00-85<br/><a href="https://www.yescenter.ru/schools/sanktpeterburg/">страница школы</a><br/>Откройте собственную школу YES в Санкт-Петербурге по франшизе Центра иностранных языков YES http://www.yescenter.ru/franchising/', text: 'Санкт-Петербург<br/>7-925-809-00-85<br/><a href="https://www.yescenter.ru/schools/sanktpeterburg/">страница школы</a><br/>Откройте собственную школу YES в Санкт-Петербурге по франшизе Центра иностранных языков YES http://www.yescenter.ru/franchising/',
coords: '30.407847,59.956687', coords: '30.407847,59.956687',
geodata:'Откройте собственную школу YES в Санкт-Петербурге по франшизе Центра иностранных языков YES http://www.yescenter.ru/franchising/' geodata: 'Откройте собственную школу YES в Санкт-Петербурге по франшизе Центра иностранных языков YES http://www.yescenter.ru/franchising/'
};data[16] = { };
data[16] = {
name: 'Лыткарино', name: 'Лыткарино',
text: 'Лыткарино<br/>8-495-999-26-86<br/><a href="https://www.yescenter.ru/schools/lytkarino/">страница школы</a><br/>Советская, 14б', text: 'Лыткарино<br/>8-495-999-26-86<br/><a href="https://www.yescenter.ru/schools/lytkarino/">страница школы</a><br/>Советская, 14б',
coords: '37.902985,55.578508', coords: '37.902985,55.578508',
geodata:'Советская, 14б' geodata: 'Советская, 14б'
};data[17] = { };
data[17] = {
name: 'Волоколамск', name: 'Волоколамск',
text: 'Волоколамск<br/>8-926-138-34-44<br/><a href="https://www.yescenter.ru/schools/volokolamsk/">страница школы</a><br/>ул. Заводская, 23', text: 'Волоколамск<br/>8-926-138-34-44<br/><a href="https://www.yescenter.ru/schools/volokolamsk/">страница школы</a><br/>ул. Заводская, 23',
coords: '35.919882,56.007489', coords: '35.919882,56.007489',
geodata:'ул. Заводская, 23' geodata: 'ул. Заводская, 23'
}; };
myMap = new ymaps.Map("map", { myMap = new ymaps.Map("map", {
center: ((data[0]['coords'] !== undefined) ? fromString(data[0]['coords']) : fromString('37.609218,55.753559')), center: ((data[0]['coords'] !== undefined) ? fromString(data[0]['coords']) : fromString('37.609218,55.753559')),
...@@ -467,8 +514,10 @@ ...@@ -467,8 +514,10 @@
myMap.controls.remove('fullscreenControl'); myMap.controls.remove('fullscreenControl');
myMap.controls.remove('geolocationControl'); myMap.controls.remove('geolocationControl');
myMap.controls.remove('rulerControl'); myMap.controls.remove('rulerControl');
}; }
;
ymaps.ready(init); ymaps.ready(init);
</script> </script>
<script type="text/javascript" src="js/common.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file \ No newline at end of file
js/common.js
...@@ -129,13 +129,14 @@ var overlay = $('#overlay'); ...@@ -129,13 +129,14 @@ var overlay = $('#overlay');
$(overlay).click(function () { $(overlay).click(function () {
closemodal('callback'); closemodal('callback');
closemodal('bid'); closemodal('bid');
closemodal('success');
}); });
$('.ord1').click(function (e) { $('.ord1').click(function (e) {
e.preventDefault(); e.preventDefault();
callmodal('callback'); callmodal('callback');
}); });
$('.ord2, .ord3').click(function (e) { $('.ord2, .ord3, .ord2-1').click(function (e) {
e.preventDefault(); e.preventDefault();
callmodal('bid'); callmodal('bid');
}); });
...@@ -180,16 +181,21 @@ function time(number, type) { ...@@ -180,16 +181,21 @@ function time(number, type) {
return d.toLocaleTimeString().substr(0, 5); return d.toLocaleTimeString().substr(0, 5);
} }
$('#callback-form').submit(function(e){ $('#callback-form').submit(function (e) {
e.preventDefault(); e.preventDefault();
send('callback-form'); send('callback-form');
}); });
$('#order-form').submit(function(e){ $('#order-form').submit(function (e) {
e.preventDefault(); e.preventDefault();
closemodal('bid');
send('order-form'); send('order-form');
}); });
$('#footer-form').submit(function (e) {
e.preventDefault();
send('footer-form');
});
function send(form){ function send(form) {
$.ajax({ $.ajax({
url: '/handler.php', url: '/handler.php',
type: "POST", type: "POST",
...@@ -197,20 +203,109 @@ function send(form){ ...@@ -197,20 +203,109 @@ function send(form){
data: $("#" + form).serialize(), data: $("#" + form).serialize(),
success: function (response) { success: function (response) {
if (response.type == 'success_send') { if (response.type == 'success_send') {
$('#'+form).find('input').prop("disabled", true); closemodal('callback');
alert(response.text) closemodal('bid');
closemodal('success');
$("#" + form).find('input').prop("disabled", true);
callmodal('success');
} }
if (response.type == 'error_name') { if (response.type == 'error_name') {
alert(response.text)
} }
if (response.type == 'error_email') { if (response.type == 'error_email') {
alert(response.text) alert('Почта не соответствует шаблону')
} }
if (response.type == 'error_phone') { if (response.type == 'error_phone') {
alert(response.text)
} }
} }
}); });
} }
$(document).ready(function () {
$("#order-form").validate({
rules: {
name: {
required: true,
minlength: 3,
maxlength: 40
},
email: {
email: true,
required: true,
minlength: 2,
maxlength: 50
}
},
messages: {
name: {
required: "Напишите имя",
minlength: "",
maxlength: "",
},
email: {
email : " Некорректный адрес",
required: "Введите email",
minlength: "Введите email",
}
}
});
$("#callback-form").validate({
rules: {
phone: {
digits:true,
required: true,
minlength: 3,
maxlength: 40
}
},
messages: {
phone: {
required: "Напишите номер",
minlength: "",
maxlength: "",
digits: "Только цифры"
}
}
});
$("#footer-form").validate({
rules: {
name: {
required: true,
minlength: 3,
maxlength: 40
},
email: {
email: true,
required: true,
minlength: 2,
maxlength: 50
}
},
messages: {
name: {
required: "Напишите имя",
minlength: "",
maxlength: "",
},
email: {
email : "Некорректный адрес",
required: "Введите email",
minlength: "Введите email"
}
}
})
});
js/jquery.validate.js 0 → 100644
/*!
* jQuery Validation Plugin v1.16.1-pre
*
* https://jqueryvalidation.org/
*
* Copyright (c) 2017 Jörn Zaefferer
* Released under the MIT license
*/
(function( factory ) {
if ( typeof define === "function" && define.amd ) {
define( ["jquery"], factory );
} else if (typeof module === "object" && module.exports) {
module.exports = factory( require( "jquery" ) );
} else {
factory( jQuery );
}
}(function( $ ) {
$.extend( $.fn, {
// https://jqueryvalidation.org/validate/
validate: function( options ) {
// If nothing is selected, return nothing; can't chain anyway
if ( !this.length ) {
if ( options && options.debug && window.console ) {
console.warn( "Nothing selected, can't validate, returning nothing." );
}
return;
}
// Check if a validator for this form was already created
var validator = $.data( this[ 0 ], "validator" );
if ( validator ) {
return validator;
}
// Add novalidate tag if HTML5.
this.attr( "novalidate", "novalidate" );
validator = new $.validator( options, this[ 0 ] );
$.data( this[ 0 ], "validator", validator );
if ( validator.settings.onsubmit ) {
this.on( "click.validate", ":submit", function( event ) {
if ( validator.settings.submitHandler ) {
validator.submitButton = event.currentTarget;
}
// Allow suppressing validation by adding a cancel class to the submit button
if ( $( this ).hasClass( "cancel" ) ) {
validator.cancelSubmit = true;
}
// Allow suppressing validation by adding the html5 formnovalidate attribute to the submit button
if ( $( this ).attr( "formnovalidate" ) !== undefined ) {
validator.cancelSubmit = true;
}
} );
// Validate the form on submit
this.on( "submit.validate", function( event ) {
if ( validator.settings.debug ) {
// Prevent form submit to be able to see console output
event.preventDefault();
}
function handle() {
var hidden, result;
if ( validator.settings.submitHandler ) {
if ( validator.submitButton ) {
// Insert a hidden input as a replacement for the missing submit button
hidden = $( "<input type='hidden'/>" )
.attr( "name", validator.submitButton.name )
.val( $( validator.submitButton ).val() )
.appendTo( validator.currentForm );
}
result = validator.settings.submitHandler.call( validator, validator.currentForm, event );
if ( validator.submitButton ) {
// And clean up afterwards; thanks to no-block-scope, hidden can be referenced
hidden.remove();
}
if ( result !== undefined ) {
return result;
}
return false;
}
return true;
}
// Prevent submit for invalid forms or custom submit handlers
if ( validator.cancelSubmit ) {
validator.cancelSubmit = false;
return handle();
}
if ( validator.form() ) {
if ( validator.pendingRequest ) {
validator.formSubmitted = true;
return false;
}
return handle();
} else {
validator.focusInvalid();
return false;
}
} );
}
return validator;
},
// https://jqueryvalidation.org/valid/
valid: function() {
var valid, validator, errorList;
if ( $( this[ 0 ] ).is( "form" ) ) {
valid = this.validate().form();
} else {
errorList = [];
valid = true;
validator = $( this[ 0 ].form ).validate();
this.each( function() {
valid = validator.element( this ) && valid;
if ( !valid ) {
errorList = errorList.concat( validator.errorList );
}
} );
validator.errorList = errorList;
}
return valid;
},
// https://jqueryvalidation.org/rules/
rules: function( command, argument ) {
var element = this[ 0 ],
settings, staticRules, existingRules, data, param, filtered;
// If nothing is selected, return empty object; can't chain anyway
if ( element == null ) {
return;
}
if ( !element.form && element.hasAttribute( "contenteditable" ) ) {
element.form = this.closest( "form" )[ 0 ];
element.name = this.attr( "name" );
}
if ( element.form == null ) {
return;
}
if ( command ) {
settings = $.data( element.form, "validator" ).settings;
staticRules = settings.rules;
existingRules = $.validator.staticRules( element );
switch ( command ) {
case "add":
$.extend( existingRules, $.validator.normalizeRule( argument ) );
// Remove messages from rules, but allow them to be set separately
delete existingRules.messages;
staticRules[ element.name ] = existingRules;
if ( argument.messages ) {
settings.messages[ element.name ] = $.extend( settings.messages[ element.name ], argument.messages );
}
break;
case "remove":
if ( !argument ) {
delete staticRules[ element.name ];
return existingRules;
}
filtered = {};
$.each( argument.split( /\s/ ), function( index, method ) {
filtered[ method ] = existingRules[ method ];
delete existingRules[ method ];
if ( method === "required" ) {
$( element ).removeAttr( "aria-required" );
}
} );
return filtered;
}
}
data = $.validator.normalizeRules(
$.extend(
{},
$.validator.classRules( element ),
$.validator.attributeRules( element ),
$.validator.dataRules( element ),
$.validator.staticRules( element )
), element );
// Make sure required is at front
if ( data.required ) {
param = data.required;
delete data.required;
data = $.extend( { required: param }, data );
$( element ).attr( "aria-required", "true" );
}
// Make sure remote is at back
if ( data.remote ) {
param = data.remote;
delete data.remote;
data = $.extend( data, { remote: param } );
}
return data;
}
} );
// Custom selectors
$.extend( $.expr.pseudos || $.expr[ ":" ], { // '|| $.expr[ ":" ]' here enables backwards compatibility to jQuery 1.7. Can be removed when dropping jQ 1.7.x support
// https://jqueryvalidation.org/blank-selector/
blank: function( a ) {
return !$.trim( "" + $( a ).val() );
},
// https://jqueryvalidation.org/filled-selector/
filled: function( a ) {
var val = $( a ).val();
return val !== null && !!$.trim( "" + val );
},
// https://jqueryvalidation.org/unchecked-selector/
unchecked: function( a ) {
return !$( a ).prop( "checked" );
}
} );
// Constructor for validator
$.validator = function( options, form ) {
this.settings = $.extend( true, {}, $.validator.defaults, options );
this.currentForm = form;
this.init();
};
// https://jqueryvalidation.org/jQuery.validator.format/
$.validator.format = function( source, params ) {
if ( arguments.length === 1 ) {
return function() {
var args = $.makeArray( arguments );
args.unshift( source );
return $.validator.format.apply( this, args );
};
}
if ( params === undefined ) {
return source;
}
if ( arguments.length > 2 && params.constructor !== Array ) {
params = $.makeArray( arguments ).slice( 1 );
}
if ( params.constructor !== Array ) {
params = [ params ];
}
$.each( params, function( i, n ) {
source = source.replace( new RegExp( "\\{" + i + "\\}", "g" ), function() {
return n;
} );
} );
return source;
};
$.extend( $.validator, {
defaults: {
messages: {},
groups: {},
rules: {},
errorClass: "error",
pendingClass: "pending",
validClass: "valid",
errorElement: "label",
focusCleanup: false,
focusInvalid: true,
errorContainer: $( [] ),
errorLabelContainer: $( [] ),
onsubmit: true,
ignore: ":hidden",
ignoreTitle: false,
onfocusin: function( element ) {
this.lastActive = element;
// Hide error label and remove error class on focus if enabled
if ( this.settings.focusCleanup ) {
if ( this.settings.unhighlight ) {
this.settings.unhighlight.call( this, element, this.settings.errorClass, this.settings.validClass );
}
this.hideThese( this.errorsFor( element ) );
}
},
onfocusout: function( element ) {
if ( !this.checkable( element ) && ( element.name in this.submitted || !this.optional( element ) ) ) {
this.element( element );
}
},
onkeyup: function( element, event ) {
// Avoid revalidate the field when pressing one of the following keys
// Shift => 16
// Ctrl => 17
// Alt => 18
// Caps lock => 20
// End => 35
// Home => 36
// Left arrow => 37
// Up arrow => 38
// Right arrow => 39
// Down arrow => 40
// Insert => 45
// Num lock => 144
// AltGr key => 225
var excludedKeys = [
16, 17, 18, 20, 35, 36, 37,
38, 39, 40, 45, 144, 225
];
if ( event.which === 9 && this.elementValue( element ) === "" || $.inArray( event.keyCode, excludedKeys ) !== -1 ) {
return;
} else if ( element.name in this.submitted || element.name in this.invalid ) {
this.element( element );
}
},
onclick: function( element ) {
// Click on selects, radiobuttons and checkboxes
if ( element.name in this.submitted ) {
this.element( element );
// Or option elements, check parent select in that case
} else if ( element.parentNode.name in this.submitted ) {
this.element( element.parentNode );
}
},
highlight: function( element, errorClass, validClass ) {
if ( element.type === "radio" ) {
this.findByName( element.name ).addClass( errorClass ).removeClass( validClass );
} else {
$( element ).addClass( errorClass ).removeClass( validClass );
}
},
unhighlight: function( element, errorClass, validClass ) {
if ( element.type === "radio" ) {
this.findByName( element.name ).removeClass( errorClass ).addClass( validClass );
} else {
$( element ).removeClass( errorClass ).addClass( validClass );
}
}
},
// https://jqueryvalidation.org/jQuery.validator.setDefaults/
setDefaults: function( settings ) {
$.extend( $.validator.defaults, settings );
},
messages: {
required: "This field is required.",
remote: "Please fix this field.",
email: "Please enter a valid email address.",
url: "Please enter a valid URL.",
date: "Please enter a valid date.",
dateISO: "Please enter a valid date (ISO).",
number: "Please enter a valid number.",
digits: "Please enter only digits.",
equalTo: "Please enter the same value again.",
maxlength: $.validator.format( "Please enter no more than {0} characters." ),
minlength: $.validator.format( "Please enter at least {0} characters." ),
rangelength: $.validator.format( "Please enter a value between {0} and {1} characters long." ),
range: $.validator.format( "Please enter a value between {0} and {1}." ),
max: $.validator.format( "Please enter a value less than or equal to {0}." ),
min: $.validator.format( "Please enter a value greater than or equal to {0}." ),
step: $.validator.format( "Please enter a multiple of {0}." )
},
autoCreateRanges: false,
prototype: {
init: function() {
this.labelContainer = $( this.settings.errorLabelContainer );
this.errorContext = this.labelContainer.length && this.labelContainer || $( this.currentForm );
this.containers = $( this.settings.errorContainer ).add( this.settings.errorLabelContainer );
this.submitted = {};
this.valueCache = {};
this.pendingRequest = 0;
this.pending = {};
this.invalid = {};
this.reset();
var groups = ( this.groups = {} ),
rules;
$.each( this.settings.groups, function( key, value ) {
if ( typeof value === "string" ) {
value = value.split( /\s/ );
}
$.each( value, function( index, name ) {
groups[ name ] = key;
} );
} );
rules = this.settings.rules;
$.each( rules, function( key, value ) {
rules[ key ] = $.validator.normalizeRule( value );
} );
function delegate( event ) {
// Set form expando on contenteditable
if ( !this.form && this.hasAttribute( "contenteditable" ) ) {
this.form = $( this ).closest( "form" )[ 0 ];
this.name = $( this ).attr( "name" );
}
var validator = $.data( this.form, "validator" ),
eventType = "on" + event.type.replace( /^validate/, "" ),
settings = validator.settings;
if ( settings[ eventType ] && !$( this ).is( settings.ignore ) ) {
settings[ eventType ].call( validator, this, event );
}
}
$( this.currentForm )
.on( "focusin.validate focusout.validate keyup.validate",
":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'], " +
"[type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], " +
"[type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'], " +
"[type='radio'], [type='checkbox'], [contenteditable], [type='button']", delegate )
// Support: Chrome, oldIE
// "select" is provided as event.target when clicking a option
.on( "click.validate", "select, option, [type='radio'], [type='checkbox']", delegate );
if ( this.settings.invalidHandler ) {
$( this.currentForm ).on( "invalid-form.validate", this.settings.invalidHandler );
}
// Add aria-required to any Static/Data/Class required fields before first validation
// Screen readers require this attribute to be present before the initial submission https://www.w3.org/TR/WCAG-TECHS/ARIA2.html
$( this.currentForm ).find( "[required], [data-rule-required], .required" ).attr( "aria-required", "true" );
},
// https://jqueryvalidation.org/Validator.form/
form: function() {
this.checkForm();
$.extend( this.submitted, this.errorMap );
this.invalid = $.extend( {}, this.errorMap );
if ( !this.valid() ) {
$( this.currentForm ).triggerHandler( "invalid-form", [ this ] );
}
this.showErrors();
return this.valid();
},
checkForm: function() {
this.prepareForm();
for ( var i = 0, elements = ( this.currentElements = this.elements() ); elements[ i ]; i++ ) {
this.check( elements[ i ] );
}
return this.valid();
},
// https://jqueryvalidation.org/Validator.element/
element: function( element ) {
var cleanElement = this.clean( element ),
checkElement = this.validationTargetFor( cleanElement ),
v = this,
result = true,
rs, group;
if ( checkElement === undefined ) {
delete this.invalid[ cleanElement.name ];
} else {
this.prepareElement( checkElement );
this.currentElements = $( checkElement );
// If this element is grouped, then validate all group elements already
// containing a value
group = this.groups[ checkElement.name ];
if ( group ) {
$.each( this.groups, function( name, testgroup ) {
if ( testgroup === group && name !== checkElement.name ) {
cleanElement = v.validationTargetFor( v.clean( v.findByName( name ) ) );
if ( cleanElement && cleanElement.name in v.invalid ) {
v.currentElements.push( cleanElement );
result = v.check( cleanElement ) && result;
}
}
} );
}
rs = this.check( checkElement ) !== false;
result = result && rs;
if ( rs ) {
this.invalid[ checkElement.name ] = false;
} else {
this.invalid[ checkElement.name ] = true;
}
if ( !this.numberOfInvalids() ) {
// Hide error containers on last error
this.toHide = this.toHide.add( this.containers );
}
this.showErrors();
// Add aria-invalid status for screen readers
$( element ).attr( "aria-invalid", !rs );
}
return result;
},
// https://jqueryvalidation.org/Validator.showErrors/
showErrors: function( errors ) {
if ( errors ) {
var validator = this;
// Add items to error list and map
$.extend( this.errorMap, errors );
this.errorList = $.map( this.errorMap, function( message, name ) {
return {
message: message,
element: validator.findByName( name )[ 0 ]
};
} );
// Remove items from success list
this.successList = $.grep( this.successList, function( element ) {
return !( element.name in errors );
} );
}
if ( this.settings.showErrors ) {
this.settings.showErrors.call( this, this.errorMap, this.errorList );
} else {
this.defaultShowErrors();
}
},
// https://jqueryvalidation.org/Validator.resetForm/
resetForm: function() {
if ( $.fn.resetForm ) {
$( this.currentForm ).resetForm();
}
this.invalid = {};
this.submitted = {};
this.prepareForm();
this.hideErrors();
var elements = this.elements()
.removeData( "previousValue" )
.removeAttr( "aria-invalid" );
this.resetElements( elements );
},
resetElements: function( elements ) {
var i;
if ( this.settings.unhighlight ) {
for ( i = 0; elements[ i ]; i++ ) {
this.settings.unhighlight.call( this, elements[ i ],
this.settings.errorClass, "" );
this.findByName( elements[ i ].name ).removeClass( this.settings.validClass );
}
} else {
elements
.removeClass( this.settings.errorClass )
.removeClass( this.settings.validClass );
}
},
numberOfInvalids: function() {
return this.objectLength( this.invalid );
},
objectLength: function( obj ) {
/* jshint unused: false */
var count = 0,
i;
for ( i in obj ) {
// This check allows counting elements with empty error
// message as invalid elements
if ( obj[ i ] !== undefined && obj[ i ] !== null && obj[ i ] !== false ) {
count++;
}
}
return count;
},
hideErrors: function() {
this.hideThese( this.toHide );
},
hideThese: function( errors ) {
errors.not( this.containers ).text( "" );
this.addWrapper( errors ).hide();
},
valid: function() {
return this.size() === 0;
},
size: function() {
return this.errorList.length;
},
focusInvalid: function() {
if ( this.settings.focusInvalid ) {
try {
$( this.findLastActive() || this.errorList.length && this.errorList[ 0 ].element || [] )
.filter( ":visible" )
.focus()
// Manually trigger focusin event; without it, focusin handler isn't called, findLastActive won't have anything to find
.trigger( "focusin" );
} catch ( e ) {
// Ignore IE throwing errors when focusing hidden elements
}
}
},
findLastActive: function() {
var lastActive = this.lastActive;
return lastActive && $.grep( this.errorList, function( n ) {
return n.element.name === lastActive.name;
} ).length === 1 && lastActive;
},
elements: function() {
var validator = this,
rulesCache = {};
// Select all valid inputs inside the form (no submit or reset buttons)
return $( this.currentForm )
.find( "input, select, textarea, [contenteditable]" )
.not( ":submit, :reset, :image, :disabled" )
.not( this.settings.ignore )
.filter( function() {
var name = this.name || $( this ).attr( "name" ); // For contenteditable
if ( !name && validator.settings.debug && window.console ) {
console.error( "%o has no name assigned", this );
}
// Set form expando on contenteditable
if ( this.hasAttribute( "contenteditable" ) ) {
this.form = $( this ).closest( "form" )[ 0 ];
this.name = name;
}
// Select only the first element for each name, and only those with rules specified
if ( name in rulesCache || !validator.objectLength( $( this ).rules() ) ) {
return false;
}
rulesCache[ name ] = true;
return true;
} );
},
clean: function( selector ) {
return $( selector )[ 0 ];
},
errors: function() {
var errorClass = this.settings.errorClass.split( " " ).join( "." );
return $( this.settings.errorElement + "." + errorClass, this.errorContext );
},
resetInternals: function() {
this.successList = [];
this.errorList = [];
this.errorMap = {};
this.toShow = $( [] );
this.toHide = $( [] );
},
reset: function() {
this.resetInternals();
this.currentElements = $( [] );
},
prepareForm: function() {
this.reset();
this.toHide = this.errors().add( this.containers );
},
prepareElement: function( element ) {
this.reset();
this.toHide = this.errorsFor( element );
},
elementValue: function( element ) {
var $element = $( element ),
type = element.type,
val, idx;
if ( type === "radio" || type === "checkbox" ) {
return this.findByName( element.name ).filter( ":checked" ).val();
} else if ( type === "number" && typeof element.validity !== "undefined" ) {
return element.validity.badInput ? "NaN" : $element.val();
}
if ( element.hasAttribute( "contenteditable" ) ) {
val = $element.text();
} else {
val = $element.val();
}
if ( type === "file" ) {
// Modern browser (chrome & safari)
if ( val.substr( 0, 12 ) === "C:\\fakepath\\" ) {
return val.substr( 12 );
}
// Legacy browsers
// Unix-based path
idx = val.lastIndexOf( "/" );
if ( idx >= 0 ) {
return val.substr( idx + 1 );
}
// Windows-based path
idx = val.lastIndexOf( "\\" );
if ( idx >= 0 ) {
return val.substr( idx + 1 );
}
// Just the file name
return val;
}
if ( typeof val === "string" ) {
return val.replace( /\r/g, "" );
}
return val;
},
check: function( element ) {
element = this.validationTargetFor( this.clean( element ) );
var rules = $( element ).rules(),
rulesCount = $.map( rules, function( n, i ) {
return i;
} ).length,
dependencyMismatch = false,
val = this.elementValue( element ),
result, method, rule, normalizer;
// Prioritize the local normalizer defined for this element over the global one
// if the former exists, otherwise user the global one in case it exists.
if ( typeof rules.normalizer === "function" ) {
normalizer = rules.normalizer;
} else if ( typeof this.settings.normalizer === "function" ) {
normalizer = this.settings.normalizer;
}
// If normalizer is defined, then call it to retreive the changed value instead
// of using the real one.
// Note that `this` in the normalizer is `element`.
if ( normalizer ) {
val = normalizer.call( element, val );
if ( typeof val !== "string" ) {
throw new TypeError( "The normalizer should return a string value." );
}
// Delete the normalizer from rules to avoid treating it as a pre-defined method.
delete rules.normalizer;
}
for ( method in rules ) {
rule = { method: method, parameters: rules[ method ] };
try {
result = $.validator.methods[ method ].call( this, val, element, rule.parameters );
// If a method indicates that the field is optional and therefore valid,
// don't mark it as valid when there are no other rules
if ( result === "dependency-mismatch" && rulesCount === 1 ) {
dependencyMismatch = true;
continue;
}
dependencyMismatch = false;
if ( result === "pending" ) {
this.toHide = this.toHide.not( this.errorsFor( element ) );
return;
}
if ( !result ) {
this.formatAndAdd( element, rule );
return false;
}
} catch ( e ) {
if ( this.settings.debug && window.console ) {
console.log( "Exception occurred when checking element " + element.id + ", check the '" + rule.method + "' method.", e );
}
if ( e instanceof TypeError ) {
e.message += ". Exception occurred when checking element " + element.id + ", check the '" + rule.method + "' method.";
}
throw e;
}
}
if ( dependencyMismatch ) {
return;
}
if ( this.objectLength( rules ) ) {
this.successList.push( element );
}
return true;
},
// Return the custom message for the given element and validation method
// specified in the element's HTML5 data attribute
// return the generic message if present and no method specific message is present
customDataMessage: function( element, method ) {
return $( element ).data( "msg" + method.charAt( 0 ).toUpperCase() +
method.substring( 1 ).toLowerCase() ) || $( element ).data( "msg" );
},
// Return the custom message for the given element name and validation method
customMessage: function( name, method ) {
var m = this.settings.messages[ name ];
return m && ( m.constructor === String ? m : m[ method ] );
},
// Return the first defined argument, allowing empty strings
findDefined: function() {
for ( var i = 0; i < arguments.length; i++ ) {
if ( arguments[ i ] !== undefined ) {
return arguments[ i ];
}
}
return undefined;
},
// The second parameter 'rule' used to be a string, and extended to an object literal
// of the following form:
// rule = {
// method: "method name",
// parameters: "the given method parameters"
// }
//
// The old behavior still supported, kept to maintain backward compatibility with
// old code, and will be removed in the next major release.
defaultMessage: function( element, rule ) {
if ( typeof rule === "string" ) {
rule = { method: rule };
}
var message = this.findDefined(
this.customMessage( element.name, rule.method ),
this.customDataMessage( element, rule.method ),
// 'title' is never undefined, so handle empty string as undefined
!this.settings.ignoreTitle && element.title || undefined,
$.validator.messages[ rule.method ],
"<strong>Warning: No message defined for " + element.name + "</strong>"
),
theregex = /\$?\{(\d+)\}/g;
if ( typeof message === "function" ) {
message = message.call( this, rule.parameters, element );
} else if ( theregex.test( message ) ) {
message = $.validator.format( message.replace( theregex, "{$1}" ), rule.parameters );
}
return message;
},
formatAndAdd: function( element, rule ) {
var message = this.defaultMessage( element, rule );
this.errorList.push( {
message: message,
element: element,
method: rule.method
} );
this.errorMap[ element.name ] = message;
this.submitted[ element.name ] = message;
},
addWrapper: function( toToggle ) {
if ( this.settings.wrapper ) {
toToggle = toToggle.add( toToggle.parent( this.settings.wrapper ) );
}
return toToggle;
},
defaultShowErrors: function() {
var i, elements, error;
for ( i = 0; this.errorList[ i ]; i++ ) {
error = this.errorList[ i ];
if ( this.settings.highlight ) {
this.settings.highlight.call( this, error.element, this.settings.errorClass, this.settings.validClass );
}
this.showLabel( error.element, error.message );
}
if ( this.errorList.length ) {
this.toShow = this.toShow.add( this.containers );
}
if ( this.settings.success ) {
for ( i = 0; this.successList[ i ]; i++ ) {
this.showLabel( this.successList[ i ] );
}
}
if ( this.settings.unhighlight ) {
for ( i = 0, elements = this.validElements(); elements[ i ]; i++ ) {
this.settings.unhighlight.call( this, elements[ i ], this.settings.errorClass, this.settings.validClass );
}
}
this.toHide = this.toHide.not( this.toShow );
this.hideErrors();
this.addWrapper( this.toShow ).show();
},
validElements: function() {
return this.currentElements.not( this.invalidElements() );
},
invalidElements: function() {
return $( this.errorList ).map( function() {
return this.element;
} );
},
showLabel: function( element, message ) {
var place, group, errorID, v,
error = this.errorsFor( element ),
elementID = this.idOrName( element ),
describedBy = $( element ).attr( "aria-describedby" );
if ( error.length ) {
// Refresh error/success class
error.removeClass( this.settings.validClass ).addClass( this.settings.errorClass );
// Replace message on existing label
error.html( message );
} else {
// Create error element
error = $( "<" + this.settings.errorElement + ">" )
.attr( "id", elementID + "-error" )
.addClass( this.settings.errorClass )
.html( message || "" );
// Maintain reference to the element to be placed into the DOM
place = error;
if ( this.settings.wrapper ) {
// Make sure the element is visible, even in IE
// actually showing the wrapped element is handled elsewhere
place = error.hide().show().wrap( "<" + this.settings.wrapper + "/>" ).parent();
}
if ( this.labelContainer.length ) {
this.labelContainer.append( place );
} else if ( this.settings.errorPlacement ) {
this.settings.errorPlacement.call( this, place, $( element ) );
} else {
place.insertAfter( element );
}
// Link error back to the element
if ( error.is( "label" ) ) {
// If the error is a label, then associate using 'for'
error.attr( "for", elementID );
// If the element is not a child of an associated label, then it's necessary
// to explicitly apply aria-describedby
} else if ( error.parents( "label[for='" + this.escapeCssMeta( elementID ) + "']" ).length === 0 ) {
errorID = error.attr( "id" );
// Respect existing non-error aria-describedby
if ( !describedBy ) {
describedBy = errorID;
} else if ( !describedBy.match( new RegExp( "\\b" + this.escapeCssMeta( errorID ) + "\\b" ) ) ) {
// Add to end of list if not already present
describedBy += " " + errorID;
}
$( element ).attr( "aria-describedby", describedBy );
// If this element is grouped, then assign to all elements in the same group
group = this.groups[ element.name ];
if ( group ) {
v = this;
$.each( v.groups, function( name, testgroup ) {
if ( testgroup === group ) {
$( "[name='" + v.escapeCssMeta( name ) + "']", v.currentForm )
.attr( "aria-describedby", error.attr( "id" ) );
}
} );
}
}
}
if ( !message && this.settings.success ) {
error.text( "" );
if ( typeof this.settings.success === "string" ) {
error.addClass( this.settings.success );
} else {
this.settings.success( error, element );
}
}
this.toShow = this.toShow.add( error );
},
errorsFor: function( element ) {
var name = this.escapeCssMeta( this.idOrName( element ) ),
describer = $( element ).attr( "aria-describedby" ),
selector = "label[for='" + name + "'], label[for='" + name + "'] *";
// 'aria-describedby' should directly reference the error element
if ( describer ) {
selector = selector + ", #" + this.escapeCssMeta( describer )
.replace( /\s+/g, ", #" );
}
return this
.errors()
.filter( selector );
},
// See https://api.jquery.com/category/selectors/, for CSS
// meta-characters that should be escaped in order to be used with JQuery
// as a literal part of a name/id or any selector.
escapeCssMeta: function( string ) {
return string.replace( /([\\!"#$%&'()*+,./:;<=>?@\[\]^`{|}~])/g, "\\$1" );
},
idOrName: function( element ) {
return this.groups[ element.name ] || ( this.checkable( element ) ? element.name : element.id || element.name );
},
validationTargetFor: function( element ) {
// If radio/checkbox, validate first element in group instead
if ( this.checkable( element ) ) {
element = this.findByName( element.name );
}
// Always apply ignore filter
return $( element ).not( this.settings.ignore )[ 0 ];
},
checkable: function( element ) {
return ( /radio|checkbox/i ).test( element.type );
},
findByName: function( name ) {
return $( this.currentForm ).find( "[name='" + this.escapeCssMeta( name ) + "']" );
},
getLength: function( value, element ) {
switch ( element.nodeName.toLowerCase() ) {
case "select":
return $( "option:selected", element ).length;
case "input":
if ( this.checkable( element ) ) {
return this.findByName( element.name ).filter( ":checked" ).length;
}
}
return value.length;
},
depend: function( param, element ) {
return this.dependTypes[ typeof param ] ? this.dependTypes[ typeof param ]( param, element ) : true;
},
dependTypes: {
"boolean": function( param ) {
return param;
},
"string": function( param, element ) {
return !!$( param, element.form ).length;
},
"function": function( param, element ) {
return param( element );
}
},
optional: function( element ) {
var val = this.elementValue( element );
return !$.validator.methods.required.call( this, val, element ) && "dependency-mismatch";
},
startRequest: function( element ) {
if ( !this.pending[ element.name ] ) {
this.pendingRequest++;
$( element ).addClass( this.settings.pendingClass );
this.pending[ element.name ] = true;
}
},
stopRequest: function( element, valid ) {
this.pendingRequest--;
// Sometimes synchronization fails, make sure pendingRequest is never < 0
if ( this.pendingRequest < 0 ) {
this.pendingRequest = 0;
}
delete this.pending[ element.name ];
$( element ).removeClass( this.settings.pendingClass );
if ( valid && this.pendingRequest === 0 && this.formSubmitted && this.form() ) {
$( this.currentForm ).submit();
this.formSubmitted = false;
} else if ( !valid && this.pendingRequest === 0 && this.formSubmitted ) {
$( this.currentForm ).triggerHandler( "invalid-form", [ this ] );
this.formSubmitted = false;
}
},
previousValue: function( element, method ) {
method = typeof method === "string" && method || "remote";
return $.data( element, "previousValue" ) || $.data( element, "previousValue", {
old: null,
valid: true,
message: this.defaultMessage( element, { method: method } )
} );
},
// Cleans up all forms and elements, removes validator-specific events
destroy: function() {
this.resetForm();
$( this.currentForm )
.off( ".validate" )
.removeData( "validator" )
.find( ".validate-equalTo-blur" )
.off( ".validate-equalTo" )
.removeClass( "validate-equalTo-blur" );
}
},
classRuleSettings: {
required: { required: true },
email: { email: true },
url: { url: true },
date: { date: true },
dateISO: { dateISO: true },
number: { number: true },
digits: { digits: true },
creditcard: { creditcard: true }
},
addClassRules: function( className, rules ) {
if ( className.constructor === String ) {
this.classRuleSettings[ className ] = rules;
} else {
$.extend( this.classRuleSettings, className );
}
},
classRules: function( element ) {
var rules = {},
classes = $( element ).attr( "class" );
if ( classes ) {
$.each( classes.split( " " ), function() {
if ( this in $.validator.classRuleSettings ) {
$.extend( rules, $.validator.classRuleSettings[ this ] );
}
} );
}
return rules;
},
normalizeAttributeRule: function( rules, type, method, value ) {
// Convert the value to a number for number inputs, and for text for backwards compability
// allows type="date" and others to be compared as strings
if ( /min|max|step/.test( method ) && ( type === null || /number|range|text/.test( type ) ) ) {
value = Number( value );
// Support Opera Mini, which returns NaN for undefined minlength
if ( isNaN( value ) ) {
value = undefined;
}
}
if ( value || value === 0 ) {
rules[ method ] = value;
} else if ( type === method && type !== "range" ) {
// Exception: the jquery validate 'range' method
// does not test for the html5 'range' type
rules[ method ] = true;
}
},
attributeRules: function( element ) {
var rules = {},
$element = $( element ),
type = element.getAttribute( "type" ),
method, value;
for ( method in $.validator.methods ) {
// Support for <input required> in both html5 and older browsers
if ( method === "required" ) {
value = element.getAttribute( method );
// Some browsers return an empty string for the required attribute
// and non-HTML5 browsers might have required="" markup
if ( value === "" ) {
value = true;
}
// Force non-HTML5 browsers to return bool
value = !!value;
} else {
value = $element.attr( method );
}
this.normalizeAttributeRule( rules, type, method, value );
}
// 'maxlength' may be returned as -1, 2147483647 ( IE ) and 524288 ( safari ) for text inputs
if ( rules.maxlength && /-1|2147483647|524288/.test( rules.maxlength ) ) {
delete rules.maxlength;
}
return rules;
},
dataRules: function( element ) {
var rules = {},
$element = $( element ),
type = element.getAttribute( "type" ),
method, value;
for ( method in $.validator.methods ) {
value = $element.data( "rule" + method.charAt( 0 ).toUpperCase() + method.substring( 1 ).toLowerCase() );
this.normalizeAttributeRule( rules, type, method, value );
}
return rules;
},
staticRules: function( element ) {
var rules = {},
validator = $.data( element.form, "validator" );
if ( validator.settings.rules ) {
rules = $.validator.normalizeRule( validator.settings.rules[ element.name ] ) || {};
}
return rules;
},
normalizeRules: function( rules, element ) {
// Handle dependency check
$.each( rules, function( prop, val ) {
// Ignore rule when param is explicitly false, eg. required:false
if ( val === false ) {
delete rules[ prop ];
return;
}
if ( val.param || val.depends ) {
var keepRule = true;
switch ( typeof val.depends ) {
case "string":
keepRule = !!$( val.depends, element.form ).length;
break;
case "function":
keepRule = val.depends.call( element, element );
break;
}
if ( keepRule ) {
rules[ prop ] = val.param !== undefined ? val.param : true;
} else {
$.data( element.form, "validator" ).resetElements( $( element ) );
delete rules[ prop ];
}
}
} );
// Evaluate parameters
$.each( rules, function( rule, parameter ) {
rules[ rule ] = $.isFunction( parameter ) && rule !== "normalizer" ? parameter( element ) : parameter;
} );
// Clean number parameters
$.each( [ "minlength", "maxlength" ], function() {
if ( rules[ this ] ) {
rules[ this ] = Number( rules[ this ] );
}
} );
$.each( [ "rangelength", "range" ], function() {
var parts;
if ( rules[ this ] ) {
if ( $.isArray( rules[ this ] ) ) {
rules[ this ] = [ Number( rules[ this ][ 0 ] ), Number( rules[ this ][ 1 ] ) ];
} else if ( typeof rules[ this ] === "string" ) {
parts = rules[ this ].replace( /[\[\]]/g, "" ).split( /[\s,]+/ );
rules[ this ] = [ Number( parts[ 0 ] ), Number( parts[ 1 ] ) ];
}
}
} );
if ( $.validator.autoCreateRanges ) {
// Auto-create ranges
if ( rules.min != null && rules.max != null ) {
rules.range = [ rules.min, rules.max ];
delete rules.min;
delete rules.max;
}
if ( rules.minlength != null && rules.maxlength != null ) {
rules.rangelength = [ rules.minlength, rules.maxlength ];
delete rules.minlength;
delete rules.maxlength;
}
}
return rules;
},
// Converts a simple string to a {string: true} rule, e.g., "required" to {required:true}
normalizeRule: function( data ) {
if ( typeof data === "string" ) {
var transformed = {};
$.each( data.split( /\s/ ), function() {
transformed[ this ] = true;
} );
data = transformed;
}
return data;
},
// https://jqueryvalidation.org/jQuery.validator.addMethod/
addMethod: function( name, method, message ) {
$.validator.methods[ name ] = method;
$.validator.messages[ name ] = message !== undefined ? message : $.validator.messages[ name ];
if ( method.length < 3 ) {
$.validator.addClassRules( name, $.validator.normalizeRule( name ) );
}
},
// https://jqueryvalidation.org/jQuery.validator.methods/
methods: {
// https://jqueryvalidation.org/required-method/
required: function( value, element, param ) {
// Check if dependency is met
if ( !this.depend( param, element ) ) {
return "dependency-mismatch";
}
if ( element.nodeName.toLowerCase() === "select" ) {
// Could be an array for select-multiple or a string, both are fine this way
var val = $( element ).val();
return val && val.length > 0;
}
if ( this.checkable( element ) ) {
return this.getLength( value, element ) > 0;
}
return value.length > 0;
},
// https://jqueryvalidation.org/email-method/
email: function( value, element ) {
// From https://html.spec.whatwg.org/multipage/forms.html#valid-e-mail-address
// Retrieved 2014-01-14
// If you have a problem with this implementation, report a bug against the above spec
// Or use custom methods to implement your own email validation
return this.optional( element ) || /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test( value );
},
// https://jqueryvalidation.org/url-method/
url: function( value, element ) {
// Copyright (c) 2010-2013 Diego Perini, MIT licensed
// https://gist.github.com/dperini/729294
// see also https://mathiasbynens.be/demo/url-regex
// modified to allow protocol-relative URLs
return this.optional( element ) || /^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})).?)(?::\d{2,5})?(?:[/?#]\S*)?$/i.test( value );
},
// https://jqueryvalidation.org/date-method/
date: function( value, element ) {
return this.optional( element ) || !/Invalid|NaN/.test( new Date( value ).toString() );
},
// https://jqueryvalidation.org/dateISO-method/
dateISO: function( value, element ) {
return this.optional( element ) || /^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test( value );
},
// https://jqueryvalidation.org/number-method/
number: function( value, element ) {
return this.optional( element ) || /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test( value );
},
// https://jqueryvalidation.org/digits-method/
digits: function( value, element ) {
return this.optional( element ) || /^\d+$/.test( value );
},
// https://jqueryvalidation.org/minlength-method/
minlength: function( value, element, param ) {
var length = $.isArray( value ) ? value.length : this.getLength( value, element );
return this.optional( element ) || length >= param;
},
// https://jqueryvalidation.org/maxlength-method/
maxlength: function( value, element, param ) {
var length = $.isArray( value ) ? value.length : this.getLength( value, element );
return this.optional( element ) || length <= param;
},
// https://jqueryvalidation.org/rangelength-method/
rangelength: function( value, element, param ) {
var length = $.isArray( value ) ? value.length : this.getLength( value, element );
return this.optional( element ) || ( length >= param[ 0 ] && length <= param[ 1 ] );
},
// https://jqueryvalidation.org/min-method/
min: function( value, element, param ) {
return this.optional( element ) || value >= param;
},
// https://jqueryvalidation.org/max-method/
max: function( value, element, param ) {
return this.optional( element ) || value <= param;
},
// https://jqueryvalidation.org/range-method/
range: function( value, element, param ) {
return this.optional( element ) || ( value >= param[ 0 ] && value <= param[ 1 ] );
},
// https://jqueryvalidation.org/step-method/
step: function( value, element, param ) {
var type = $( element ).attr( "type" ),
errorMessage = "Step attribute on input type " + type + " is not supported.",
supportedTypes = [ "text", "number", "range" ],
re = new RegExp( "\\b" + type + "\\b" ),
notSupported = type && !re.test( supportedTypes.join() ),
decimalPlaces = function( num ) {
var match = ( "" + num ).match( /(?:\.(\d+))?$/ );
if ( !match ) {
return 0;
}
// Number of digits right of decimal point.
return match[ 1 ] ? match[ 1 ].length : 0;
},
toInt = function( num ) {
return Math.round( num * Math.pow( 10, decimals ) );
},
valid = true,
decimals;
// Works only for text, number and range input types
// TODO find a way to support input types date, datetime, datetime-local, month, time and week
if ( notSupported ) {
throw new Error( errorMessage );
}
decimals = decimalPlaces( param );
// Value can't have too many decimals
if ( decimalPlaces( value ) > decimals || toInt( value ) % toInt( param ) !== 0 ) {
valid = false;
}
return this.optional( element ) || valid;
},
// https://jqueryvalidation.org/equalTo-method/
equalTo: function( value, element, param ) {
// Bind to the blur event of the target in order to revalidate whenever the target field is updated
var target = $( param );
if ( this.settings.onfocusout && target.not( ".validate-equalTo-blur" ).length ) {
target.addClass( "validate-equalTo-blur" ).on( "blur.validate-equalTo", function() {
$( element ).valid();
} );
}
return value === target.val();
},
// https://jqueryvalidation.org/remote-method/
remote: function( value, element, param, method ) {
if ( this.optional( element ) ) {
return "dependency-mismatch";
}
method = typeof method === "string" && method || "remote";
var previous = this.previousValue( element, method ),
validator, data, optionDataString;
if ( !this.settings.messages[ element.name ] ) {
this.settings.messages[ element.name ] = {};
}
previous.originalMessage = previous.originalMessage || this.settings.messages[ element.name ][ method ];
this.settings.messages[ element.name ][ method ] = previous.message;
param = typeof param === "string" && { url: param } || param;
optionDataString = $.param( $.extend( { data: value }, param.data ) );
if ( previous.old === optionDataString ) {
return previous.valid;
}
previous.old = optionDataString;
validator = this;
this.startRequest( element );
data = {};
data[ element.name ] = value;
$.ajax( $.extend( true, {
mode: "abort",
port: "validate" + element.name,
dataType: "json",
data: data,
context: validator.currentForm,
success: function( response ) {
var valid = response === true || response === "true",
errors, message, submitted;
validator.settings.messages[ element.name ][ method ] = previous.originalMessage;
if ( valid ) {
submitted = validator.formSubmitted;
validator.resetInternals();
validator.toHide = validator.errorsFor( element );
validator.formSubmitted = submitted;
validator.successList.push( element );
validator.invalid[ element.name ] = false;
validator.showErrors();
} else {
errors = {};
message = response || validator.defaultMessage( element, { method: method, parameters: value } );
errors[ element.name ] = previous.message = message;
validator.invalid[ element.name ] = true;
validator.showErrors( errors );
}
previous.valid = valid;
validator.stopRequest( element, valid );
}
}, param ) );
return "pending";
}
}
} );
// Ajax mode: abort
// usage: $.ajax({ mode: "abort"[, port: "uniqueport"]});
// if mode:"abort" is used, the previous request on that port (port can be undefined) is aborted via XMLHttpRequest.abort()
var pendingRequests = {},
ajax;
// Use a prefilter if available (1.5+)
if ( $.ajaxPrefilter ) {
$.ajaxPrefilter( function( settings, _, xhr ) {
var port = settings.port;
if ( settings.mode === "abort" ) {
if ( pendingRequests[ port ] ) {
pendingRequests[ port ].abort();
}
pendingRequests[ port ] = xhr;
}
} );
} else {
// Proxy ajax
ajax = $.ajax;
$.ajax = function( settings ) {
var mode = ( "mode" in settings ? settings : $.ajaxSettings ).mode,
port = ( "port" in settings ? settings : $.ajaxSettings ).port;
if ( mode === "abort" ) {
if ( pendingRequests[ port ] ) {
pendingRequests[ port ].abort();
}
pendingRequests[ port ] = ajax.apply( this, arguments );
return pendingRequests[ port ];
}
return ajax.apply( this, arguments );
};
}
return $;
}));
\ No newline at end of file \ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!