作者 李洪娟

合并分支 'lihongjuan' 到 'master'

Lihongjuan



查看合并请求 !9
... ... @@ -27,7 +27,7 @@
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="10.642858" vertical-offset="4798" max-vertical-offset="8925">
<state vertical-scroll-proportion="0.0" vertical-offset="3420" max-vertical-offset="6783">
<caret line="180" column="17" selection-start-line="180" selection-start-column="17" selection-end-line="180" selection-end-column="17" />
<folding>
<element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -39,18 +39,18 @@
<file leaf-file-name="order.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/order.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-23.64" vertical-offset="4653" max-vertical-offset="10672">
<state vertical-scroll-proportion="0.0" vertical-offset="4332" max-vertical-offset="8816">
<caret line="228" column="31" selection-start-line="228" selection-start-column="31" selection-end-line="228" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="jquery-weui.css" pinned="false" current-in-tab="true">
<file leaf-file-name="jquery-weui.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/jquery-weui.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0011111111" vertical-offset="37372" max-vertical-offset="44061">
<caret line="1967" column="9" selection-start-line="1967" selection-start-column="9" selection-end-line="1967" selection-end-column="9" />
<state vertical-scroll-proportion="0.0" vertical-offset="37372" max-vertical-offset="44061">
<caret line="1978" column="14" selection-start-line="1978" selection-start-column="14" selection-end-line="1978" selection-end-column="14" />
<folding>
<element signature="e#433#1880#2" expanded="true" />
<element signature="e#23094#23349#2" expanded="true" />
... ... @@ -70,31 +70,36 @@
</provider>
</entry>
</file>
<file leaf-file-name="hopeaddress.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/hopeaddress.js">
<file leaf-file-name="jquery-weui.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/jquery-weui.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-24.08" vertical-offset="3376" max-vertical-offset="6032">
<caret line="153" column="49" selection-start-line="147" selection-start-column="23" selection-end-line="153" selection-end-column="49" />
<folding />
<state vertical-scroll-proportion="82.76363" vertical-offset="163798" max-vertical-offset="175230">
<caret line="5898" column="26" selection-start-line="5898" selection-start-column="26" selection-end-line="5898" selection-end-column="26" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="shopcar.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/shopcar.html">
<file leaf-file-name="order.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/order.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-29.785715" vertical-offset="2018" max-vertical-offset="4255">
<caret line="124" column="18" selection-start-line="124" selection-start-column="18" selection-end-line="124" selection-end-column="18" />
<folding />
<state vertical-scroll-proportion="0.522807" vertical-offset="13512" max-vertical-offset="21087">
<caret line="517" column="54" selection-start-line="517" selection-start-column="54" selection-end-line="517" selection-end-column="54" />
<folding>
<element signature="n#style#0;n#label#0;n#div#0;n#div#2;n#div#4;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#2;n#div#4;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="research.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/research.js">
<file leaf-file-name="shopcar.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/shopcar.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-17.0" vertical-offset="7825" max-vertical-offset="13000">
<caret line="330" column="44" selection-start-line="330" selection-start-column="44" selection-end-line="330" selection-end-column="44" />
<state vertical-scroll-proportion="0.0" vertical-offset="2356" max-vertical-offset="3515">
<caret line="124" column="18" selection-start-line="124" selection-start-column="18" selection-end-line="124" selection-end-column="18" />
<folding />
</state>
</provider>
... ... @@ -103,7 +108,7 @@
<file leaf-file-name="PersonCenter.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-17.535715" vertical-offset="1863" max-vertical-offset="4180">
<state vertical-scroll-proportion="0.0" vertical-offset="2033" max-vertical-offset="3610">
<caret line="107" column="75" selection-start-line="107" selection-start-column="75" selection-end-line="107" selection-end-column="75" />
<folding />
</state>
... ... @@ -113,7 +118,7 @@
<file leaf-file-name="research.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/research.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-14.285714" vertical-offset="2525" max-vertical-offset="5250">
<state vertical-scroll-proportion="0.0" vertical-offset="2223" max-vertical-offset="3990">
<caret line="117" column="59" selection-start-line="117" selection-start-column="59" selection-end-line="117" selection-end-column="59" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -132,7 +137,7 @@
<file leaf-file-name="evalute.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/evalute.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-24.04" vertical-offset="5449" max-vertical-offset="6850">
<state vertical-scroll-proportion="0.0" vertical-offset="4598" max-vertical-offset="5206">
<caret line="242" column="5" selection-start-line="242" selection-start-column="5" selection-end-line="242" selection-end-column="5" />
<folding>
<marker date="1534760479292" expanded="true" signature="2037:2047" placeholder="..." />
... ... @@ -144,7 +149,7 @@
<file leaf-file-name="research.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/research.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="4641" max-vertical-offset="6164">
<state vertical-scroll-proportion="0.0" vertical-offset="4237" max-vertical-offset="5092">
<caret line="223" column="25" selection-start-line="223" selection-start-column="25" selection-end-line="223" selection-end-column="25" />
<folding />
</state>
... ... @@ -164,7 +169,6 @@
<option value="$PROJECT_DIR$/js/index.js" />
<option value="$PROJECT_DIR$/js/shopcar.js" />
<option value="$PROJECT_DIR$/js/personcenter.js" />
<option value="$PROJECT_DIR$/order.html" />
<option value="$PROJECT_DIR$/hopeaddress.html" />
<option value="$PROJECT_DIR$/js/hopeaddress.js" />
<option value="$PROJECT_DIR$/js/research.js" />
... ... @@ -176,6 +180,8 @@
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/js/order.js" />
<option value="$PROJECT_DIR$/css/jquery-weui.css" />
<option value="$PROJECT_DIR$/js/jquery-weui.js" />
<option value="$PROJECT_DIR$/order.html" />
</list>
</option>
</component>
... ... @@ -292,7 +298,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="G:/project" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="HbShouldOpenHtmlAsHb" value="" />
<property name="JavaScriptLanguageLevel" value="ES6" />
<property name="JavaScriptPreferStrict" value="false" />
... ... @@ -307,14 +313,10 @@
</key>
</component>
<component name="RunManager">
<configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
<method />
</configuration>
<configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit">
<method />
</configuration>
<configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma" config-file="">
<envs />
<configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
<method />
</configuration>
<configuration default="true" type="JSTestDriver:ConfigurationType" factoryName="JsTestDriver">
... ... @@ -324,6 +326,10 @@
<setting name="preferredDebugBrowser" value="Chrome" />
<method />
</configuration>
<configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma" config-file="">
<envs />
<method />
</configuration>
<configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
<method />
</configuration>
... ... @@ -358,8 +364,8 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="2" width="1932" height="1051" extended-state="1" />
<editor active="false" />
<frame x="-7" y="2" width="1932" height="1051" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
... ... @@ -367,18 +373,18 @@
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.107515655" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" 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" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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" weight="0.25" 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" weight="0.33" 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" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" 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" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="Vcs.Log.UiProperties">
... ... @@ -402,14 +408,20 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/css/research.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="4237" max-vertical-offset="5092">
<caret line="223" column="25" selection-start-line="223" selection-start-column="25" selection-end-line="223" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="4503" max-vertical-offset="6688">
<caret line="237" column="52" selection-start-line="237" selection-start-column="52" selection-end-line="237" selection-end-column="52" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
... ... @@ -426,9 +438,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1083" max-vertical-offset="5909">
<caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />
<folding>
<element signature="n#!!doc" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -436,7 +445,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="589" max-vertical-offset="4541">
<caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -444,7 +452,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="5928" max-vertical-offset="13832">
<caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
... ... @@ -452,7 +459,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">
<caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" />
<folding />
</state>
</provider>
</entry>
... ... @@ -468,10 +474,7 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3211">
<caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
<folding>
<element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#img#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
</folding>
<folding />
</state>
</provider>
</entry>
... ... @@ -479,7 +482,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634">
<caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
... ... @@ -487,7 +489,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779">
<caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
... ... @@ -496,9 +497,7 @@
<state vertical-scroll-proportion="0.0" vertical-offset="4275" max-vertical-offset="6707">
<caret line="225" column="8" selection-start-line="225" selection-start-column="8" selection-end-line="225" selection-end-column="8" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
... ... @@ -515,9 +514,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2812" max-vertical-offset="5909">
<caret line="148" column="51" selection-start-line="148" selection-start-column="51" selection-end-line="148" selection-end-column="51" />
<folding>
<element signature="n#!!doc" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -525,7 +521,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4427">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -533,7 +528,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="5928" max-vertical-offset="13832">
<caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
... ... @@ -541,7 +535,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">
<caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" />
<folding />
</state>
</provider>
</entry>
... ... @@ -557,10 +550,7 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116">
<caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
<folding>
<element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#img#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
</folding>
<folding />
</state>
</provider>
</entry>
... ... @@ -568,7 +558,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634">
<caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
... ... @@ -576,7 +565,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779">
<caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
... ... @@ -585,9 +573,7 @@
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="6707">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
... ... @@ -596,7 +582,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="4408" max-vertical-offset="13870">
<caret line="232" column="23" selection-start-line="232" selection-start-column="23" selection-end-line="232" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
... ... @@ -612,10 +597,7 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116">
<caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
<folding>
<element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#img#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
</folding>
<folding />
</state>
</provider>
</entry>
... ... @@ -623,7 +605,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634">
<caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
... ... @@ -638,7 +619,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779">
<caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
... ... @@ -653,7 +633,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="276" max-vertical-offset="1189">
<caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
... ... @@ -661,7 +640,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">
<caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" />
<folding />
</state>
</provider>
</entry>
... ... @@ -669,7 +647,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="8906" max-vertical-offset="21840">
<caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
... ... @@ -677,7 +654,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="589" max-vertical-offset="4541">
<caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -693,9 +669,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1083" max-vertical-offset="5909">
<caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />
<folding>
<element signature="n#!!doc" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -703,15 +676,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-18.8" vertical-offset="718" max-vertical-offset="2398">
<caret line="54" column="29" selection-start-line="54" selection-start-column="29" selection-end-line="54" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/order.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-15.785714" vertical-offset="7748" max-vertical-offset="20306">
<caret line="315" column="17" selection-start-line="315" selection-start-column="17" selection-end-line="315" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
... ... @@ -719,7 +683,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-14.25" vertical-offset="843" max-vertical-offset="2457">
<caret line="46" column="11" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
... ... @@ -727,7 +690,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-23.0" vertical-offset="207" max-vertical-offset="1219">
<caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
... ... @@ -735,13 +697,12 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-16.964285" vertical-offset="150" max-vertical-offset="1325">
<caret line="25" column="47" selection-start-line="25" selection-start-column="47" selection-end-line="25" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/hopeaddress.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-24.08" vertical-offset="3376" max-vertical-offset="6032">
<state vertical-scroll-proportion="0.0" vertical-offset="2907" max-vertical-offset="4408">
<caret line="153" column="49" selection-start-line="147" selection-start-column="23" selection-end-line="153" selection-end-column="49" />
<folding />
</state>
... ... @@ -749,7 +710,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/js/research.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-17.0" vertical-offset="7825" max-vertical-offset="13000">
<state vertical-scroll-proportion="0.0" vertical-offset="6270" max-vertical-offset="9880">
<caret line="330" column="44" selection-start-line="330" selection-start-column="44" selection-end-line="330" selection-end-column="44" />
<folding />
</state>
... ... @@ -765,7 +726,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/research.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-14.285714" vertical-offset="2525" max-vertical-offset="5250">
<state vertical-scroll-proportion="0.0" vertical-offset="2223" max-vertical-offset="3990">
<caret line="117" column="59" selection-start-line="117" selection-start-column="59" selection-end-line="117" selection-end-column="59" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -782,7 +743,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/js/evalute.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-24.04" vertical-offset="5449" max-vertical-offset="6850">
<state vertical-scroll-proportion="0.0" vertical-offset="4598" max-vertical-offset="5206">
<caret line="242" column="5" selection-start-line="242" selection-start-column="5" selection-end-line="242" selection-end-column="5" />
<folding>
<marker date="1534760479292" expanded="true" signature="2037:2047" placeholder="..." />
... ... @@ -792,7 +753,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-17.535715" vertical-offset="1863" max-vertical-offset="4180">
<state vertical-scroll-proportion="0.0" vertical-offset="2033" max-vertical-offset="3610">
<caret line="107" column="75" selection-start-line="107" selection-start-column="75" selection-end-line="107" selection-end-column="75" />
<folding />
</state>
... ... @@ -800,7 +761,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/shopcar.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-29.785715" vertical-offset="2018" max-vertical-offset="4255">
<state vertical-scroll-proportion="0.0" vertical-offset="2356" max-vertical-offset="3515">
<caret line="124" column="18" selection-start-line="124" selection-start-column="18" selection-end-line="124" selection-end-column="18" />
<folding />
</state>
... ... @@ -808,7 +769,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="10.642858" vertical-offset="4798" max-vertical-offset="8925">
<state vertical-scroll-proportion="0.0" vertical-offset="3420" max-vertical-offset="6783">
<caret line="180" column="17" selection-start-line="180" selection-start-column="17" selection-end-line="180" selection-end-column="17" />
<folding>
<element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -818,7 +779,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/js/order.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-23.64" vertical-offset="4653" max-vertical-offset="10672">
<state vertical-scroll-proportion="0.0" vertical-offset="4332" max-vertical-offset="8816">
<caret line="228" column="31" selection-start-line="228" selection-start-column="31" selection-end-line="228" selection-end-column="31" />
<folding />
</state>
... ... @@ -826,8 +787,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/css/jquery-weui.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0011111111" vertical-offset="37372" max-vertical-offset="44061">
<caret line="1967" column="9" selection-start-line="1967" selection-start-column="9" selection-end-line="1967" selection-end-column="9" />
<state vertical-scroll-proportion="0.0" vertical-offset="37372" max-vertical-offset="44061">
<caret line="1978" column="14" selection-start-line="1978" selection-start-column="14" selection-end-line="1978" selection-end-column="14" />
<folding>
<element signature="e#433#1880#2" expanded="true" />
<element signature="e#23094#23349#2" expanded="true" />
... ... @@ -846,5 +807,26 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/jquery-weui.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="82.76363" vertical-offset="163798" max-vertical-offset="175230">
<caret line="5898" column="26" selection-start-line="5898" selection-start-column="26" selection-end-line="5898" selection-end-column="26" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/order.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.522807" vertical-offset="13512" max-vertical-offset="21087">
<caret line="517" column="54" selection-start-line="517" selection-start-column="54" selection-end-line="517" selection-end-column="54" />
<folding>
<element signature="n#style#0;n#label#0;n#div#0;n#div#2;n#div#4;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#2;n#div#4;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
/**
* jQuery WeUI V1.2.1
* By 言川
* http://lihongxun945.github.io/jquery-weui/
* jQuery WeUI V1.2.1
* By 言川
* http://lihongxun945.github.io/jquery-weui/
*/
/* global $:true */
/* global WebKitCSSMatrix:true */
... ... @@ -577,27 +577,27 @@
(function(window, document, exportName, undefined) {
'use strict';
var VENDOR_PREFIXES = ['', 'webkit', 'Moz', 'MS', 'ms', 'o'];
var TEST_ELEMENT = document.createElement('div');
var VENDOR_PREFIXES = ['', 'webkit', 'Moz', 'MS', 'ms', 'o'];
var TEST_ELEMENT = document.createElement('div');
var TYPE_FUNCTION = 'function';
var TYPE_FUNCTION = 'function';
var round = Math.round;
var abs = Math.abs;
var now = Date.now;
var round = Math.round;
var abs = Math.abs;
var now = Date.now;
/**
/**
* set a timeout with a given scope
* @param {Function} fn
* @param {Number} timeout
* @param {Object} context
* @returns {number}
*/
function setTimeoutContext(fn, timeout, context) {
function setTimeoutContext(fn, timeout, context) {
return setTimeout(bindFn(fn, context), timeout);
}
}
/**
/**
* if the argument is an array, we want to execute the fn on each entry
* if it aint an array we don't want to do a thing.
* this is used by all the methods that accept a single and array argument.
... ... @@ -606,21 +606,21 @@ function setTimeoutContext(fn, timeout, context) {
* @param {Object} [context]
* @returns {Boolean}
*/
function invokeArrayArg(arg, fn, context) {
function invokeArrayArg(arg, fn, context) {
if (Array.isArray(arg)) {
each(arg, context[fn], context);
return true;
}
return false;
}
}
/**
/**
* walk objects and arrays
* @param {Object} obj
* @param {Function} iterator
* @param {Object} context
*/
function each(obj, iterator, context) {
function each(obj, iterator, context) {
var i;
if (!obj) {
... ... @@ -640,16 +640,16 @@ function each(obj, iterator, context) {
obj.hasOwnProperty(i) && iterator.call(context, obj[i], i, obj);
}
}
}
}
/**
/**
* wrap a method with a deprecation warning and stack trace
* @param {Function} method
* @param {String} name
* @param {String} message
* @returns {Function} A new function wrapping the supplied method.
*/
function deprecate(method, name, message) {
function deprecate(method, name, message) {
var deprecationMessage = 'DEPRECATED METHOD: ' + name + '\n' + message + ' AT \n';
return function() {
var e = new Error('get-stack-trace');
... ... @@ -663,17 +663,17 @@ function deprecate(method, name, message) {
}
return method.apply(this, arguments);
};
}
}
/**
/**
* extend object.
* means that properties in dest will be overwritten by the ones in src.
* @param {Object} target
* @param {...Object} objects_to_assign
* @returns {Object} target
*/
var assign;
if (typeof Object.assign !== 'function') {
var assign;
if (typeof Object.assign !== 'function') {
assign = function assign(target) {
if (target === undefined || target === null) {
throw new TypeError('Cannot convert undefined or null to object');
... ... @@ -692,11 +692,11 @@ if (typeof Object.assign !== 'function') {
}
return output;
};
} else {
} else {
assign = Object.assign;
}
}
/**
/**
* extend object.
* means that properties in dest will be overwritten by the ones in src.
* @param {Object} dest
... ... @@ -704,7 +704,7 @@ if (typeof Object.assign !== 'function') {
* @param {Boolean} [merge=false]
* @returns {Object} dest
*/
var extend = deprecate(function extend(dest, src, merge) {
var extend = deprecate(function extend(dest, src, merge) {
var keys = Object.keys(src);
var i = 0;
while (i < keys.length) {
... ... @@ -714,26 +714,26 @@ var extend = deprecate(function extend(dest, src, merge) {
i++;
}
return dest;
}, 'extend', 'Use `assign`.');
}, 'extend', 'Use `assign`.');
/**
/**
* merge the values from src in the dest.
* means that properties that exist in dest will not be overwritten by src
* @param {Object} dest
* @param {Object} src
* @returns {Object} dest
*/
var merge = deprecate(function merge(dest, src) {
var merge = deprecate(function merge(dest, src) {
return extend(dest, src, true);
}, 'merge', 'Use `assign`.');
}, 'merge', 'Use `assign`.');
/**
/**
* simple class inheritance
* @param {Function} child
* @param {Function} base
* @param {Object} [properties]
*/
function inherit(child, base, properties) {
function inherit(child, base, properties) {
var baseP = base.prototype,
childP;
... ... @@ -744,76 +744,76 @@ function inherit(child, base, properties) {
if (properties) {
assign(childP, properties);
}
}
}
/**
/**
* simple function bind
* @param {Function} fn
* @param {Object} context
* @returns {Function}
*/
function bindFn(fn, context) {
function bindFn(fn, context) {
return function boundFn() {
return fn.apply(context, arguments);
};
}
}
/**
/**
* let a boolean value also be a function that must return a boolean
* this first item in args will be used as the context
* @param {Boolean|Function} val
* @param {Array} [args]
* @returns {Boolean}
*/
function boolOrFn(val, args) {
function boolOrFn(val, args) {
if (typeof val == TYPE_FUNCTION) {
return val.apply(args ? args[0] || undefined : undefined, args);
}
return val;
}
}
/**
/**
* use the val2 when val1 is undefined
* @param {*} val1
* @param {*} val2
* @returns {*}
*/
function ifUndefined(val1, val2) {
function ifUndefined(val1, val2) {
return (val1 === undefined) ? val2 : val1;
}
}
/**
/**
* addEventListener with multiple events at once
* @param {EventTarget} target
* @param {String} types
* @param {Function} handler
*/
function addEventListeners(target, types, handler) {
function addEventListeners(target, types, handler) {
each(splitStr(types), function(type) {
target.addEventListener(type, handler, false);
});
}
}
/**
/**
* removeEventListener with multiple events at once
* @param {EventTarget} target
* @param {String} types
* @param {Function} handler
*/
function removeEventListeners(target, types, handler) {
function removeEventListeners(target, types, handler) {
each(splitStr(types), function(type) {
target.removeEventListener(type, handler, false);
});
}
}
/**
/**
* find if a node is in the given parent
* @method hasParent
* @param {HTMLElement} node
* @param {HTMLElement} parent
* @return {Boolean} found
*/
function hasParent(node, parent) {
function hasParent(node, parent) {
while (node) {
if (node == parent) {
return true;
... ... @@ -821,35 +821,35 @@ function hasParent(node, parent) {
node = node.parentNode;
}
return false;
}
}
/**
/**
* small indexOf wrapper
* @param {String} str
* @param {String} find
* @returns {Boolean} found
*/
function inStr(str, find) {
function inStr(str, find) {
return str.indexOf(find) > -1;
}
}
/**
/**
* split string on whitespace
* @param {String} str
* @returns {Array} words
*/
function splitStr(str) {
function splitStr(str) {
return str.trim().split(/\s+/g);
}
}
/**
/**
* find if a array contains the object using indexOf or a simple polyFill
* @param {Array} src
* @param {String} find
* @param {String} [findByKey]
* @return {Boolean|Number} false when not found, or the index
*/
function inArray(src, find, findByKey) {
function inArray(src, find, findByKey) {
if (src.indexOf && !findByKey) {
return src.indexOf(find);
} else {
... ... @@ -862,25 +862,25 @@ function inArray(src, find, findByKey) {
}
return -1;
}
}
}
/**
/**
* convert array-like objects to real arrays
* @param {Object} obj
* @returns {Array}
*/
function toArray(obj) {
function toArray(obj) {
return Array.prototype.slice.call(obj, 0);
}
}
/**
/**
* unique array with objects based on a key (like 'id') or just by the array's value
* @param {Array} src [{id:1},{id:2},{id:1}]
* @param {String} [key]
* @param {Boolean} [sort=False]
* @returns {Array} [{id:1},{id:2}]
*/
function uniqueArray(src, key, sort) {
function uniqueArray(src, key, sort) {
var results = [];
var values = [];
var i = 0;
... ... @@ -905,15 +905,15 @@ function uniqueArray(src, key, sort) {
}
return results;
}
}
/**
/**
* get the prefixed property
* @param {Object} obj
* @param {String} property
* @returns {String|Undefined} prefixed
*/
function prefixed(obj, property) {
function prefixed(obj, property) {
var prefix, prop;
var camelProp = property[0].toUpperCase() + property.slice(1);
... ... @@ -928,66 +928,66 @@ function prefixed(obj, property) {
i++;
}
return undefined;
}
}
/**
/**
* get a unique id
* @returns {number} uniqueId
*/
var _uniqueId = 1;
function uniqueId() {
var _uniqueId = 1;
function uniqueId() {
return _uniqueId++;
}
}
/**
/**
* get the window object of an element
* @param {HTMLElement} element
* @returns {DocumentView|Window}
*/
function getWindowForElement(element) {
function getWindowForElement(element) {
var doc = element.ownerDocument || element;
return (doc.defaultView || doc.parentWindow || window);
}
}
var MOBILE_REGEX = /mobile|tablet|ip(ad|hone|od)|android/i;
var MOBILE_REGEX = /mobile|tablet|ip(ad|hone|od)|android/i;
var SUPPORT_TOUCH = ('ontouchstart' in window);
var SUPPORT_POINTER_EVENTS = prefixed(window, 'PointerEvent') !== undefined;
var SUPPORT_ONLY_TOUCH = SUPPORT_TOUCH && MOBILE_REGEX.test(navigator.userAgent);
var SUPPORT_TOUCH = ('ontouchstart' in window);
var SUPPORT_POINTER_EVENTS = prefixed(window, 'PointerEvent') !== undefined;
var SUPPORT_ONLY_TOUCH = SUPPORT_TOUCH && MOBILE_REGEX.test(navigator.userAgent);
var INPUT_TYPE_TOUCH = 'touch';
var INPUT_TYPE_PEN = 'pen';
var INPUT_TYPE_MOUSE = 'mouse';
var INPUT_TYPE_KINECT = 'kinect';
var INPUT_TYPE_TOUCH = 'touch';
var INPUT_TYPE_PEN = 'pen';
var INPUT_TYPE_MOUSE = 'mouse';
var INPUT_TYPE_KINECT = 'kinect';
var COMPUTE_INTERVAL = 25;
var COMPUTE_INTERVAL = 25;
var INPUT_START = 1;
var INPUT_MOVE = 2;
var INPUT_END = 4;
var INPUT_CANCEL = 8;
var INPUT_START = 1;
var INPUT_MOVE = 2;
var INPUT_END = 4;
var INPUT_CANCEL = 8;
var DIRECTION_NONE = 1;
var DIRECTION_LEFT = 2;
var DIRECTION_RIGHT = 4;
var DIRECTION_UP = 8;
var DIRECTION_DOWN = 16;
var DIRECTION_NONE = 1;
var DIRECTION_LEFT = 2;
var DIRECTION_RIGHT = 4;
var DIRECTION_UP = 8;
var DIRECTION_DOWN = 16;
var DIRECTION_HORIZONTAL = DIRECTION_LEFT | DIRECTION_RIGHT;
var DIRECTION_VERTICAL = DIRECTION_UP | DIRECTION_DOWN;
var DIRECTION_ALL = DIRECTION_HORIZONTAL | DIRECTION_VERTICAL;
var DIRECTION_HORIZONTAL = DIRECTION_LEFT | DIRECTION_RIGHT;
var DIRECTION_VERTICAL = DIRECTION_UP | DIRECTION_DOWN;
var DIRECTION_ALL = DIRECTION_HORIZONTAL | DIRECTION_VERTICAL;
var PROPS_XY = ['x', 'y'];
var PROPS_CLIENT_XY = ['clientX', 'clientY'];
var PROPS_XY = ['x', 'y'];
var PROPS_CLIENT_XY = ['clientX', 'clientY'];
/**
/**
* create new input type manager
* @param {Manager} manager
* @param {Function} callback
* @returns {Input}
* @constructor
*/
function Input(manager, callback) {
function Input(manager, callback) {
var self = this;
this.manager = manager;
this.callback = callback;
... ... @@ -1004,9 +1004,9 @@ function Input(manager, callback) {
this.init();
}
}
Input.prototype = {
Input.prototype = {
/**
* should handle the inputEvent data and trigger the callback
* @virtual
... ... @@ -1030,15 +1030,15 @@ Input.prototype = {
this.evTarget && removeEventListeners(this.target, this.evTarget, this.domHandler);
this.evWin && removeEventListeners(getWindowForElement(this.element), this.evWin, this.domHandler);
}
};
};
/**
/**
* create new input type manager
* called by the Manager constructor
* @param {Hammer} manager
* @returns {Input}
*/
function createInputInstance(manager) {
function createInputInstance(manager) {
var Type;
var inputClass = manager.options.inputClass;
... ... @@ -1054,15 +1054,15 @@ function createInputInstance(manager) {
Type = TouchMouseInput;
}
return new (Type)(manager, inputHandler);
}
}
/**
/**
* handle input events
* @param {Manager} manager
* @param {String} eventType
* @param {Object} input
*/
function inputHandler(manager, eventType, input) {
function inputHandler(manager, eventType, input) {
var pointersLen = input.pointers.length;
var changedPointersLen = input.changedPointers.length;
var isFirst = (eventType & INPUT_START && (pointersLen - changedPointersLen === 0));
... ... @@ -1087,14 +1087,14 @@ function inputHandler(manager, eventType, input) {
manager.recognize(input);
manager.session.prevInput = input;
}
}
/**
/**
* extend the data with some usable properties like scale, rotate, velocity etc
* @param {Object} manager
* @param {Object} input
*/
function computeInputData(manager, input) {
function computeInputData(manager, input) {
var session = manager.session;
var pointers = input.pointers;
var pointersLength = pointers.length;
... ... @@ -1144,9 +1144,9 @@ function computeInputData(manager, input) {
target = input.srcEvent.target;
}
input.target = target;
}
}
function computeDeltaXY(session, input) {
function computeDeltaXY(session, input) {
var center = input.center;
var offset = session.offsetDelta || {};
var prevDelta = session.prevDelta || {};
... ... @@ -1166,14 +1166,14 @@ function computeDeltaXY(session, input) {
input.deltaX = prevDelta.x + (center.x - offset.x);
input.deltaY = prevDelta.y + (center.y - offset.y);
}
}
/**
/**
* velocity is calculated every x ms
* @param {Object} session
* @param {Object} input
*/
function computeIntervalInputData(session, input) {
function computeIntervalInputData(session, input) {
var last = session.lastInterval || input,
deltaTime = input.timeStamp - last.timeStamp,
velocity, velocityX, velocityY, direction;
... ... @@ -1201,14 +1201,14 @@ function computeIntervalInputData(session, input) {
input.velocityX = velocityX;
input.velocityY = velocityY;
input.direction = direction;
}
}
/**
/**
* create a simple clone from the input used for storage of firstInput and firstMultiple
* @param {Object} input
* @returns {Object} clonedInputData
*/
function simpleCloneInputData(input) {
function simpleCloneInputData(input) {
// make a simple copy of the pointers because we will get a reference if we don't
// we only need clientXY for the calculations
var pointers = [];
... ... @@ -1228,14 +1228,14 @@ function simpleCloneInputData(input) {
deltaX: input.deltaX,
deltaY: input.deltaY
};
}
}
/**
/**
* get the center of all the pointers
* @param {Array} pointers
* @return {Object} center contains `x` and `y` properties
*/
function getCenter(pointers) {
function getCenter(pointers) {
var pointersLength = pointers.length;
// no need to loop when only one touch
... ... @@ -1257,29 +1257,29 @@ function getCenter(pointers) {
x: round(x / pointersLength),
y: round(y / pointersLength)
};
}
}
/**
/**
* calculate the velocity between two points. unit is in px per ms.
* @param {Number} deltaTime
* @param {Number} x
* @param {Number} y
* @return {Object} velocity `x` and `y`
*/
function getVelocity(deltaTime, x, y) {
function getVelocity(deltaTime, x, y) {
return {
x: x / deltaTime || 0,
y: y / deltaTime || 0
};
}
}
/**
/**
* get the direction between two points
* @param {Number} x
* @param {Number} y
* @return {Number} direction
*/
function getDirection(x, y) {
function getDirection(x, y) {
if (x === y) {
return DIRECTION_NONE;
}
... ... @@ -1288,16 +1288,16 @@ function getDirection(x, y) {
return x < 0 ? DIRECTION_LEFT : DIRECTION_RIGHT;
}
return y < 0 ? DIRECTION_UP : DIRECTION_DOWN;
}
}
/**
/**
* calculate the absolute distance between two points
* @param {Object} p1 {x, y}
* @param {Object} p2 {x, y}
* @param {Array} [props] containing x and y keys
* @return {Number} distance
*/
function getDistance(p1, p2, props) {
function getDistance(p1, p2, props) {
if (!props) {
props = PROPS_XY;
}
... ... @@ -1305,69 +1305,69 @@ function getDistance(p1, p2, props) {
y = p2[props[1]] - p1[props[1]];
return Math.sqrt((x * x) + (y * y));
}
}
/**
/**
* calculate the angle between two coordinates
* @param {Object} p1
* @param {Object} p2
* @param {Array} [props] containing x and y keys
* @return {Number} angle
*/
function getAngle(p1, p2, props) {
function getAngle(p1, p2, props) {
if (!props) {
props = PROPS_XY;
}
var x = p2[props[0]] - p1[props[0]],
y = p2[props[1]] - p1[props[1]];
return Math.atan2(y, x) * 180 / Math.PI;
}
}
/**
/**
* calculate the rotation degrees between two pointersets
* @param {Array} start array of pointers
* @param {Array} end array of pointers
* @return {Number} rotation
*/
function getRotation(start, end) {
function getRotation(start, end) {
return getAngle(end[1], end[0], PROPS_CLIENT_XY) + getAngle(start[1], start[0], PROPS_CLIENT_XY);
}
}
/**
/**
* calculate the scale factor between two pointersets
* no scale is 1, and goes down to 0 when pinched together, and bigger when pinched out
* @param {Array} start array of pointers
* @param {Array} end array of pointers
* @return {Number} scale
*/
function getScale(start, end) {
function getScale(start, end) {
return getDistance(end[0], end[1], PROPS_CLIENT_XY) / getDistance(start[0], start[1], PROPS_CLIENT_XY);
}
}
var MOUSE_INPUT_MAP = {
var MOUSE_INPUT_MAP = {
mousedown: INPUT_START,
mousemove: INPUT_MOVE,
mouseup: INPUT_END
};
};
var MOUSE_ELEMENT_EVENTS = 'mousedown';
var MOUSE_WINDOW_EVENTS = 'mousemove mouseup';
var MOUSE_ELEMENT_EVENTS = 'mousedown';
var MOUSE_WINDOW_EVENTS = 'mousemove mouseup';
/**
/**
* Mouse events input
* @constructor
* @extends Input
*/
function MouseInput() {
function MouseInput() {
this.evEl = MOUSE_ELEMENT_EVENTS;
this.evWin = MOUSE_WINDOW_EVENTS;
this.pressed = false; // mousedown state
Input.apply(this, arguments);
}
}
inherit(MouseInput, Input, {
inherit(MouseInput, Input, {
/**
* handle mouse events
* @param {Object} ev
... ... @@ -1400,48 +1400,48 @@ inherit(MouseInput, Input, {
srcEvent: ev
});
}
});
});
var POINTER_INPUT_MAP = {
var POINTER_INPUT_MAP = {
pointerdown: INPUT_START,
pointermove: INPUT_MOVE,
pointerup: INPUT_END,
pointercancel: INPUT_CANCEL,
pointerout: INPUT_CANCEL
};
};
// in IE10 the pointer types is defined as an enum
var IE10_POINTER_TYPE_ENUM = {
var IE10_POINTER_TYPE_ENUM = {
2: INPUT_TYPE_TOUCH,
3: INPUT_TYPE_PEN,
4: INPUT_TYPE_MOUSE,
5: INPUT_TYPE_KINECT // see https://twitter.com/jacobrossi/status/480596438489890816
};
};
var POINTER_ELEMENT_EVENTS = 'pointerdown';
var POINTER_WINDOW_EVENTS = 'pointermove pointerup pointercancel';
var POINTER_ELEMENT_EVENTS = 'pointerdown';
var POINTER_WINDOW_EVENTS = 'pointermove pointerup pointercancel';
// IE10 has prefixed support, and case-sensitive
if (window.MSPointerEvent && !window.PointerEvent) {
if (window.MSPointerEvent && !window.PointerEvent) {
POINTER_ELEMENT_EVENTS = 'MSPointerDown';
POINTER_WINDOW_EVENTS = 'MSPointerMove MSPointerUp MSPointerCancel';
}
}
/**
/**
* Pointer events input
* @constructor
* @extends Input
*/
function PointerEventInput() {
function PointerEventInput() {
this.evEl = POINTER_ELEMENT_EVENTS;
this.evWin = POINTER_WINDOW_EVENTS;
Input.apply(this, arguments);
this.store = (this.manager.session.pointerEvents = []);
}
}
inherit(PointerEventInput, Input, {
inherit(PointerEventInput, Input, {
/**
* handle mouse events
* @param {Object} ev
... ... @@ -1489,32 +1489,32 @@ inherit(PointerEventInput, Input, {
store.splice(storeIndex, 1);
}
}
});
});
var SINGLE_TOUCH_INPUT_MAP = {
var SINGLE_TOUCH_INPUT_MAP = {
touchstart: INPUT_START,
touchmove: INPUT_MOVE,
touchend: INPUT_END,
touchcancel: INPUT_CANCEL
};
};
var SINGLE_TOUCH_TARGET_EVENTS = 'touchstart';
var SINGLE_TOUCH_WINDOW_EVENTS = 'touchstart touchmove touchend touchcancel';
var SINGLE_TOUCH_TARGET_EVENTS = 'touchstart';
var SINGLE_TOUCH_WINDOW_EVENTS = 'touchstart touchmove touchend touchcancel';
/**
/**
* Touch events input
* @constructor
* @extends Input
*/
function SingleTouchInput() {
function SingleTouchInput() {
this.evTarget = SINGLE_TOUCH_TARGET_EVENTS;
this.evWin = SINGLE_TOUCH_WINDOW_EVENTS;
this.started = false;
Input.apply(this, arguments);
}
}
inherit(SingleTouchInput, Input, {
inherit(SingleTouchInput, Input, {
handler: function TEhandler(ev) {
var type = SINGLE_TOUCH_INPUT_MAP[ev.type];
... ... @@ -1541,15 +1541,15 @@ inherit(SingleTouchInput, Input, {
srcEvent: ev
});
}
});
});
/**
/**
* @this {TouchInput}
* @param {Object} ev
* @param {Number} type flag
* @returns {undefined|Array} [all, changed]
*/
function normalizeSingleTouches(ev, type) {
function normalizeSingleTouches(ev, type) {
var all = toArray(ev.touches);
var changed = toArray(ev.changedTouches);
... ... @@ -1558,30 +1558,30 @@ function normalizeSingleTouches(ev, type) {
}
return [all, changed];
}
}
var TOUCH_INPUT_MAP = {
var TOUCH_INPUT_MAP = {
touchstart: INPUT_START,
touchmove: INPUT_MOVE,
touchend: INPUT_END,
touchcancel: INPUT_CANCEL
};
};
var TOUCH_TARGET_EVENTS = 'touchstart touchmove touchend touchcancel';
var TOUCH_TARGET_EVENTS = 'touchstart touchmove touchend touchcancel';
/**
/**
* Multi-user touch events input
* @constructor
* @extends Input
*/
function TouchInput() {
function TouchInput() {
this.evTarget = TOUCH_TARGET_EVENTS;
this.targetIds = {};
Input.apply(this, arguments);
}
}
inherit(TouchInput, Input, {
inherit(TouchInput, Input, {
handler: function MTEhandler(ev) {
var type = TOUCH_INPUT_MAP[ev.type];
var touches = getTouches.call(this, ev, type);
... ... @@ -1596,15 +1596,15 @@ inherit(TouchInput, Input, {
srcEvent: ev
});
}
});
});
/**
/**
* @this {TouchInput}
* @param {Object} ev
* @param {Number} type flag
* @returns {undefined|Array} [all, changed]
*/
function getTouches(ev, type) {
function getTouches(ev, type) {
var allTouches = toArray(ev.touches);
var targetIds = this.targetIds;
... ... @@ -1657,9 +1657,9 @@ function getTouches(ev, type) {
uniqueArray(targetTouches.concat(changedTargetTouches), 'identifier', true),
changedTargetTouches
];
}
}
/**
/**
* Combined touch and mouse input
*
* Touch has a higher priority then mouse, and while touching no mouse events are allowed.
... ... @@ -1669,10 +1669,10 @@ function getTouches(ev, type) {
* @extends Input
*/
var DEDUP_TIMEOUT = 2500;
var DEDUP_DISTANCE = 25;
var DEDUP_TIMEOUT = 2500;
var DEDUP_DISTANCE = 25;
function TouchMouseInput() {
function TouchMouseInput() {
Input.apply(this, arguments);
var handler = bindFn(this.handler, this);
... ... @@ -1681,9 +1681,9 @@ function TouchMouseInput() {
this.primaryTouch = null;
this.lastTouches = [];
}
}
inherit(TouchMouseInput, Input, {
inherit(TouchMouseInput, Input, {
/**
* handle mouse and touch events
* @param {Hammer} manager
... ... @@ -1715,18 +1715,18 @@ inherit(TouchMouseInput, Input, {
this.touch.destroy();
this.mouse.destroy();
}
});
});
function recordTouches(eventType, eventData) {
function recordTouches(eventType, eventData) {
if (eventType & INPUT_START) {
this.primaryTouch = eventData.changedPointers[0].identifier;
setLastTouch.call(this, eventData);
} else if (eventType & (INPUT_END | INPUT_CANCEL)) {
setLastTouch.call(this, eventData);
}
}
}
function setLastTouch(eventData) {
function setLastTouch(eventData) {
var touch = eventData.changedPointers[0];
if (touch.identifier === this.primaryTouch) {
... ... @@ -1741,9 +1741,9 @@ function setLastTouch(eventData) {
};
setTimeout(removeLastTouch, DEDUP_TIMEOUT);
}
}
}
function isSyntheticEvent(eventData) {
function isSyntheticEvent(eventData) {
var x = eventData.srcEvent.clientX, y = eventData.srcEvent.clientY;
for (var i = 0; i < this.lastTouches.length; i++) {
var t = this.lastTouches[i];
... ... @@ -1753,33 +1753,33 @@ function isSyntheticEvent(eventData) {
}
}
return false;
}
}
var PREFIXED_TOUCH_ACTION = prefixed(TEST_ELEMENT.style, 'touchAction');
var NATIVE_TOUCH_ACTION = PREFIXED_TOUCH_ACTION !== undefined;
var PREFIXED_TOUCH_ACTION = prefixed(TEST_ELEMENT.style, 'touchAction');
var NATIVE_TOUCH_ACTION = PREFIXED_TOUCH_ACTION !== undefined;
// magical touchAction value
var TOUCH_ACTION_COMPUTE = 'compute';
var TOUCH_ACTION_AUTO = 'auto';
var TOUCH_ACTION_MANIPULATION = 'manipulation'; // not implemented
var TOUCH_ACTION_NONE = 'none';
var TOUCH_ACTION_PAN_X = 'pan-x';
var TOUCH_ACTION_PAN_Y = 'pan-y';
var TOUCH_ACTION_MAP = getTouchActionProps();
var TOUCH_ACTION_COMPUTE = 'compute';
var TOUCH_ACTION_AUTO = 'auto';
var TOUCH_ACTION_MANIPULATION = 'manipulation'; // not implemented
var TOUCH_ACTION_NONE = 'none';
var TOUCH_ACTION_PAN_X = 'pan-x';
var TOUCH_ACTION_PAN_Y = 'pan-y';
var TOUCH_ACTION_MAP = getTouchActionProps();
/**
/**
* Touch Action
* sets the touchAction property or uses the js alternative
* @param {Manager} manager
* @param {String} value
* @constructor
*/
function TouchAction(manager, value) {
function TouchAction(manager, value) {
this.manager = manager;
this.set(value);
}
}
TouchAction.prototype = {
TouchAction.prototype = {
/**
* set the touchAction value on the element or enable the polyfill
* @param {String} value
... ... @@ -1868,14 +1868,14 @@ TouchAction.prototype = {
this.manager.session.prevented = true;
srcEvent.preventDefault();
}
};
};
/**
/**
* when the touchActions are collected they are not a valid value, so we need to clean things up. *
* @param {String} actions
* @returns {*}
*/
function cleanTouchActions(actions) {
function cleanTouchActions(actions) {
// none
if (inStr(actions, TOUCH_ACTION_NONE)) {
return TOUCH_ACTION_NONE;
... ... @@ -1903,9 +1903,9 @@ function cleanTouchActions(actions) {
}
return TOUCH_ACTION_AUTO;
}
}
function getTouchActionProps() {
function getTouchActionProps() {
if (!NATIVE_TOUCH_ACTION) {
return false;
}
... ... @@ -1918,9 +1918,9 @@ function getTouchActionProps() {
touchMap[val] = cssSupports ? window.CSS.supports('touch-action', val) : true;
});
return touchMap;
}
}
/**
/**
* Recognizer flow explained; *
* All recognizers have the initial state of POSSIBLE when a input session starts.
* The definition of a input session is from the first input until the last input, with all it's movement in it. *
... ... @@ -1947,21 +1947,21 @@ function getTouchActionProps() {
* |
* Ended/Recognized
*/
var STATE_POSSIBLE = 1;
var STATE_BEGAN = 2;
var STATE_CHANGED = 4;
var STATE_ENDED = 8;
var STATE_RECOGNIZED = STATE_ENDED;
var STATE_CANCELLED = 16;
var STATE_FAILED = 32;
var STATE_POSSIBLE = 1;
var STATE_BEGAN = 2;
var STATE_CHANGED = 4;
var STATE_ENDED = 8;
var STATE_RECOGNIZED = STATE_ENDED;
var STATE_CANCELLED = 16;
var STATE_FAILED = 32;
/**
/**
* Recognizer
* Every recognizer needs to extend from this class.
* @constructor
* @param {Object} options
*/
function Recognizer(options) {
function Recognizer(options) {
this.options = assign({}, this.defaults, options || {});
this.id = uniqueId();
... ... @@ -1975,9 +1975,9 @@ function Recognizer(options) {
this.simultaneous = {};
this.requireFail = [];
}
}
Recognizer.prototype = {
Recognizer.prototype = {
/**
* @virtual
* @type {Object}
... ... @@ -2196,14 +2196,14 @@ Recognizer.prototype = {
* @virtual
*/
reset: function() { }
};
};
/**
/**
* get a usable string, used as event postfix
* @param {Const} state
* @returns {String} state
*/
function stateStr(state) {
function stateStr(state) {
if (state & STATE_CANCELLED) {
return 'cancel';
} else if (state & STATE_ENDED) {
... ... @@ -2214,14 +2214,14 @@ function stateStr(state) {
return 'start';
}
return '';
}
}
/**
/**
* direction cons to string
* @param {Const} direction
* @returns {String}
*/
function directionStr(direction) {
function directionStr(direction) {
if (direction == DIRECTION_DOWN) {
return 'down';
} else if (direction == DIRECTION_UP) {
... ... @@ -2232,32 +2232,32 @@ function directionStr(direction) {
return 'right';
}
return '';
}
}
/**
/**
* get a recognizer by name if it is bound to a manager
* @param {Recognizer|String} otherRecognizer
* @param {Recognizer} recognizer
* @returns {Recognizer}
*/
function getRecognizerByNameIfManager(otherRecognizer, recognizer) {
function getRecognizerByNameIfManager(otherRecognizer, recognizer) {
var manager = recognizer.manager;
if (manager) {
return manager.get(otherRecognizer);
}
return otherRecognizer;
}
}
/**
/**
* This recognizer is just used as a base for the simple attribute recognizers.
* @constructor
* @extends Recognizer
*/
function AttrRecognizer() {
function AttrRecognizer() {
Recognizer.apply(this, arguments);
}
}
inherit(AttrRecognizer, Recognizer, {
inherit(AttrRecognizer, Recognizer, {
/**
* @namespace
* @memberof AttrRecognizer
... ... @@ -2307,22 +2307,22 @@ inherit(AttrRecognizer, Recognizer, {
}
return STATE_FAILED;
}
});
});
/**
/**
* Pan
* Recognized when the pointer is down and moved in the allowed direction.
* @constructor
* @extends AttrRecognizer
*/
function PanRecognizer() {
function PanRecognizer() {
AttrRecognizer.apply(this, arguments);
this.pX = null;
this.pY = null;
}
}
inherit(PanRecognizer, AttrRecognizer, {
inherit(PanRecognizer, AttrRecognizer, {
/**
* @namespace
* @memberof PanRecognizer
... ... @@ -2387,19 +2387,19 @@ inherit(PanRecognizer, AttrRecognizer, {
}
this._super.emit.call(this, input);
}
});
});
/**
/**
* Pinch
* Recognized when two or more pointers are moving toward (zoom-in) or away from each other (zoom-out).
* @constructor
* @extends AttrRecognizer
*/
function PinchRecognizer() {
function PinchRecognizer() {
AttrRecognizer.apply(this, arguments);
}
}
inherit(PinchRecognizer, AttrRecognizer, {
inherit(PinchRecognizer, AttrRecognizer, {
/**
* @namespace
* @memberof PinchRecognizer
... ... @@ -2426,22 +2426,22 @@ inherit(PinchRecognizer, AttrRecognizer, {
}
this._super.emit.call(this, input);
}
});
});
/**
/**
* Press
* Recognized when the pointer is down for x ms without any movement.
* @constructor
* @extends Recognizer
*/
function PressRecognizer() {
function PressRecognizer() {
Recognizer.apply(this, arguments);
this._timer = null;
this._input = null;
}
}
inherit(PressRecognizer, Recognizer, {
inherit(PressRecognizer, Recognizer, {
/**
* @namespace
* @memberof PressRecognizer
... ... @@ -2497,19 +2497,19 @@ inherit(PressRecognizer, Recognizer, {
this.manager.emit(this.options.event, this._input);
}
}
});
});
/**
/**
* Rotate
* Recognized when two or more pointer are moving in a circular motion.
* @constructor
* @extends AttrRecognizer
*/
function RotateRecognizer() {
function RotateRecognizer() {
AttrRecognizer.apply(this, arguments);
}
}
inherit(RotateRecognizer, AttrRecognizer, {
inherit(RotateRecognizer, AttrRecognizer, {
/**
* @namespace
* @memberof RotateRecognizer
... ... @@ -2528,19 +2528,19 @@ inherit(RotateRecognizer, AttrRecognizer, {
return this._super.attrTest.call(this, input) &&
(Math.abs(input.rotation) > this.options.threshold || this.state & STATE_BEGAN);
}
});
});
/**
/**
* Swipe
* Recognized when the pointer is moving fast (velocity), with enough distance in the allowed direction.
* @constructor
* @extends AttrRecognizer
*/
function SwipeRecognizer() {
function SwipeRecognizer() {
AttrRecognizer.apply(this, arguments);
}
}
inherit(SwipeRecognizer, AttrRecognizer, {
inherit(SwipeRecognizer, AttrRecognizer, {
/**
* @namespace
* @memberof SwipeRecognizer
... ... @@ -2584,9 +2584,9 @@ inherit(SwipeRecognizer, AttrRecognizer, {
this.manager.emit(this.options.event, input);
}
});
});
/**
/**
* A tap is ecognized when the pointer is doing a small tap/click. Multiple taps are recognized if they occur
* between the given interval and position. The delay option can be used to recognize multi-taps without firing
* a single tap.
... ... @@ -2596,7 +2596,7 @@ inherit(SwipeRecognizer, AttrRecognizer, {
* @constructor
* @extends Recognizer
*/
function TapRecognizer() {
function TapRecognizer() {
Recognizer.apply(this, arguments);
// previous time and center,
... ... @@ -2607,9 +2607,9 @@ function TapRecognizer() {
this._timer = null;
this._input = null;
this.count = 0;
}
}
inherit(TapRecognizer, Recognizer, {
inherit(TapRecognizer, Recognizer, {
/**
* @namespace
* @memberof PinchRecognizer
... ... @@ -2699,30 +2699,30 @@ inherit(TapRecognizer, Recognizer, {
this.manager.emit(this.options.event, this._input);
}
}
});
});
/**
/**
* Simple way to create a manager with a default set of recognizers.
* @param {HTMLElement} element
* @param {Object} [options]
* @constructor
*/
function Hammer(element, options) {
function Hammer(element, options) {
options = options || {};
options.recognizers = ifUndefined(options.recognizers, Hammer.defaults.preset);
return new Manager(element, options);
}
}
/**
/**
* @const {string}
*/
Hammer.VERSION = '2.0.8';
Hammer.VERSION = '2.0.8';
/**
/**
* default settings
* @namespace
*/
Hammer.defaults = {
Hammer.defaults = {
/**
* set if DOM events are being triggered.
* But this is slower and unused by simple implementations, so disabled by default.
... ... @@ -2828,18 +2828,18 @@ Hammer.defaults = {
*/
tapHighlightColor: 'rgba(0,0,0,0)'
}
};
};
var STOP = 1;
var FORCED_STOP = 2;
var STOP = 1;
var FORCED_STOP = 2;
/**
/**
* Manager
* @param {HTMLElement} element
* @param {Object} [options]
* @constructor
*/
function Manager(element, options) {
function Manager(element, options) {
this.options = assign({}, Hammer.defaults, options || {});
this.options.inputTarget = this.options.inputTarget || element;
... ... @@ -2860,9 +2860,9 @@ function Manager(element, options) {
item[2] && recognizer.recognizeWith(item[2]);
item[3] && recognizer.requireFailure(item[3]);
}, this);
}
}
Manager.prototype = {
Manager.prototype = {
/**
* set options
* @param {Object} options
... ... @@ -3104,14 +3104,14 @@ Manager.prototype = {
this.input.destroy();
this.element = null;
}
};
};
/**
/**
* add/remove the css properties as defined in manager.options.cssProps
* @param {Manager} manager
* @param {Boolean} add
*/
function toggleCssProps(manager, add) {
function toggleCssProps(manager, add) {
var element = manager.element;
if (!element.style) {
return;
... ... @@ -3129,21 +3129,21 @@ function toggleCssProps(manager, add) {
if (!add) {
manager.oldCssProps = {};
}
}
}
/**
/**
* trigger dom event
* @param {String} event
* @param {Object} data
*/
function triggerDomEvent(event, data) {
function triggerDomEvent(event, data) {
var gestureEvent = document.createEvent('Event');
gestureEvent.initEvent(event, true, true);
gestureEvent.gesture = data;
data.target.dispatchEvent(gestureEvent);
}
}
assign(Hammer, {
assign(Hammer, {
INPUT_START: INPUT_START,
INPUT_MOVE: INPUT_MOVE,
INPUT_END: INPUT_END,
... ... @@ -3194,22 +3194,22 @@ assign(Hammer, {
inherit: inherit,
bindFn: bindFn,
prefixed: prefixed
});
});
// this prevents errors when Hammer is loaded in the presence of an AMD
// style loader but by script tag, not by the loader.
var freeGlobal = (typeof window !== 'undefined' ? window : (typeof self !== 'undefined' ? self : {})); // jshint ignore:line
freeGlobal.Hammer = Hammer;
var freeGlobal = (typeof window !== 'undefined' ? window : (typeof self !== 'undefined' ? self : {})); // jshint ignore:line
freeGlobal.Hammer = Hammer;
if (typeof define === 'function' && define.amd) {
if (typeof define === 'function' && define.amd) {
define(function() {
return Hammer;
});
} else if (typeof module != 'undefined' && module.exports) {
} else if (typeof module != 'undefined' && module.exports) {
module.exports = Hammer;
} else {
} else {
window[exportName] = Hammer;
}
}
})(window, document, 'Hammer');
... ... @@ -3640,8 +3640,8 @@ if (typeof define === 'function' && define.amd) {
}($);
/* ===============================================================================
************ Pull to refreh ************
=============================================================================== */
************ Pull to refreh ************
=============================================================================== */
/* global $:true */
+function ($) {
... ... @@ -3761,8 +3761,8 @@ if (typeof define === 'function' && define.amd) {
}($);
/* ===============================================================================
************ Infinite ************
=============================================================================== */
************ Infinite ************
=============================================================================== */
/* global $:true */
+function ($) {
"use strict";
... ... @@ -3889,8 +3889,8 @@ if (typeof define === 'function' && define.amd) {
}($);
/*===========================
Device/OS Detection
===========================*/
Device/OS Detection
===========================*/
/* global $:true */
;(function ($) {
"use strict";
... ... @@ -3994,8 +3994,8 @@ Device/OS Detection
})($);
/*======================================================
************ Picker ************
======================================================*/
************ Picker ************
======================================================*/
/* global $:true */
/* jshint unused:false */
/* jshint multistr:true */
... ... @@ -4962,8 +4962,8 @@ Device/OS Detection
}($);
/*======================================================
************ Calendar ************
======================================================*/
************ Calendar ************
======================================================*/
/* global $:true */
/*jshint unused: false*/
+function ($) {
... ... @@ -5886,12 +5886,22 @@ Device/OS Detection
$(this.input).picker(p);
}
var date=new Date();
var dat=date.getDate();
console.log(dat);
if(dat<10){
dat='0'+dat;
}else{
dat=dat
}
Datetime.prototype = {
getDays : function(max) {
var days = [];
for(var i=1; i<= (max||31);i++) {
days.push(i < 10 ? "0"+i : i);
}
//for(var i=1; i<= (max||31);i++) {
// days.push(i < 10 ? "0"+i : i);
//}
days.push(dat);
return days;
},
... ... @@ -5967,7 +5977,16 @@ Device/OS Detection
{
values: (function () {
var dates = [];
for (var i=1; i<=31; i++) dates.push(formatNumber(i));
var date=new Date();
var dat=date.getDate();
console.log(dat);
if(dat<10){
dat='0'+dat;
}else{
dat=dat
}
//for (var i=1; i<=31; i++)
dates.push(dat);
return dates;
})()
},
... ... @@ -6014,11 +6033,17 @@ Device/OS Detection
});
};
//自定义月
var date=new Date();
var month=date.getMonth()+1;
if(month<10){
month='0'+month
}else{
month=month;
}
defaults = $.fn.datetimePicker.prototype.defaults = {
input: undefined, // 默认值
min: undefined, // YYYY-MM-DD 最大最小值只比较年月日,不比较时分秒
max: undefined, // YYYY-MM-DD
... ... @@ -6026,7 +6051,7 @@ Device/OS Detection
monthSplit: '-',
dateSplit: '', // 默认为空
datetimeSplit: ' ', // 日期和时间之间的分隔符,不可为空
monthes: ('01 02 03 04 05 06 07 08 09 10 11 12').split(' '),
monthes: (month).split(' '),
// monthes:month.split(' '),
years: (function () {
var arr = [];
... ... @@ -6078,8 +6103,8 @@ Device/OS Detection
}($);
/*======================================================
************ Picker ************
======================================================*/
************ Picker ************
======================================================*/
/* global $:true */
+ function($) {
... ... @@ -6135,8 +6160,8 @@ Device/OS Detection
}($);
/* ===============================================================================
************ Notification ************
=============================================================================== */
************ Notification ************
=============================================================================== */
/* global $:true */
+function ($) {
"use strict";
... ... @@ -6348,8 +6373,8 @@ Device/OS Detection
}($);
/* ===============================================================================
************ Swipeout ************
=============================================================================== */
************ Swipeout ************
=============================================================================== */
/* global $:true */
+function ($) {
... ...
... ... @@ -293,7 +293,7 @@
box-sizing: border-box;
-webkit-transition: 300ms;
transition: 300ms;
font-size:0.2rem;
font-size:0.3rem;
}
[v-cloak]{
display:none;
... ... @@ -509,7 +509,7 @@
<div class="weui-cell">
<div class="weui-cell__hd"><label for="time4" class="weui-label" style="font-size:0.3rem;color:#333333">定制时间</label></div>
<div class="weui-cell__bd" style="margin-left: 47px;font-size: 0.3rem;color:#333333">
<div class="weui-cell__bd" style="margin-left: 0.2rem;font-size: 0.3rem;color:#333333">
<input class="weui-input" id="time4" type="text" value="">
</div>
</div>
... ...