test

.idea/workspace.xml

@@ -57,10 +57,10 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="false">
         <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="260">
+            <state relative-caret-position="302">
               <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="..." />
@@ -69,17 +69,17 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="common.js" pinned="false" current-in-tab="false">
+      <file leaf-file-name="common.js" pinned="false" current-in-tab="true">
         <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" />
+            <state relative-caret-position="345">
+              <caret line="1149" column="24" lean-forward="false" selection-start-line="1149" selection-start-column="24" selection-end-line="1149" selection-end-column="24" />
               <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="..." />
+                <marker date="1525271438429" expanded="true" signature="32210:32216" ph=" " />
+                <marker date="1525271438429" expanded="true" signature="32216:32222" ph=" " />
+                <marker date="1525271438429" expanded="true" signature="36363:36369" ph=" " />
+                <marker date="1525271438429" expanded="true" signature="36369:36375" ph=" " />
+                <marker date="1525271438429" expanded="true" signature="41679:41685" ph="..." />
               </folding>
             </state>
           </provider>
@@ -221,12 +221,12 @@
       <workItem from="1525013350506" duration="115000" />
       <workItem from="1525013490770" duration="4105000" />
       <workItem from="1525181078381" duration="610000" />
-      <workItem from="1525227575525" duration="7243000" />
+      <workItem from="1525227575525" duration="7347000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="12073000" />
+    <option name="totallyTimeSpent" value="12177000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -445,26 +445,26 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/common.js">
+    <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="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" />
+        <state relative-caret-position="302">
+          <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="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="..." />
+            <marker date="1525271102652" expanded="true" signature="18737:18749" ph="..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
+    <entry file="file://$PROJECT_DIR$/static/js/common.js">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="345">
+          <caret line="1149" column="24" lean-forward="false" selection-start-line="1149" selection-start-column="24" selection-end-line="1149" selection-end-column="24" />
           <folding>
-            <marker date="1525271102652" expanded="true" signature="18737:18749" ph="..." />
+            <marker date="1525271438429" expanded="true" signature="32210:32216" ph=" " />
+            <marker date="1525271438429" expanded="true" signature="32216:32222" ph=" " />
+            <marker date="1525271438429" expanded="true" signature="36363:36369" ph=" " />
+            <marker date="1525271438429" expanded="true" signature="36369:36375" ph=" " />
+            <marker date="1525271438429" expanded="true" signature="41679:41685" ph="..." />
           </folding>
         </state>
       </provider>

static/js/common.js

@@ -1146,7 +1146,8 @@ 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;
+	console.log(menuid);
 	var menuObj = $(menuid);
 	var drag = null;
 	var loadingst = null;