Merge remote-tracking branch 'origin/master' into fix-google-workflow-review

Conflicts:
	plugins/c9.profile/component/project/new/Google.jsx
pull/128/merge
Matthijs van Henten 2016-01-18 09:45:00 +00:00
commit 02df1f6f61
2 zmienionych plików z 4 dodań i 4 usunięć

Wyświetl plik

@ -1,7 +1,7 @@
{
"name": "c9",
"description": "New Cloud9 Client",
"version": "3.1.1055",
"version": "3.1.1062",
"author": "Ajax.org B.V. <info@ajax.org>",
"private": true,
"main": "bin/c9",

Wyświetl plik

@ -111,7 +111,7 @@ define(function(require, exports, module) {
hide();
});
}
error.className = "errorlabel "
error.className = "errorlabel c9error "
+ (message.className ? message.className : "");
if (!message.noError) {
@ -141,7 +141,7 @@ define(function(require, exports, module) {
// Start anim
lastClassname = message.className;
setTimeout(function() {
error.className = "errorlabel anim " + (offset > 0 ? "fade-in" : "")
error.className = "errorlabel c9error anim " + (offset > 0 ? "fade-in" : "")
+ " " + (message.className || "");
error.style.top = (offset + topPx) + "px";
error.style.opacity = 1;
@ -164,7 +164,7 @@ define(function(require, exports, module) {
if (!error || error.style.display === "none")
return callback && callback();
error.className = "errorlabel anim " + (offset > 0 ? "fade-in " : " ")
error.className = "errorlabel c9error anim " + (offset > 0 ? "fade-in " : " ")
+ (lastClassname ? lastClassname : "");
if (offset > 0)
error.style.opacity = 0;