Procházet zdrojové kódy

- Because scrollbar uses [remote file from CDN](https://github.com/MaazAli/Meteor-Malihu-Custom-Scrollbar/blob/master/jquery.mCustomScrollbar.js#L50),
fork package to https://github.com/wekan/wekan-scrollbar and include
non-minified file locally to Wekan, so that using scrollbar works without direct connection
to Internet. Wekan should not load any external files by default, as was case before
new scrollbar, and is again now after this fix.

Closes #2056

Lauri Ojansivu před 6 roky
rodič
revize
c546464d9f

+ 1 - 1
.meteor/packages

@@ -88,4 +88,4 @@ mquandalle:moment
 msavin:usercache
 msavin:usercache
 wekan:wekan-ldap
 wekan:wekan-ldap
 wekan:accounts-cas
 wekan:accounts-cas
-maazalik:malihu-jquery-custom-scrollbar
+wekan-scrollbar

+ 1 - 1
.meteor/versions

@@ -82,7 +82,6 @@ launch-screen@1.1.1
 livedata@1.0.18
 livedata@1.0.18
 localstorage@1.2.0
 localstorage@1.2.0
 logging@1.1.19
 logging@1.1.19
-maazalik:malihu-jquery-custom-scrollbar@3.0.6
 matb33:collection-hooks@0.8.4
 matb33:collection-hooks@0.8.4
 matteodem:easy-search@1.6.4
 matteodem:easy-search@1.6.4
 mdg:validation-error@0.5.1
 mdg:validation-error@0.5.1
@@ -179,6 +178,7 @@ useraccounts:unstyled@1.14.2
 verron:autosize@3.0.8
 verron:autosize@3.0.8
 webapp@1.4.0
 webapp@1.4.0
 webapp-hashing@1.0.9
 webapp-hashing@1.0.9
+wekan-scrollbar@3.1.3
 wekan:accounts-cas@0.1.0
 wekan:accounts-cas@0.1.0
 wekan:wekan-ldap@0.0.2
 wekan:wekan-ldap@0.0.2
 yasaricli:slugify@0.0.7
 yasaricli:slugify@0.0.7

+ 1 - 0
Dockerfile

@@ -244,6 +244,7 @@ RUN \
     gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \
     gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \
     gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-cas.git && \
     gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-cas.git && \
     gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git && \
     gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git && \
+    gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-scrollbar.git && \
     sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js && \
     sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js && \
     cd /home/wekan/.meteor && \
     cd /home/wekan/.meteor && \
     gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \
     gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \

+ 1 - 0
rebuild-wekan.bat

@@ -33,6 +33,7 @@ git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-fl
 git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
 git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
 git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
 git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
 git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
 git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
+git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
 REM sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
 REM sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
 cd ..
 cd ..
 REM del /S /F /Q node_modules
 REM del /S /F /Q node_modules

+ 1 - 0
rebuild-wekan.sh

@@ -142,6 +142,7 @@ do
 		git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
 		git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
 		git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
 		git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
 		git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
 		git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
+		git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
 		if [[ "$OSTYPE" == "darwin"* ]]; then
 		if [[ "$OSTYPE" == "darwin"* ]]; then
 			echo "sed at macOS";
 			echo "sed at macOS";
 			sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
 			sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js

+ 5 - 4
releases/rebuild-release.sh

@@ -5,10 +5,11 @@
 		rm -rf packages
 		rm -rf packages
 		mkdir -p ~/repos/wekan/packages
 		mkdir -p ~/repos/wekan/packages
 		cd ~/repos/wekan/packages
 		cd ~/repos/wekan/packages
-                git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
-                git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
-                git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
-                git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
+		git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
+		git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
+		git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
+		git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
+		git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
 
 
 		if [[ "$OSTYPE" == "darwin"* ]]; then
 		if [[ "$OSTYPE" == "darwin"* ]]; then
 			echo "sed at macOS";
 			echo "sed at macOS";

+ 5 - 2
releases/virtualbox/rebuild-wekan.sh

@@ -88,8 +88,11 @@ do
 		cd ~/repos/wekan
 		cd ~/repos/wekan
 		mkdir -p ~/repos/wekan/packages
 		mkdir -p ~/repos/wekan/packages
 		cd ~/repos/wekan/packages
 		cd ~/repos/wekan/packages
-		git clone https://github.com/wekan/flow-router.git kadira-flow-router
-		git clone https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
+		git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
+		git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
+		git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
+		git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
+		git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
 
 
 		if [[ "$OSTYPE" == "darwin"* ]]; then
 		if [[ "$OSTYPE" == "darwin"* ]]; then
 			echo "sed at macOS";
 			echo "sed at macOS";

+ 5 - 0
snapcraft.yaml

@@ -152,6 +152,11 @@ parts:
               git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
               git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
               cd ..
               cd ..
             fi
             fi
+            if [ ! -d "packages/wekan-scrollbar" ]; then
+              cd packages
+              git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
+              cd ..
+            fi
             rm -rf package-lock.json .build
             rm -rf package-lock.json .build
             meteor add standard-minifier-js --allow-superuser
             meteor add standard-minifier-js --allow-superuser
             meteor npm install --allow-superuser
             meteor npm install --allow-superuser