Flat skin broken with Debian...?

[McFuzz]

Hi all,

Just upgarded from 1.27.1 to 1.28.0 on Debian wheezy through source. Everything appears to be working fine except the flat skin; I am getting a plethora of the following errors:

Code: Select all

2014-11-10 00:28:19.237025	web_js	30363	ERR	Uncaught SyntaxError: Unexpected token <<	skins/flat/js/skin.js	309

As well as the following when I try to click on a monitor and rather than a pop-up, Chrome just opens it as a new page in the same tab:

Code: Select all

2014-11-10 00:28:20.601655	web_js	30363	ERR	Uncaught ReferenceError: createPopup is not defined	index.php	102

I went to the classic theme and everything appears to be working just fine.


I've confirmed the same behavior is occurring on Safari. Prior to the upgrade, the flat theme worked just fine in 1.27.1...

Any ideas?

Thanks!

[McFuzz]

Figured it out:

On my end, in .../zm/skins/flat/js/skin.js, commenting lines 309 through 312, followed by restart zoneminder, did the trick:

Code: Select all

//<<<<<<< HEAD
//=======
//
//>>>>>>> release-1.28
window.addEvent( 'domready', checkSize);

Not sure if it is just Debian who was unhappy or all others - but originally it looked like this:

Code: Select all

<<<<<<< HEAD
=======

>>>>>>> release-1.28
window.addEvent( 'domready', checkSize);

[knight-of-ni]

Thought this one was already fixed. It is now.
https://github.com/ZoneMinder/ZoneMinde ... a08c71d4b7