wait #7710 @0.5

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index 71105b78ca3cc750a83a246261cc47692d9a6967..0114a76169210ffe9259393a301f1a6a2b8566d1 100644 (file)
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-252.23892.409">
+  <component name="dataSourceStorageLocal" created-in="IU-252.25557.131">
     <data-source name="MySQL - dev.fluidbook.com" uuid="9a7a0ad9-c6dc-4e29-b76d-f95d9cb2182a">
       <database-info product="MySQL" version="5.6.27-0ubuntu0.15.04.1-log" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.35 ( Revision: 5fb9c5849535c13917c2cf9baaece6ef9693ef27 )" dbms="MYSQL" exact-version="5.6.27">
         <extra-name-characters>#@</extra-name-characters>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ad5eeef1c3c4bc0fd8fa5d45f71bb211bd8fe401..6e09321bad1243d1d5f3236fd53c309f0a69243c 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,11 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wait #7140 @1">
-      <change beforePath="$PROJECT_DIR$/.docker/production/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/production/docker-compose.yml" afterDir="false" />
+    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wait #7698 @1">
       <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/application/views/helpers/ExemplePublication.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/views/helpers/ExemplePublication.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CubeIT/js/cube.js" beforeDir="false" afterPath="$PROJECT_DIR$/CubeIT/js/cube.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/js/002-common.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/002-common.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -639,8 +639,8 @@
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-jdk-9823dce3aa75-bf35d07a577b-intellij.indexing.shared.core-IU-252.23892.409" />
-        <option value="bundled-js-predefined-d6986cc7102b-e03c56caf84a-JavaScript-IU-252.23892.409" />
+        <option value="bundled-jdk-9823dce3aa75-bf35d07a577b-intellij.indexing.shared.core-IU-252.25557.131" />
+        <option value="bundled-js-predefined-d6986cc7102b-b598e85cdad2-JavaScript-IU-252.25557.131" />
       </set>
     </attachedChunks>
   </component>
@@ -860,7 +860,9 @@
       <workItem from="1747127803785" duration="2920000" />
       <workItem from="1747400653125" duration="1460000" />
       <workItem from="1753189368962" duration="835000" />
-      <workItem from="1755779481986" duration="152000" />
+      <workItem from="1755779481986" duration="273000" />
+      <workItem from="1756890322781" duration="10955000" />
+      <workItem from="1757060344328" duration="760000" />
     </task>
     <task id="LOCAL-00117" summary="fix #1407 @1">
       <created>1494411210038</created>
@@ -1205,7 +1207,7 @@
       <option name="project" value="LOCAL" />
       <updated>1682409989659</updated>
     </task>
-    <option name="localTasksCounter" value="185" />
+    <option name="localTasksCounter" value="186" />
     <servers>
       <Redmine shared="true" url="https://team.cubedesigners.com/redmine">
         <option name="APIKey" value="ee454486fcd47aa38e5c99d5a7dc44cff1f65597" />
@@ -1248,7 +1250,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="wait #4191 @0.75" />
     <MESSAGE value="wip #4191 @0.5" />
     <MESSAGE value="wip #3753" />
     <MESSAGE value="wait #5341 @1" />
@@ -1273,7 +1274,8 @@
     <MESSAGE value="wait #7480 @1" />
     <MESSAGE value="wait #7482 @0.5" />
     <MESSAGE value="wait #7140 @1" />
-    <option name="LAST_COMMIT_MESSAGE" value="wait #7140 @1" />
+    <MESSAGE value="wait #7698 @1" />
+    <option name="LAST_COMMIT_MESSAGE" value="wait #7698 @1" />
     <option name="NON_MODAL_COMMIT_POSTPONE_SLOW_CHECKS" value="false" />
   </component>
   <component name="XDebuggerManager">

diff --git a/CubeIT/js/cube.js b/CubeIT/js/cube.js
index d4ee9100b566407fe24195dc90adc83f10720181..4882b13fcc3f1eb9610af0cb8b5ac89411ec79dd 100644 (file)
--- a/CubeIT/js/cube.js
+++ b/CubeIT/js/cube.js
@@ -888,6 +888,7 @@ function getSelector(name) {
 }
 
 function truePopup(url) {
+    console.log('true popup', url);
     var rand = Math.round(Math.random() * 200);
     window.open(url, 'Popup' + rand, 'width=' + screen.availWidth + ',height=' + screen.availHeight);
 }

diff --git a/js/002-common.js b/js/002-common.js
index e03a12b83e7d56ae3a1129c2a58fa2fd7ee7c9b6..2a979c60718b3950020450cceca7c2cc39780eeb 100644 (file)
--- a/js/002-common.js
+++ b/js/002-common.js
@@ -34,17 +34,22 @@ function load_common() {
     });\r
 \r
     $(document).on('click', '[data-event]', function () {\r
-        var e = $(this).data('event');\r
-        if (e.value === undefined) {\r
-            e.value = 1;\r
-        }\r
-        if (e.action === undefined) {\r
-            e.action = 'click';\r
-        }\r
+        try {\r
+            var e = $(this).data('event');\r
+            if (e.value === undefined) {\r
+                e.value = 1;\r
+            }\r
+            if (e.action === undefined) {\r
+                e.action = 'click';\r
+            }\r
 \r
-        e.label = e.label.replace(/%href%/gi, $(this).attr('href'));\r
+            e.label = e.label.replace(/%href%/gi, $(this).attr('href'));\r
 \r
-        ga('send', 'event', e.category, e.action, e.label, e.value);\r
+            ga('send', 'event', e.category, e.action, e.label, e.value);\r
+\r
+        } catch (e) {\r
+            console.warn(e);\r
+        }\r
         return true;\r
     });\r
 \r