Read the statement by Michael Teeuw here.
Recurring events Calender
-
@dawookie1979 what files?
need the names -
@sdetweil error: Your local changes to the following files would be overwritten by checkout:
modules/default/calendar/calendar.js
modules/default/weatherforecast/weatherforecast.js
Please commit your changes or stash them before you switch branches.
Aborting -
@dawookie1979 those are mm files.
some users don’t understand that you should never change those files to prevent the very problem u are having.
you put variables in the config section of the module entry in config.js to adjust how the module operates
see the link below in my signature on how to add modules.
the command
git diff filename
will show u all the changes you have made.
write them down, and transfer those to config.js for each module
calendar and weatherforecastthen we can work on the next step
-
@sdetweil i have made the changes to the files, but it says this
code_text
diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js
index 83389911…d6dc98ac 100644
— a/modules/default/weatherforecast/weatherforecast.js
+++ b/modules/default/weatherforecast/weatherforecast.js
@@ -293,13 +293,10 @@ Module.register(“weatherforecast”, {
this.hide(this.config.animationSpeed, { lockString: this.identifier });
return;
}params += "&cnt=" + (this.config.maxNumberOfDays < 1 || this.config.maxNumberOfDays > 17 ? 7 : this.config.maxNumberOfDays);
-
params += "&units=" + this.config.units; params += "&lang=" + this.config.lang; params += "&APPID=" + this.config.appid;
-
return params; },
but there is no gap between these entries?```
-
-
@dawookie1979 ok, looks like you changed the code in the weatherforecast module…
so, you can save/restore that… how about the calendar file
-
@sdetweil i have done calendar file, how do i get an original weatherforcast.js file? or restore it?
-
git stash
you may have to register your name and email with the git commands shown from stash
-
@sdetweil I have sorted it now, I just deleted the stuck file, and did the upgrade/update to 2.14 and all is good. My calendar is now fixed. Thank you for your help