kopia lustrzana https://github.com/c9/core
Merge remote-tracking branch 'origin/master' into fix-google-workflow-review
Conflicts: plugins/c9.profile/component/project/new/Google.jsxpull/128/merge
commit
02df1f6f61
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "c9",
|
"name": "c9",
|
||||||
"description": "New Cloud9 Client",
|
"description": "New Cloud9 Client",
|
||||||
"version": "3.1.1055",
|
"version": "3.1.1062",
|
||||||
"author": "Ajax.org B.V. <info@ajax.org>",
|
"author": "Ajax.org B.V. <info@ajax.org>",
|
||||||
"private": true,
|
"private": true,
|
||||||
"main": "bin/c9",
|
"main": "bin/c9",
|
||||||
|
|
|
@ -111,7 +111,7 @@ define(function(require, exports, module) {
|
||||||
hide();
|
hide();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
error.className = "errorlabel "
|
error.className = "errorlabel c9error "
|
||||||
+ (message.className ? message.className : "");
|
+ (message.className ? message.className : "");
|
||||||
|
|
||||||
if (!message.noError) {
|
if (!message.noError) {
|
||||||
|
@ -141,7 +141,7 @@ define(function(require, exports, module) {
|
||||||
// Start anim
|
// Start anim
|
||||||
lastClassname = message.className;
|
lastClassname = message.className;
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
error.className = "errorlabel anim " + (offset > 0 ? "fade-in" : "")
|
error.className = "errorlabel c9error anim " + (offset > 0 ? "fade-in" : "")
|
||||||
+ " " + (message.className || "");
|
+ " " + (message.className || "");
|
||||||
error.style.top = (offset + topPx) + "px";
|
error.style.top = (offset + topPx) + "px";
|
||||||
error.style.opacity = 1;
|
error.style.opacity = 1;
|
||||||
|
@ -164,7 +164,7 @@ define(function(require, exports, module) {
|
||||||
if (!error || error.style.display === "none")
|
if (!error || error.style.display === "none")
|
||||||
return callback && callback();
|
return callback && callback();
|
||||||
|
|
||||||
error.className = "errorlabel anim " + (offset > 0 ? "fade-in " : " ")
|
error.className = "errorlabel c9error anim " + (offset > 0 ? "fade-in " : " ")
|
||||||
+ (lastClassname ? lastClassname : "");
|
+ (lastClassname ? lastClassname : "");
|
||||||
if (offset > 0)
|
if (offset > 0)
|
||||||
error.style.opacity = 0;
|
error.style.opacity = 0;
|
||||||
|
|
Ładowanie…
Reference in New Issue