SilentLittleCat 7 anos atrás
pai
commit
fbc4cd1294
2 arquivos alterados com 17 adições e 17 exclusões
  1. 16 17
      .idea/workspace.xml
  2. 1 0
      static/js/common.js

+ 16 - 17
.idea/workspace.xml

xqd xqd xqd xqd
@@ -2,7 +2,6 @@
 <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" />
@@ -73,14 +72,14 @@
       <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="1213" column="24" lean-forward="false" selection-start-line="1213" selection-start-column="24" selection-end-line="1213" selection-end-column="24" />
+            <state relative-caret-position="314">
+              <caret line="1204" column="26" lean-forward="false" selection-start-line="1204" selection-start-column="26" selection-end-line="1204" selection-end-column="26" />
               <folding>
-                <marker date="1525271831357" expanded="true" signature="32210:32216" ph=" " />
-                <marker date="1525271831357" expanded="true" signature="32216:32222" ph=" " />
-                <marker date="1525271831357" expanded="true" signature="36349:36355" ph=" " />
-                <marker date="1525271831357" expanded="true" signature="36355:36361" ph=" " />
-                <marker date="1525271831357" expanded="true" signature="41666:41672" ph="..." />
+                <marker date="1525271979830" expanded="true" signature="32210:32216" ph=" " />
+                <marker date="1525271979830" expanded="true" signature="32216:32222" ph=" " />
+                <marker date="1525271979830" expanded="true" signature="36370:36376" ph=" " />
+                <marker date="1525271979830" expanded="true" signature="36376:36382" ph=" " />
+                <marker date="1525271979830" expanded="true" signature="41687:41693" ph="..." />
               </folding>
             </state>
           </provider>
@@ -223,12 +222,12 @@
       <workItem from="1525013350506" duration="115000" />
       <workItem from="1525013490770" duration="4105000" />
       <workItem from="1525181078381" duration="610000" />
-      <workItem from="1525227575525" duration="7737000" />
+      <workItem from="1525227575525" duration="7885000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="12567000" />
+    <option name="totallyTimeSpent" value="12715000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -459,14 +458,14 @@
     </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="1213" column="24" lean-forward="false" selection-start-line="1213" selection-start-column="24" selection-end-line="1213" selection-end-column="24" />
+        <state relative-caret-position="314">
+          <caret line="1204" column="26" lean-forward="false" selection-start-line="1204" selection-start-column="26" selection-end-line="1204" selection-end-column="26" />
           <folding>
-            <marker date="1525271831357" expanded="true" signature="32210:32216" ph=" " />
-            <marker date="1525271831357" expanded="true" signature="32216:32222" ph=" " />
-            <marker date="1525271831357" expanded="true" signature="36349:36355" ph=" " />
-            <marker date="1525271831357" expanded="true" signature="36355:36361" ph=" " />
-            <marker date="1525271831357" expanded="true" signature="41666:41672" ph="..." />
+            <marker date="1525271979830" expanded="true" signature="32210:32216" ph=" " />
+            <marker date="1525271979830" expanded="true" signature="32216:32222" ph=" " />
+            <marker date="1525271979830" expanded="true" signature="36370:36376" ph=" " />
+            <marker date="1525271979830" expanded="true" signature="36376:36382" ph=" " />
+            <marker date="1525271979830" expanded="true" signature="41687:41693" ph="..." />
           </folding>
         </state>
       </provider>

+ 1 - 0
static/js/common.js

xqd
@@ -1202,6 +1202,7 @@ function showWindow(k, url, mode, cache, menuv) {
 	};
 
 	if(!menuObj) {
+		console.log('ok');
 		menuObj = document.createElement('div');
 		menuObj.id = menuid;
 		menuObj.className = 'fwinmask';