test

.idea/workspace.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
+      <change beforePath="$PROJECT_DIR$/static/js/common.js" afterPath="$PROJECT_DIR$/static/js/common.js" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -60,8 +60,8 @@
       <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="436">
-              <caret line="18" column="80" lean-forward="true" selection-start-line="18" selection-start-column="80" selection-end-line="18" selection-end-column="80" />
+            <state relative-caret-position="260">
+              <caret line="72" column="266" lean-forward="false" selection-start-line="72" selection-start-column="266" selection-end-line="72" selection-end-column="266" />
               <folding>
                 <marker date="1525271102652" expanded="true" signature="18737:18749" ph="..." />
               </folding>
@@ -69,6 +69,22 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="common.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/static/js/common.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="221">
+              <caret line="1148" column="19" lean-forward="false" selection-start-line="1148" selection-start-column="19" selection-end-line="1148" selection-end-column="19" />
+              <folding>
+                <marker date="1525271329434" expanded="true" signature="32210:32216" ph=" " />
+                <marker date="1525271329434" expanded="true" signature="32216:32222" ph=" " />
+                <marker date="1525271329434" expanded="true" signature="36342:36348" ph=" " />
+                <marker date="1525271329434" expanded="true" signature="36348:36354" ph=" " />
+                <marker date="1525271329434" expanded="true" signature="41658:41664" ph="..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
@@ -89,6 +105,7 @@
       <find>ct2 wp cl week_ct2</find>
       <find>jquery</find>
       <find>$groupnav</find>
+      <find>收藏</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -107,6 +124,7 @@
         <option value="$PROJECT_DIR$/source/function/function_group.php" />
         <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
+        <option value="$PROJECT_DIR$/static/js/common.js" />
       </list>
     </option>
   </component>
@@ -203,12 +221,12 @@
       <workItem from="1525013350506" duration="115000" />
       <workItem from="1525013490770" duration="4105000" />
       <workItem from="1525181078381" duration="610000" />
-      <workItem from="1525227575525" duration="7126000" />
+      <workItem from="1525227575525" duration="7243000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="11956000" />
+    <option name="totallyTimeSpent" value="12073000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -287,13 +305,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/common.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-67">
-          <caret line="413" column="9" lean-forward="false" selection-start-line="413" selection-start-column="9" selection-end-line="413" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/data/template/3_3_common_showmessage.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1410">
@@ -434,10 +445,24 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/static/js/common.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="1148" column="19" lean-forward="false" selection-start-line="1148" selection-start-column="19" selection-end-line="1148" selection-end-column="19" />
+          <folding>
+            <marker date="1525271329434" expanded="true" signature="32210:32216" ph=" " />
+            <marker date="1525271329434" expanded="true" signature="32216:32222" ph=" " />
+            <marker date="1525271329434" expanded="true" signature="36342:36348" ph=" " />
+            <marker date="1525271329434" expanded="true" signature="36348:36354" ph=" " />
+            <marker date="1525271329434" expanded="true" signature="41658:41664" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="18" column="80" lean-forward="true" selection-start-line="18" selection-start-column="80" selection-end-line="18" selection-end-column="80" />
+        <state relative-caret-position="260">
+          <caret line="72" column="266" lean-forward="false" selection-start-line="72" selection-start-column="266" selection-end-line="72" selection-end-column="266" />
           <folding>
             <marker date="1525271102652" expanded="true" signature="18737:18749" ph="..." />
           </folding>

static/js/common.js

@@ -1146,7 +1146,7 @@ function showDialog(msg, mode, t, func, cover, funccancel, leftmsg, confirmtxt,
 function showWindow(k, url, mode, cache, menuv) {
 	mode = isUndefined(mode) ? 'get' : mode;
 	cache = isUndefined(cache) ? 1 : cache;
-	var menuid = 'fwin_' + k;
+	var menuid = '#fwin_' + k;
 	var menuObj = $(menuid);
 	var drag = null;
 	var loadingst = null;