When was the Battle of Ta'if?

The Prophet, peace and blessings be upon him, went to Ta'if in Shawwal of the the tenth year of his prophethood, after the death of his uncle Abu Talib and his wife Khadijah, may Allah be pleased with her. He stayed there for ten days, but its people harmed him and did not respond to him. They pelted him with stones until his ankles bled.

On his way back to Mecca, Addas the Christian believed in him. Allah then directed a group of jinn to him, who listened to the Quran and embraced Islam. Allah sent the Angel of Mountains to him to crush the people of Ta'if between the two mountains, but he refused, and supplicated with his famous supplication: "O Allah, to You alone I complain of my weakness..." Then he entered Mecca under the protection of Mut'im ibn Adi.