diff options
34 files changed, 969 insertions, 7141 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java index 1ffbde28..36c9d526 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java @@ -88,6 +88,7 @@ import java.util.regex.Pattern; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import org.apache.commons.io.FilenameUtils; import org.onap.portalsdk.analytics.error.RaptorException; import org.onap.portalsdk.analytics.error.RaptorRuntimeException; import org.onap.portalsdk.analytics.error.RaptorSchedularException; @@ -127,6 +128,8 @@ import org.onap.portalsdk.analytics.view.ReportData; import org.onap.portalsdk.analytics.xmlobj.DataColumnType; import org.onap.portalsdk.analytics.xmlobj.FormFieldType; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.onap.portalsdk.core.util.SecurityCodecUtil; +import org.owasp.esapi.ESAPI; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; @@ -486,20 +489,13 @@ public class ActionHandler extends org.onap.portalsdk.analytics.RaptorObject { request.getSession().removeAttribute(AppConstants.EMBEDDED_REPORTDATA_MAP); } //String pdfAttachmentKey = AppUtils.getRequestValue(request, "pdfAttachmentKey"); - String report_email_sent_log_id = AppUtils.getRequestValue(request, "log_id"); + String report_email_sent_log_id = ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),AppUtils.getRequestValue(request, "log_id")); logger.debug(EELFLoggerDelegate.debugLogger, ("Email PDF" + pdfAttachmentKey+" "+ report_email_sent_log_id)); //email pdf attachment specific if(nvl(pdfAttachmentKey).length()>0 && report_email_sent_log_id !=null) isEmailAttachment = true; if(isEmailAttachment) { - /* String query = "Select user_id, rep_id from CR_REPORT_EMAIL_SENT_LOG" + - " where rownum = 1" + - " and gen_key='"+pdfAttachmentKey.trim()+"'" + - " and log_id ="+report_email_sent_log_id.trim() + - " and (sysdate - sent_date) < 1 ";*/ - - String query = Globals.getDownloadAllEmailSent(); query = query.replace("[pdfAttachmentKey.trim()]", pdfAttachmentKey.trim()); query = query.replace("[report_email_sent_log_id.trim()]", report_email_sent_log_id.trim()); @@ -1031,7 +1027,8 @@ public class ActionHandler extends org.onap.portalsdk.analytics.RaptorObject { public String getQuickLinksJSON(HttpServletRequest request, String nextPage) { String jsonInString = null; try { - ArrayList<QuickLink> quickLinks = ReportLoader.getQuickLinksJSON(request, request.getParameter("quick_links_menu_id"),true); + + ArrayList<QuickLink> quickLinks = ReportLoader.getQuickLinksJSON(request, ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),request.getParameter("quick_links_menu_id")),true); ObjectMapper mapper = new ObjectMapper(); mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); @@ -1368,7 +1365,7 @@ public class ActionHandler extends org.onap.portalsdk.analytics.RaptorObject { public String reportDelete(HttpServletRequest request, String nextPage) { try { - String reportID = AppUtils.getRequestValue(request, AppConstants.RI_REPORT_ID); + String reportID = ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),AppUtils.getRequestValue(request, AppConstants.RI_REPORT_ID)); try { int i = Integer.parseInt(reportID); } catch(NumberFormatException ex) { @@ -1757,9 +1754,9 @@ public class ActionHandler extends org.onap.portalsdk.analytics.RaptorObject { if(request != null ) { for (int i = 0; i < reqParameters.length; i++) { if(!reqParameters[i].startsWith("ff")) - sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase()+"]", request.getParameter(reqParameters[i].toUpperCase()) ); + sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),request.getParameter(reqParameters[i].toUpperCase()) )); else - sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase()+"]", request.getParameter(reqParameters[i]) ); + sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),request.getParameter(reqParameters[i]) )); } } if(session != null ) { @@ -1886,7 +1883,7 @@ public class ActionHandler extends org.onap.portalsdk.analytics.RaptorObject { } } logger.debug(EELFLoggerDelegate.debugLogger, ("SQL2:\n"+ rr.getCachedSQL())); - String fileName = rr.getReportID()+"_"+userId+"_"+timestamp; + String fileName = FilenameUtils.normalize(rr.getReportID()+"_"+userId+"_"+timestamp); boolean flag = false; logger.debug(EELFLoggerDelegate.debugLogger, (""+Utils.isDownloadFileExists(rr.getReportID()+"_"+userId+"_"+dateStr))); // if(Utils.isDownloadFileExists(rr.getReportID()+"_"+userId+"_"+dateStr)) { @@ -1903,8 +1900,8 @@ public class ActionHandler extends org.onap.portalsdk.analytics.RaptorObject { request.setAttribute("message", messageBuffer.toString()); } else if(!flag) { - String whole_fileName = (Globals.getShellScriptDir() +AppConstants.SHELL_QUERY_DIR+ fileName+AppConstants.FT_SQL); - String whole_columnsfileName = (Globals.getShellScriptDir() +AppConstants.SHELL_QUERY_DIR+ fileName+AppConstants.FT_COLUMNS); + String whole_fileName = FilenameUtils.normalize (Globals.getShellScriptDir() +AppConstants.SHELL_QUERY_DIR+ fileName+AppConstants.FT_SQL); + String whole_columnsfileName = FilenameUtils.normalize (Globals.getShellScriptDir() +AppConstants.SHELL_QUERY_DIR+ fileName+AppConstants.FT_COLUMNS); logger.debug(EELFLoggerDelegate.debugLogger, ("FILENAME "+whole_fileName)); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportHandler.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportHandler.java index 8a5e7e3c..b4c6faac 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportHandler.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportHandler.java @@ -108,6 +108,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.apache.commons.io.FilenameUtils; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFDateUtil; @@ -2791,8 +2792,8 @@ public class ReportHandler extends org.onap.portalsdk.analytics.RaptorObject { logger.debug(EELFLoggerDelegate.debugLogger, ("Xls File name " + AppUtils.getTempFolderPath() + xlsFName)); - FileOutputStream xlsOut = new FileOutputStream(AppUtils.getTempFolderPath() - + xlsFName); + FileOutputStream xlsOut = new FileOutputStream(FilenameUtils.normalize(AppUtils.getTempFolderPath() + + xlsFName)); // BufferedWriter xlsOut = new BufferedWriter(new // FileWriter(AppUtils // .getTempFolderPath() @@ -2904,8 +2905,8 @@ public class ReportHandler extends org.onap.portalsdk.analytics.RaptorObject { for(Iterator iter = setReportRuntime.iterator(); iter.hasNext(); ) { count++; try { - xlsIn = new FileInputStream (AppUtils.getTempFolderPath() - + xlsFName); + xlsIn = new FileInputStream (FilenameUtils.normalize(AppUtils.getTempFolderPath() + + xlsFName)); } catch (FileNotFoundException e) { System.out.println ("File not found in the specified path."); @@ -2914,11 +2915,11 @@ public class ReportHandler extends org.onap.portalsdk.analytics.RaptorObject { if(xlsIn != null) { fileSystem = new POIFSFileSystem (xlsIn); wb = new HSSFWorkbook(fileSystem); - xlsOut = new FileOutputStream(AppUtils.getTempFolderPath() - + xlsFName); + xlsOut = new FileOutputStream(FilenameUtils.normalize(AppUtils.getTempFolderPath() + + xlsFName)); } else { - xlsOut = new FileOutputStream(AppUtils.getTempFolderPath() - + xlsFName); + xlsOut = new FileOutputStream(FilenameUtils.normalize(AppUtils.getTempFolderPath() + + xlsFName)); wb = new HSSFWorkbook(); } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java index 0d416ae2..3fa3ff91 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java @@ -88,6 +88,8 @@ import org.onap.portalsdk.analytics.util.AppConstants; import org.onap.portalsdk.analytics.util.DataSet; import org.onap.portalsdk.analytics.util.Utils; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.onap.portalsdk.core.util.SecurityCodecUtil; +import org.owasp.esapi.ESAPI; public class ReportLoader extends org.onap.portalsdk.analytics.RaptorObject { @@ -488,19 +490,19 @@ public class ReportLoader extends org.onap.portalsdk.analytics.RaptorObject { try{ String sql1= Globals.getDeleteReportRecordLog(); - sql1 = sql1.replace("[reportID]", reportID); + sql1 = sql1.replace("[reportID]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),reportID)); String sql2= Globals.getDeleteReportRecordUsers(); - sql2 = sql2.replace("[reportID]", reportID); + sql2 = sql2.replace("[reportID]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),reportID)); String sql3= Globals.getDeleteReportRecordSchedule(); - sql3 = sql3.replace("[reportID]", reportID); + sql3 = sql3.replace("[reportID]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),reportID)); String sql4= Globals.getDeleteReportRecordAccess(); - sql4 = sql4.replace("[reportID]", reportID); + sql4 = sql4.replace("[reportID]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),reportID)); String sql5= Globals.getDeleteReportRecordEmail(); - sql5 = sql5.replace("[reportID]", reportID); + sql5 = sql5.replace("[reportID]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),reportID)); String sql6= Globals.getDeleteReportRecordFavorite(); - sql6 = sql6.replace("[reportID]", reportID); + sql6 = sql6.replace("[reportID]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),reportID)); String sql7= Globals.getDeleteReportRecordReport(); - sql7 = sql7.replace("[reportID]", reportID); + sql7 = sql7.replace("[reportID]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),reportID)); DbUtils.executeUpdate(con, sql1); DbUtils.executeUpdate(con, sql2); @@ -580,9 +582,9 @@ public class ReportLoader extends org.onap.portalsdk.analytics.RaptorObject { roleList.append("," + ((String) iter.next())); String query = Globals.getLoadQuickLinks(); - query = query.replace("[userID]", userID); - query = query.replace("[roleList.toString()]", roleList.toString()); - query = query.replace("[nvls(menuId)]", nvls(menuId)); + query = query.replace("[userID]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),userID)); + query = query.replace("[roleList.toString()]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),roleList.toString())); + query = query.replace("[nvls(menuId)]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),nvls(menuId))); DataSet ds = DbUtils .executeQuery(query); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/SearchHandler.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/SearchHandler.java index 21c260bd..a6043ea7 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/SearchHandler.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/SearchHandler.java @@ -70,6 +70,7 @@ import java.util.Iterator; import javax.servlet.http.HttpServletRequest; +import org.apache.commons.io.FilenameUtils; import org.onap.portalsdk.analytics.controller.ErrorHandler; import org.onap.portalsdk.analytics.error.RaptorException; import org.onap.portalsdk.analytics.model.search.ReportSearchResult; @@ -83,6 +84,8 @@ import org.onap.portalsdk.analytics.system.Globals; import org.onap.portalsdk.analytics.util.AppConstants; import org.onap.portalsdk.analytics.util.DataSet; import org.onap.portalsdk.analytics.util.HtmlStripper; +import org.onap.portalsdk.core.util.SecurityCodecUtil; +import org.owasp.esapi.ESAPI; public class SearchHandler extends org.onap.portalsdk.analytics.RaptorObject { private static final String HTML_FORM = "forma"; @@ -128,9 +131,9 @@ public class SearchHandler extends org.onap.portalsdk.analytics.RaptorObject { String csvFName = AppUtils.generateFileName(request, (sr.getPageNo() < 0) ? AppConstants.FT_CSV_ALL : AppConstants.FT_CSV); - BufferedWriter csvOut = new BufferedWriter(new FileWriter(AppUtils + BufferedWriter csvOut = new BufferedWriter(new FileWriter(FilenameUtils.normalize(AppUtils .getTempFolderPath() - + csvFName)); + + csvFName))); createCSVFileContent(csvOut, sr); csvOut.close(); @@ -292,7 +295,7 @@ public class SearchHandler extends org.onap.portalsdk.analytics.RaptorObject { } else { rep_name_sql = " AND UPPER(cr.title) LIKE UPPER('%%') "; } - sql = sql.replace("[fReportName]", rep_name_sql); + sql = sql.replace("[fReportName]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),rep_name_sql)); if (menuId.length() > 0){ /*sql += "AND INSTR('|'||cr.menu_id||'|', '|'||'" + menuId + "'||'|') > 0 " diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java index 0ba8d4c7..156572f6 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java @@ -109,6 +109,8 @@ import org.onap.portalsdk.analytics.xmlobj.Reports; import org.onap.portalsdk.analytics.xmlobj.SemaphoreList; import org.onap.portalsdk.analytics.xmlobj.SemaphoreType; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.onap.portalsdk.core.util.SecurityCodecUtil; +import org.owasp.esapi.ESAPI; /**<HR/> * This class is part of <B><I>RAPTOR (Rapid Application Programming Tool for OLAP Reporting)</I></B><BR/> @@ -2965,15 +2967,15 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject { for (int i = 0; i < reqParameters.length; i++) { if(!reqParameters[i].startsWith("ff")) { if (nvl(request.getParameter(reqParameters[i].toUpperCase())).length() > 0) - sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase()+"]", request.getParameter(reqParameters[i].toUpperCase()) ); + sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(reqParameters[i].toUpperCase()) )); } else - sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase()+"]", request.getParameter(reqParameters[i]) ); + sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(reqParameters[i]) )); } for (int i = 0; i < scheduleSessionParameters.length; i++) { if(nvl(request.getParameter(scheduleSessionParameters[i])).trim().length()>0 ) - sql = Utils.replaceInString(sql, "[" + scheduleSessionParameters[i].toUpperCase()+"]", request.getParameter(scheduleSessionParameters[i]) ); + sql = Utils.replaceInString(sql, "[" + scheduleSessionParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(scheduleSessionParameters[i]) )); } } if(session != null ) { @@ -2998,7 +3000,7 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject { //debugLogger.debug("SQLSQLBASED no formfields " + sql); if(request != null ) { for (int i = 0; i < reqParameters.length; i++) { - sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase()+"]", request.getParameter(reqParameters[i]) ); + sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(reqParameters[i]) )); } } if(session != null ) { @@ -3009,9 +3011,9 @@ public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject { } } // if it is not multiple select and ParamValue is empty this is the place it can be replaced. - sql = Utils.replaceInString(sql, "[LOGGED_USERID]", userId); - sql = Utils.replaceInString(sql, "[USERID]", userId); - sql = Utils.replaceInString(sql, "[USER_ID]", userId); + sql = Utils.replaceInString(sql, "[LOGGED_USERID]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), userId)); + sql = Utils.replaceInString(sql, "[USERID]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), userId)); + sql = Utils.replaceInString(sql, "[USER_ID]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), userId)); //debugLogger.debug("SQLSQLBASED no formfields after" + sql); //debugLogger.debug("Replacing String 2 "+ sql); //debugLogger.debug("Replaced String " + sql); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java index e9a4df1f..f4b54a18 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java @@ -74,6 +74,8 @@ import org.onap.portalsdk.analytics.util.DataSet; import org.onap.portalsdk.analytics.util.Utils; import org.onap.portalsdk.analytics.xmlobj.FormFieldType; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.onap.portalsdk.core.util.SecurityCodecUtil; +import org.owasp.esapi.ESAPI; public class ReportSchedule extends RaptorObject { @@ -652,9 +654,9 @@ public class ReportSchedule extends RaptorObject { if (paramValue!=null && paramValue.length() > 0) { if(paramValue.toLowerCase().trim().startsWith("select ")) { - paramValue = Utils.replaceInString(paramValue, "[LOGGED_USERID]", userId); - paramValue = Utils.replaceInString(paramValue, "[USERID]", userId); - paramValue = Utils.replaceInString(paramValue, "[USER_ID]", userId); + paramValue = Utils.replaceInString(paramValue, "[LOGGED_USERID]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),userId)); + paramValue = Utils.replaceInString(paramValue, "[USERID]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),userId)); + paramValue = Utils.replaceInString(paramValue, "[USER_ID]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),userId)); paramValue = Utils.replaceInString(paramValue, "''", "'"); ds = ConnectionUtils.getDataSet(paramValue, dbInfo); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportFormFields.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportFormFields.java index 0693a1c7..285142f9 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportFormFields.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportFormFields.java @@ -57,6 +57,8 @@ import org.onap.portalsdk.analytics.util.Utils; import org.onap.portalsdk.analytics.xmlobj.ColFilterType; import org.onap.portalsdk.analytics.xmlobj.DataColumnType; import org.onap.portalsdk.analytics.xmlobj.FormFieldType; +import org.onap.portalsdk.core.util.SecurityCodecUtil; +import org.owasp.esapi.ESAPI; public class ReportFormFields extends Vector { private int nextElemIdx = 0; @@ -96,17 +98,17 @@ public class ReportFormFields extends Vector { if(fieldSQL!=null) { for (int i = 0; i < reqParameters.length; i++) { if(!reqParameters[i].startsWith("ff") && (request.getParameter(reqParameters[i].toUpperCase())!=null && request.getParameter(reqParameters[i].toUpperCase()).length() > 0)) - fieldSQL = Utils.replaceInString(fieldSQL, "[" + reqParameters[i].toUpperCase()+"]", request.getParameter(reqParameters[i].toUpperCase()) ); + fieldSQL = Utils.replaceInString(fieldSQL, "[" + reqParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(reqParameters[i].toUpperCase()) )); else if (request.getParameter(reqParameters[i])!=null && request.getParameter(reqParameters[i]).length() > 0) - fieldSQL = Utils.replaceInString(fieldSQL, "[" + reqParameters[i].toUpperCase()+"]", request.getParameter(reqParameters[i]) ); + fieldSQL = Utils.replaceInString(fieldSQL, "[" + reqParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(reqParameters[i]) )); } for (int i = 0; i < scheduleSessionParameters.length; i++) { //s_logger.debug(" Session " + " scheduleSessionParameters[i] " + scheduleSessionParameters[i].toUpperCase() + " " + request.getParameter(scheduleSessionParameters[i])); if(request.getParameter(scheduleSessionParameters[i])!=null && request.getParameter(scheduleSessionParameters[i]).trim().length()>0 ) - fieldSQL = Utils.replaceInString(fieldSQL, "[" + scheduleSessionParameters[i].toUpperCase()+"]", request.getParameter(scheduleSessionParameters[i]) ); + fieldSQL = Utils.replaceInString(fieldSQL, "[" + scheduleSessionParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(scheduleSessionParameters[i]) )); if(request.getAttribute(scheduleSessionParameters[i])!=null && ((String)request.getAttribute(scheduleSessionParameters[i])).trim().length()>0 ) - fieldSQL = Utils.replaceInString(fieldSQL, "[" + scheduleSessionParameters[i].toUpperCase()+"]", (String) request.getAttribute(scheduleSessionParameters[i]) ); + fieldSQL = Utils.replaceInString(fieldSQL, "[" + scheduleSessionParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), (String) request.getAttribute(scheduleSessionParameters[i]) )); } @@ -129,16 +131,16 @@ public class ReportFormFields extends Vector { if(fieldDefaultSQL!=null) { for (int i = 0; i < reqParameters.length; i++) { if(!reqParameters[i].startsWith("ff") && (request.getParameter(reqParameters[i].toUpperCase())!=null && request.getParameter(reqParameters[i].toUpperCase()).length() > 0)) - fieldDefaultSQL = Utils.replaceInString(fieldDefaultSQL, "[" + reqParameters[i].toUpperCase()+"]", request.getParameter(reqParameters[i].toUpperCase()) ); + fieldDefaultSQL = Utils.replaceInString(fieldDefaultSQL, "[" + reqParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(reqParameters[i].toUpperCase()) )); else if (request.getParameter(reqParameters[i])!=null && request.getParameter(reqParameters[i]).length() > 0) - fieldDefaultSQL = Utils.replaceInString(fieldDefaultSQL, "[" + reqParameters[i].toUpperCase()+"]", request.getParameter(reqParameters[i]) ); + fieldDefaultSQL = Utils.replaceInString(fieldDefaultSQL, "[" + reqParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(reqParameters[i]) )); } for (int i = 0; i < scheduleSessionParameters.length; i++) { //s_logger.debug(" Session " + " scheduleSessionParameters[i] " + scheduleSessionParameters[i].toUpperCase() + " " + request.getParameter(scheduleSessionParameters[i])); if(request.getParameter(scheduleSessionParameters[i])!=null && request.getParameter(scheduleSessionParameters[i]).trim().length()>0 ) - fieldDefaultSQL = Utils.replaceInString(fieldDefaultSQL, "[" + scheduleSessionParameters[i].toUpperCase()+"]", request.getParameter(scheduleSessionParameters[i]) ); + fieldDefaultSQL = Utils.replaceInString(fieldDefaultSQL, "[" + scheduleSessionParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(scheduleSessionParameters[i]) )); if(request.getAttribute(scheduleSessionParameters[i])!=null && ((String)request.getAttribute(scheduleSessionParameters[i])).trim().length()>0 ) - fieldDefaultSQL = Utils.replaceInString(fieldDefaultSQL, "[" + scheduleSessionParameters[i].toUpperCase()+"]", (String) request.getAttribute(scheduleSessionParameters[i]) ); + fieldDefaultSQL = Utils.replaceInString(fieldDefaultSQL, "[" + scheduleSessionParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), (String) request.getAttribute(scheduleSessionParameters[i]) )); } @@ -158,9 +160,9 @@ public class ReportFormFields extends Vector { if(rangeStartDateSQL!=null) { for (int i = 0; i < reqParameters.length; i++) { if(!reqParameters[i].startsWith("ff") && (request.getParameter(reqParameters[i].toUpperCase())!=null && request.getParameter(reqParameters[i].toUpperCase()).length() > 0)) - rangeStartDateSQL = Utils.replaceInString(rangeStartDateSQL, "[" + reqParameters[i].toUpperCase()+"]", request.getParameter(reqParameters[i].toUpperCase()) ); + rangeStartDateSQL = Utils.replaceInString(rangeStartDateSQL, "[" + reqParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(reqParameters[i].toUpperCase()) )); else if (request.getParameter(reqParameters[i])!=null && request.getParameter(reqParameters[i]).length() > 0) - rangeStartDateSQL = Utils.replaceInString(rangeStartDateSQL, "[" + reqParameters[i].toUpperCase()+"]", request.getParameter(reqParameters[i]) ); + rangeStartDateSQL = Utils.replaceInString(rangeStartDateSQL, "[" + reqParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(reqParameters[i]) )); } for (int i = 0; i < sessionParameters.length; i++) { if (session.getAttribute(sessionParameters[i])!=null && ((String)session.getAttribute(sessionParameters[i])).length() > 0) @@ -170,13 +172,13 @@ public class ReportFormFields extends Vector { if(rangeEndDateSQL!=null) { for (int i = 0; i < reqParameters.length; i++) { if(!reqParameters[i].startsWith("ff")&& (request.getParameter(reqParameters[i].toUpperCase())!=null && request.getParameter(reqParameters[i].toUpperCase()).length() > 0)) - rangeEndDateSQL = Utils.replaceInString(rangeEndDateSQL, "[" + reqParameters[i].toUpperCase()+"]", request.getParameter(reqParameters[i].toUpperCase()) ); + rangeEndDateSQL = Utils.replaceInString(rangeEndDateSQL, "[" + reqParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(reqParameters[i].toUpperCase()) )); else if (request.getParameter(reqParameters[i])!=null && request.getParameter(reqParameters[i]).length() > 0) rangeEndDateSQL = Utils.replaceInString(rangeEndDateSQL, "[" + reqParameters[i].toUpperCase()+"]", request.getParameter(reqParameters[i]) ); } for (int i = 0; i < sessionParameters.length; i++) { if (session.getAttribute(sessionParameters[i])!=null && ((String)session.getAttribute(sessionParameters[i])).length() > 0) - rangeEndDateSQL = Utils.replaceInString(rangeEndDateSQL, "[" + sessionParameters[i].toUpperCase()+"]", (String)session.getAttribute(sessionParameters[i]) ); + rangeEndDateSQL = Utils.replaceInString(rangeEndDateSQL, "[" + sessionParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), (String)session.getAttribute(sessionParameters[i]) )); } } String helpText = fft.getComment(); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java index d5911cbb..c50581e4 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportParamValuesForPDFExcel.java @@ -52,6 +52,8 @@ import org.onap.portalsdk.analytics.util.AppConstants; import org.onap.portalsdk.analytics.util.DataSet; import org.onap.portalsdk.analytics.util.Utils; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.onap.portalsdk.core.util.SecurityCodecUtil; +import org.owasp.esapi.ESAPI; public class ReportParamValuesForPDFExcel extends Hashtable { @@ -154,10 +156,10 @@ public class ReportParamValuesForPDFExcel extends Hashtable { if(sql!=null && sql.trim().length()>0){ if(name.equals(ff.getFieldName())){ - sql = Utils.replaceInString(sql, "[VALUE]", value); + sql = Utils.replaceInString(sql, "[VALUE]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),value)); } if(name.equals(ff1.getFieldName())){ - sql = Utils.replaceInString(sql, "["+ff1.getFieldDisplayName()+"]", value); + sql = Utils.replaceInString(sql, "["+ff1.getFieldDisplayName()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),value)); } else continue; } @@ -175,10 +177,10 @@ public class ReportParamValuesForPDFExcel extends Hashtable { if(sql!=null && sql.trim().length()>0){ if(name.equals(ff.getFieldName())){ - sql = Utils.replaceInString(sql, "[VALUE]", value); + sql = Utils.replaceInString(sql, "[VALUE]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),value)); } if(name.equals(ff1.getFieldName())){ - sql = Utils.replaceInString(sql, "["+ff1.getFieldDisplayName()+"]", value); + sql = Utils.replaceInString(sql, "["+ff1.getFieldDisplayName()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),value)); } else continue; } @@ -194,7 +196,7 @@ public class ReportParamValuesForPDFExcel extends Hashtable { if(name.length()<=0) name = ff.getFieldName(); value = rr.getParamValue(name); //debugLogger.debug("Name "+ name+ " value:" + value); - String paramValue = getParamValueForSQL(name, value); + String paramValue = ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), getParamValueForSQL(name, value)); //debugLogger.debug("PDFEXCEL " + name+ " " + ff.getFieldName()+ " " + value + " " + sql +" "+ paramValue); if(name!=null && name.equals(ff.getFieldName())) sql = Utils.replaceInString(sql, "[VALUE]", paramValue); @@ -206,7 +208,7 @@ public class ReportParamValuesForPDFExcel extends Hashtable { FormField ff2 = null; for (Iterator iter1 = rff.iterator(); iter1.hasNext();) { ff2 = (FormField)iter1.next(); - sql = Utils.replaceInString(sql, "[" + ff2.getFieldDisplayName() +"]", getParamValue(ff2.getFieldName())); + sql = Utils.replaceInString(sql, "[" + ff2.getFieldDisplayName() +"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),getParamValue(ff2.getFieldName()))); } //debugLogger.debug("SQL Modified after replacing formfield" + sql); try { @@ -223,21 +225,21 @@ public class ReportParamValuesForPDFExcel extends Hashtable { //debugLogger.debug("B4 request " + sql); if(request != null ) { for (int i = 0; i < scheduleSessionParameters.length; i++) { - sql = Utils.replaceInString(sql, "[" + scheduleSessionParameters[i].toUpperCase()+"]", request.getParameter(scheduleSessionParameters[i]) ); + sql = Utils.replaceInString(sql, "[" + scheduleSessionParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(scheduleSessionParameters[i]) )); } for (int i = 0; i < reqParameters.length; i++) { if(!reqParameters[i].startsWith("ff")) { if (request.getParameter(reqParameters[i])!=null) { sql = Utils.replaceInString(sql, "[" + reqParameters[i]+"]", request.getParameter(reqParameters[i]) ); - sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase()+"]", request.getParameter(reqParameters[i]) ); + sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(reqParameters[i]) )); } else { sql = Utils.replaceInString(sql, "[" + reqParameters[i]+"]", request.getParameter(reqParameters[i].toUpperCase()) ); - sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase()+"]", request.getParameter(reqParameters[i].toUpperCase()) ); + sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(reqParameters[i].toUpperCase()) )); } } else - sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase()+"]", request.getParameter(reqParameters[i]) ); + sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase()+"]", ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(reqParameters[i]) )); } } //debugLogger.debug("After request " + sql); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java index f9d58fee..03c8214d 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java @@ -85,6 +85,8 @@ import org.onap.portalsdk.analytics.xmlobj.DataColumnType; import org.onap.portalsdk.analytics.xmlobj.FormFieldType; import org.onap.portalsdk.analytics.xmlobj.ObjectFactory; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.onap.portalsdk.core.util.SecurityCodecUtil; +import org.owasp.esapi.ESAPI; import com.fasterxml.jackson.databind.ObjectMapper; @@ -2455,7 +2457,7 @@ public class ReportRuntime extends ReportWrapper implements Cloneable, Serializa if (param.charAt(startIdx + 1) == '#') { // Parameter is a form field value String fieldId = param.substring(startIdx + 2, endIdx); - String fieldValue = request.getParameter(fieldId); + String fieldValue = ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(fieldId)); sql = Utils.replaceInString(sql, "[" + fieldId.toUpperCase()+"]", fieldValue ); } } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/AppUtils.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/AppUtils.java index 96bc609f..55735090 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/AppUtils.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/AppUtils.java @@ -47,6 +47,8 @@ import javax.servlet.http.HttpServletRequest; import org.onap.portalsdk.analytics.error.RaptorException; import org.onap.portalsdk.analytics.util.AppConstants; import org.onap.portalsdk.analytics.util.HtmlStripper; +import org.onap.portalsdk.core.util.SecurityCodecUtil; +import org.owasp.esapi.ESAPI; public class AppUtils /* implements IAppUtils */{ private static String baseURL = null; @@ -69,7 +71,7 @@ public class AppUtils /* implements IAppUtils */{ public static String getRequestValue(HttpServletRequest request, String valueID) { String value = (String) request.getAttribute(valueID); if (value == null) - value = request.getParameter(valueID); + value = ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(), request.getParameter(valueID)); return value; } // getRequestValue diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/controller/FileServletController.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/controller/FileServletController.java index 1d1fdd84..b6c985a5 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/controller/FileServletController.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/controller/FileServletController.java @@ -58,6 +58,7 @@ import javax.servlet.http.HttpServletResponse; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.onap.portalsdk.core.service.DataAccessService; +import org.owasp.esapi.ESAPI; import org.springframework.web.servlet.ModelAndView;; @@ -175,7 +176,7 @@ public class FileServletController { response.setContentLength((int) outStream.length); response.setContentType("application/octet-stream"); response.setHeader("Content-disposition", "attachment; filename=\"" - + name + "\""); + + ESAPI.encoder().canonicalize(name) + "\""); copyStream(response, outStream); } catch (Exception ex) { if (os == null) diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java index 8165801c..8478c73c 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java @@ -105,7 +105,9 @@ import org.onap.portalsdk.analytics.xmlobj.PredefinedValueList; import org.onap.portalsdk.core.controller.RestrictedBaseController; import org.onap.portalsdk.core.domain.User; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.onap.portalsdk.core.util.SecurityCodecUtil; import org.onap.portalsdk.core.web.support.UserUtils; +import org.owasp.esapi.ESAPI; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; @@ -1415,10 +1417,10 @@ public class RaptorControllerAsync extends RestrictedBaseController { for (int i = 0; i < reqParameters.length; i++) { if (!reqParameters[i].startsWith("ff")) sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase() + "]", - request.getParameter(reqParameters[i].toUpperCase())); + ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),request.getParameter(reqParameters[i].toUpperCase()))); else - sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase() + "]", - request.getParameter(reqParameters[i])); + sql = Utils.replaceInString(sql, "[" + reqParameters[i].toUpperCase() + "]", + ESAPI.encoder().encodeForSQL( SecurityCodecUtil.getCodec(),request.getParameter(reqParameters[i]))); } } if (session != null) { diff --git a/ecomp-sdk/epsdk-app-common/pom.xml b/ecomp-sdk/epsdk-app-common/pom.xml index 089fd092..ebb7c26a 100644 --- a/ecomp-sdk/epsdk-app-common/pom.xml +++ b/ecomp-sdk/epsdk-app-common/pom.xml @@ -232,5 +232,10 @@ <artifactId>spring-webmvc</artifactId> <version>${springframework.version}</version> </dependency> + <dependency> + <groupId>org.owasp.esapi</groupId> + <artifactId>esapi</artifactId> + <version>2.1.0</version> + </dependency> </dependencies> </project> diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/RoleListController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/RoleListController.java index e7682809..b89cb43c 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/RoleListController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/RoleListController.java @@ -50,6 +50,8 @@ import org.onap.portalsdk.core.controller.RestrictedBaseController; import org.onap.portalsdk.core.domain.Role; import org.onap.portalsdk.core.domain.User; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.onap.portalsdk.core.onboarding.util.PortalApiConstants; +import org.onap.portalsdk.core.onboarding.util.PortalApiProperties; import org.onap.portalsdk.core.service.RoleService; import org.onap.portalsdk.core.web.support.JsonMessage; import org.onap.portalsdk.core.web.support.UserUtils; @@ -73,6 +75,11 @@ public class RoleListController extends RestrictedBaseController { private RoleService service; private String viewName; + + private static final String isAccessCentralized = PortalApiProperties + .getProperty(PortalApiConstants.ROLE_ACCESS_CENTRALIZED); + private static final String isCentralized = "remote"; + @RequestMapping(value = { "/role_list" }, method = RequestMethod.GET) public ModelAndView getRoleList(HttpServletRequest request) { @@ -151,8 +158,9 @@ public class RoleListController extends RestrictedBaseController { Role role = mapper.readValue(root.get("role").toString(), Role.class); Role domainRole = service.getRole(user.getOrgUserId(), role.getId()); - + if (!isCentralized.equals(isAccessCentralized)) { service.deleteDependcyRoleRecord(user.getOrgUserId(), role.getId()); + } service.deleteRole(user.getOrgUserId(), domainRole); logger.info(EELFLoggerDelegate.auditLogger, "Remove role " + domainRole.getId()); diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/ElementModelController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/ElementModelController.java index 34e4db7d..aa327850 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/ElementModelController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/ElementModelController.java @@ -40,6 +40,7 @@ package org.onap.portalapp.controller.sample; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.io.FilenameUtils; import org.onap.portalsdk.core.controller.RestrictedBaseController; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.onap.portalsdk.core.service.ElementLinkService; @@ -57,11 +58,11 @@ public class ElementModelController extends RestrictedBaseController { @RequestMapping(value = { "/elementMapLayout" }, method = RequestMethod.GET, produces = "text/plain") public String layout(HttpServletRequest request, HttpServletResponse response) throws Exception { - String collapseDomains = request.getParameter("collapsedDomains"); - String expandDomains = request.getParameter("expandedDomains"); + String collapseDomains = FilenameUtils.normalize(request.getParameter("collapsedDomains")); + String expandDomains = FilenameUtils.normalize(request.getParameter("expandedDomains")); - String contentFileName = request.getParameter("contentFileName"); - String layoutFileName = request.getParameter("layoutFileName"); + String contentFileName = FilenameUtils.normalize(request.getParameter("contentFileName")); + String layoutFileName = FilenameUtils.normalize(request.getParameter("layoutFileName")); final String realPath = request.getServletContext().getRealPath("/"); logger.debug(EELFLoggerDelegate.debugLogger, "layout: servlet context real path: {}", realPath); @@ -76,8 +77,8 @@ public class ElementModelController extends RestrictedBaseController { @RequestMapping(value = { "/elementMapLink" }, method = RequestMethod.GET, produces = "text/plain") public String callflow(HttpServletRequest request, HttpServletResponse response) throws Exception { - String callFlowName = request.getParameter("callFlowName"); - String callFlowStep = request.getParameter("callFlowStep"); + String callFlowName = FilenameUtils.normalize(request.getParameter("callFlowName")); + String callFlowStep = FilenameUtils.normalize(request.getParameter("callFlowStep")); final String realPath = request.getServletContext().getRealPath("/"); logger.debug(EELFLoggerDelegate.debugLogger, "callflow: servlet context real path: {}", realPath); diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/util/SecurityXssValidator.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/util/SecurityXssValidator.java new file mode 100644 index 00000000..3d2f741c --- /dev/null +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/util/SecurityXssValidator.java @@ -0,0 +1,193 @@ +/*- + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ +package org.onap.portalapp.util; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; +import java.util.regex.Pattern; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringEscapeUtils; +import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.onap.portalsdk.core.util.SystemProperties; +import org.owasp.esapi.ESAPI; +import org.owasp.esapi.codecs.Codec; +import org.owasp.esapi.codecs.MySQLCodec; +import org.owasp.esapi.codecs.OracleCodec; +import org.owasp.esapi.codecs.MySQLCodec.Mode; + +public class SecurityXssValidator { + private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SecurityXssValidator.class); + + private static final String MYSQL_DB = "mysql"; + private static final String ORACLE_DB = "oracle"; + private static final String MARIA_DB ="mariadb"; + + + static SecurityXssValidator validator = null; + private static Codec instance; + private static final Lock lock = new ReentrantLock(); + + public static SecurityXssValidator getInstance() { + + if(validator == null) { + lock.lock(); + try { + if(validator == null) + validator = new SecurityXssValidator(); + } finally { + lock.unlock(); + } + } + + return validator; + } + + private SecurityXssValidator() { + // Avoid anything between script tags + XSS_INPUT_PATTERNS.add(Pattern.compile("<script>(.*?)</script>", Pattern.CASE_INSENSITIVE)); + + // avoid iframes + XSS_INPUT_PATTERNS.add(Pattern.compile("<iframe(.*?)>(.*?)</iframe>", Pattern.CASE_INSENSITIVE)); + + // Avoid anything in a src='...' type of expression + XSS_INPUT_PATTERNS.add(Pattern.compile("src[\r\n]*=[\r\n]*\\\'(.*?)\\\'", + Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL)); + + XSS_INPUT_PATTERNS.add(Pattern.compile("src[\r\n]*=[\r\n]*\\\"(.*?)\\\"", + Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL)); + + XSS_INPUT_PATTERNS.add(Pattern.compile("src[\r\n]*=[\r\n]*([^>]+)", + Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL)); + + // Remove any lonesome </script> tag + XSS_INPUT_PATTERNS.add(Pattern.compile("</script>", Pattern.CASE_INSENSITIVE)); + + // Remove any lonesome <script ...> tag + XSS_INPUT_PATTERNS + .add(Pattern.compile("<script(.*?)>", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL)); + + // Avoid eval(...) expressions + XSS_INPUT_PATTERNS + .add(Pattern.compile("eval\\((.*?)\\)", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL)); + + // Avoid expression(...) expressions + XSS_INPUT_PATTERNS.add(Pattern.compile("expression\\((.*?)\\)", + Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL)); + + // Avoid javascript:... expressions + XSS_INPUT_PATTERNS.add(Pattern.compile("javascript:", Pattern.CASE_INSENSITIVE)); + + // Avoid vbscript:... expressions + XSS_INPUT_PATTERNS.add(Pattern.compile("vbscript:", Pattern.CASE_INSENSITIVE)); + + // Avoid onload= expressions + XSS_INPUT_PATTERNS + .add(Pattern.compile("onload(.*?)=", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL)); + } + + private List<Pattern> XSS_INPUT_PATTERNS = new ArrayList<Pattern>(); + + + /** + * * This method takes a string and strips out any potential script + * injections. + * + * @param value + * @return String - the new "sanitized" string. + */ + public String stripXSS(String value) { + + try { + + if (StringUtils.isNotBlank(value)) { + + value = StringEscapeUtils.escapeHtml4(value); + + value = ESAPI.encoder().canonicalize(value); + + // Avoid null characters + value = value.replaceAll("\0", ""); + + for (Pattern xssInputPattern : XSS_INPUT_PATTERNS) { + value = xssInputPattern.matcher(value).replaceAll(""); + } + } + + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "stripXSS() failed", e); + } + + return value; + } + + public Codec getCodec() { + try { + if (null == instance) { + if (StringUtils.containsIgnoreCase(SystemProperties.getProperty(SystemProperties.DB_DRIVER), + MYSQL_DB)|| StringUtils.containsIgnoreCase(SystemProperties.getProperty(SystemProperties.DB_DRIVER), + MARIA_DB)) { + instance = new MySQLCodec(Mode.STANDARD); + + } else if (StringUtils.containsIgnoreCase(SystemProperties.getProperty(SystemProperties.DB_DRIVER), + ORACLE_DB)) { + instance = new OracleCodec(); + } + } + + + } catch (Exception ex) { + System.out.println("Could not strip XSS from value = " + " | ex = " + ex.getMessage()); + } + return instance; + + } + + + public List<Pattern> getXSS_INPUT_PATTERNS() { + return XSS_INPUT_PATTERNS; + } + + + public void setXSS_INPUT_PATTERNS(List<Pattern> xSS_INPUT_PATTERNS) { + XSS_INPUT_PATTERNS = xSS_INPUT_PATTERNS; + } + +}
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-os/README.md b/ecomp-sdk/epsdk-app-os/README.md index 1ac4a142..d9d7fb68 100644 --- a/ecomp-sdk/epsdk-app-os/README.md +++ b/ecomp-sdk/epsdk-app-os/README.md @@ -21,7 +21,7 @@ Version 1.4.0, <?day> <?month> 2017 - PORTAL-90 Use approved ONAP license text - Portal-86 Remove application specific usages from tests and other files (rework) - Portal-104 Replaced the sql connector to maria db - +- Portal-127 Remove GreenSock license code from b2b library * Put new entries here * Version 1.3.0, 28 August 2017 diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml index 54bb65eb..469cf37a 100644 --- a/ecomp-sdk/epsdk-app-os/pom.xml +++ b/ecomp-sdk/epsdk-app-os/pom.xml @@ -4,142 +4,38 @@ <!-- This is the Maven project object model (POM) file for the open-source SDK web app. This is NOT the Portal - but it is developed and supported by the Portal team. --> - <groupId>org.onap.portal.sdk</groupId> + + <parent> + <groupId>org.onap.portal.sdk</groupId> + <artifactId>epsdk-project</artifactId> + <version>1.4.0-SNAPSHOT</version> + </parent> + + <!-- GroupId is inherited from parent --> <artifactId>epsdk-app-os</artifactId> - <version>1.4.0-SNAPSHOT</version> + <!-- Version is inherited from parent --> <packaging>war</packaging> <name>ONAP Portal SDK Webapp for OpenSource</name> <description>ONAP Portal SDK Web Application for public release</description> - <!-- OParent provides license audit, code audit, distribution management, - etc. But jenkins build fails, so comment out for now. - <parent> - <groupId>org.onap.oparent</groupId> - <artifactId>oparent</artifactId> - <version>0.1.0</version> - <relativePath/> - </parent> - --> - <properties> - <encoding>UTF-8</encoding> - <epsdk.version>1.4.0-SNAPSHOT</epsdk.version> - <springframework.version>4.2.0.RELEASE</springframework.version> - <hibernate.version>4.3.11.Final</hibernate.version> + <!-- This determines the EPSDK library versions, helpful for testing --> + <epsdk.version>${project.version}</epsdk.version> <!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. --> <skipassembly>true</skipassembly> <!-- Tests usually require some setup that maven cannot do, so skip. --> <skiptests>true</skiptests> </properties> - <repositories> - <repository> - <id>onap-releases</id> - <name>ONAP - Release Repository</name> - <url>https://nexus.onap.org/content/repositories/releases</url> - </repository> - <repository> - <id>onap-staging</id> - <name>ONAP - Staging Repository</name> - <url>https://nexus.onap.org/content/repositories/staging</url> - </repository> - <repository> - <id>onap-snapshots</id> - <name>ONAP - Snapshot Repository</name> - <url>https://nexus.onap.org/content/repositories/snapshots</url> - </repository> - <repository> - <id>onap-public</id> - <name>ONAP public Repository</name> - <url>https://nexus.onap.org/content/groups/public</url> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>releases</id> - <name>ONAP - Release Repository</name> - <url>https://nexus.onap.org/content/repositories/releases</url> - </pluginRepository> - <pluginRepository> - <id>staging</id> - <name>ONAP - Staging Repository</name> - <url>https://nexus.onap.org/content/repositories/staging</url> - </pluginRepository> - <pluginRepository> - <id>snapshots</id> - <name>ONAP - Snapshot Repository</name> - <url>https://nexus.onap.org/content/repositories/snapshots</url> - </pluginRepository> - </pluginRepositories> + <!-- repositories are inherited from parent --> - <profiles> - <!-- disable doclint, a new feature in Java 8, when generating javadoc --> - <profile> - <id>doclint-java8-disable</id> - <activation> - <jdk>[1.8,)</jdk> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> - <configuration> - <additionalparam>-Xdoclint:none</additionalparam> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <!-- profiles are inherited from parent --> <build> <!-- The war file name carries no version number --> <finalName>${project.artifactId}</finalName> - <pluginManagement> - <plugins> - <!-- Silence Eclipse/m2e complaints about checkstyle plugin brought in by OParent --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <versionRange>2.17,)</versionRange> - <goals> - <goal>check</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <!-- Compile to Java 1.8 class output format --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> diff --git a/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java new file mode 100644 index 00000000..b3ebed73 --- /dev/null +++ b/ecomp-sdk/epsdk-app-os/src/main/java/org/onap/portalapp/filter/SecurityXssFilter.java @@ -0,0 +1,130 @@ + +/*- + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ +package org.onap.portalapp.filter; + +import java.io.IOException; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; + +import org.apache.commons.lang.StringUtils; +import org.onap.portalapp.util.SecurityXssValidator; +import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; + +public class SecurityXssFilter implements Filter { + + private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SecurityXssFilter.class); + + private SecurityXssValidator validator = SecurityXssValidator.getInstance(); + + class SecurityRequestWrapper extends HttpServletRequestWrapper { + + public SecurityRequestWrapper(HttpServletRequest servletRequest) { + super(servletRequest); + } + + @Override + public String[] getParameterValues(String parameter) { + String[] values = super.getParameterValues(parameter); + + if (values == null) { + return null; + } + + int count = values.length; + String[] encodedValues = new String[count]; + for (int i = 0; i < count; i++) { + encodedValues[i] = stripXss(values[i]); + + } + + return encodedValues; + } + + private String stripXss(String value) { + + + return validator.stripXSS(value); + } + + @Override + public String getParameter(String parameter) { + String value = super.getParameter(parameter); + if (StringUtils.isNotBlank(value)) { + value = stripXss(value); + } + return value; + } + + @Override + public String getHeader(String name) { + String value = super.getHeader(name); + if (StringUtils.isNotBlank(value)) { + value = stripXss(value); + } + return value; + } + } + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + } + + @Override + public void destroy() { + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) + throws IOException, ServletException { + + try { + + chain.doFilter(new SecurityRequestWrapper((HttpServletRequest) request), response); + } catch (Exception e) { + logger.error(EELFLoggerDelegate.errorLogger, "doFilter() failed", e); + } + } + +} diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml index 0290f1fc..7441508a 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml +++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml @@ -10,8 +10,16 @@ <distributable /> <session-config> - <session-timeout>7</session-timeout> + <session-timeout>30</session-timeout> <tracking-mode>COOKIE</tracking-mode> </session-config> + <filter> + <filter-name>SecurityXssFilter</filter-name> + <filter-class>org.onap.portalapp.filtersss.SecurityXssFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>SecurityXssFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> </web-app>
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/resources/ESAPI.properties b/ecomp-sdk/epsdk-app-overlay/src/main/resources/ESAPI.properties new file mode 100644 index 00000000..290dbff3 --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/resources/ESAPI.properties @@ -0,0 +1,369 @@ +#=========================================================================== +# ESAPI Configuration +# +# If true, then print all the ESAPI properties set here when they are loaded. +# If false, they are not printed. Useful to reduce output when running JUnit tests. +# If you need to troubleshoot a properties related problem, turning this on may help. +# This is 'false' in the src/test/resources/.esapi version. It is 'true' by +# default for reasons of backward compatibility with earlier ESAPI versions. +ESAPI.printProperties=true + +# ESAPI is designed to be easily extensible. You can use the reference implementation +# or implement your own providers to take advantage of your enterprise's security +# infrastructure. The functions in ESAPI are referenced using the ESAPI locator, like: +# +# String ciphertext = +# ESAPI.encryptor().encrypt("Secret message"); // Deprecated in 2.0 +# CipherText cipherText = +# ESAPI.encryptor().encrypt(new PlainText("Secret message")); // Preferred +# +# Below you can specify the classname for the provider that you wish to use in your +# application. The only requirement is that it implement the appropriate ESAPI interface. +# This allows you to switch security implementations in the future without rewriting the +# entire application. +# +# ExperimentalAccessController requires ESAPI-AccessControlPolicy.xml in .esapi directory +ESAPI.AccessControl=org.owasp.esapi.reference.DefaultAccessController +# FileBasedAuthenticator requires users.txt file in .esapi directory +ESAPI.Authenticator=org.owasp.esapi.reference.FileBasedAuthenticator +ESAPI.Encoder=org.owasp.esapi.reference.DefaultEncoder +ESAPI.Encryptor=org.owasp.esapi.reference.crypto.JavaEncryptor + +ESAPI.Executor=org.owasp.esapi.reference.DefaultExecutor +ESAPI.HTTPUtilities=org.owasp.esapi.reference.DefaultHTTPUtilities +ESAPI.IntrusionDetector=org.owasp.esapi.reference.DefaultIntrusionDetector +# Log4JFactory Requires log4j.xml or log4j.properties in classpath +ESAPI.Logger=org.owasp.esapi.reference.Log4JLogFactory +#ESAPI.Logger=org.owasp.esapi.reference.JavaLogFactory +ESAPI.Randomizer=org.owasp.esapi.reference.DefaultRandomizer +ESAPI.Validator=org.owasp.esapi.reference.DefaultValidator + +#=========================================================================== +# ESAPI Authenticator +# +Authenticator.AllowedLoginAttempts=3 +Authenticator.MaxOldPasswordHashes=13 +Authenticator.UsernameParameterName=username +Authenticator.PasswordParameterName=password +# RememberTokenDuration (in days) +Authenticator.RememberTokenDuration=14 +# Session Timeouts (in minutes) +Authenticator.IdleTimeoutDuration=20 +Authenticator.AbsoluteTimeoutDuration=120 + +#=========================================================================== +# ESAPI Encoder +# +# ESAPI canonicalizes input before validation to prevent bypassing filters with encoded attacks. +# Failure to canonicalize input is a very common mistake when implementing validation schemes. +# Canonicalization is automatic when using the ESAPI Validator, but you can also use the +# following code to canonicalize data. +# +# ESAPI.Encoder().canonicalize( "%22hello world"" ); +# +# Multiple encoding is when a single encoding format is applied multiple times. Allowing +# multiple encoding is strongly discouraged. +Encoder.AllowMultipleEncoding=false + +# Mixed encoding is when multiple different encoding formats are applied, or when +# multiple formats are nested. Allowing multiple encoding is strongly discouraged. +Encoder.AllowMixedEncoding=false + +# The default list of codecs to apply when canonicalizing untrusted data. The list should include the codecs +# for all downstream interpreters or decoders. For example, if the data is likely to end up in a URL, HTML, or +# inside JavaScript, then the list of codecs below is appropriate. The order of the list is not terribly important. +Encoder.DefaultCodecList=HTMLEntityCodec,PercentCodec,JavaScriptCodec + + +#=========================================================================== +# ESAPI Encryption +# +# The ESAPI Encryptor provides basic cryptographic functions with a simplified API. +# To get started, generate a new key using java -classpath esapi.jar org.owasp.esapi.reference.crypto.JavaEncryptor +# There is not currently any support for key rotation, so be careful when changing your key and salt as it +# will invalidate all signed, encrypted, and hashed data. +# +# WARNING: Not all combinations of algorithms and key lengths are supported. +# If you choose to use a key length greater than 128, you MUST download the +# unlimited strength policy files and install in the lib directory of your JRE/JDK. +# See http://java.sun.com/javase/downloads/index.jsp for more information. +# +# Backward compatibility with ESAPI Java 1.4 is supported by the two deprecated API +# methods, Encryptor.encrypt(String) and Encryptor.decrypt(String). However, whenever +# possible, these methods should be avoided as they use ECB cipher mode, which in almost +# all circumstances a poor choice because of it's weakness. CBC cipher mode is the default +# for the new Encryptor encrypt / decrypt methods for ESAPI Java 2.0. In general, you +# should only use this compatibility setting if you have persistent data encrypted with +# version 1.4 and even then, you should ONLY set this compatibility mode UNTIL +# you have decrypted all of your old encrypted data and then re-encrypted it with +# ESAPI 2.0 using CBC mode. If you have some reason to mix the deprecated 1.4 mode +# with the new 2.0 methods, make sure that you use the same cipher algorithm for both +# (256-bit AES was the default for 1.4; 128-bit is the default for 2.0; see below for +# more details.) Otherwise, you will have to use the new 2.0 encrypt / decrypt methods +# where you can specify a SecretKey. (Note that if you are using the 256-bit AES, +# that requires downloading the special jurisdiction policy files mentioned above.) +# +# ***** IMPORTANT: Do NOT forget to replace these with your own values! ***** +# To calculate these values, you can run: +# java -classpath esapi.jar org.owasp.esapi.reference.crypto.JavaEncryptor +# +Encryptor.MasterKey=tzfztf56ftv +Encryptor.MasterSalt=123456ztrewq + +# Provides the default JCE provider that ESAPI will "prefer" for its symmetric +# encryption and hashing. (That is it will look to this provider first, but it +# will defer to other providers if the requested algorithm is not implemented +# by this provider.) If left unset, ESAPI will just use your Java VM's current +# preferred JCE provider, which is generally set in the file +# "$JAVA_HOME/jre/lib/security/java.security". +# +# The main intent of this is to allow ESAPI symmetric encryption to be +# used with a FIPS 140-2 compliant crypto-module. For details, see the section +# "Using ESAPI Symmetric Encryption with FIPS 140-2 Cryptographic Modules" in +# the ESAPI 2.0 Symmetric Encryption User Guide, at: +# http://owasp-esapi-java.googlecode.com/svn/trunk/documentation/esapi4java-core-2.0-symmetric-crypto-user-guide.html +# However, this property also allows you to easily use an alternate JCE provider +# such as "Bouncy Castle" without having to make changes to "java.security". +# See Javadoc for SecurityProviderLoader for further details. If you wish to use +# a provider that is not known to SecurityProviderLoader, you may specify the +# fully-qualified class name of the JCE provider class that implements +# java.security.Provider. If the name contains a '.', this is interpreted as +# a fully-qualified class name that implements java.security.Provider. +# +# NOTE: Setting this property has the side-effect of changing it in your application +# as well, so if you are using JCE in your application directly rather than +# through ESAPI (you wouldn't do that, would you? ;-), it will change the +# preferred JCE provider there as well. +# +# Default: Keeps the JCE provider set to whatever JVM sets it to. +Encryptor.PreferredJCEProvider= + +# AES is the most widely used and strongest encryption algorithm. This +# should agree with your Encryptor.CipherTransformation property. +# By default, ESAPI Java 1.4 uses "PBEWithMD5AndDES" and which is +# very weak. It is essentially a password-based encryption key, hashed +# with MD5 around 1K times and then encrypted with the weak DES algorithm +# (56-bits) using ECB mode and an unspecified padding (it is +# JCE provider specific, but most likely "NoPadding"). However, 2.0 uses +# "AES/CBC/PKCSPadding". If you want to change these, change them here. +# Warning: This property does not control the default reference implementation for +# ESAPI 2.0 using JavaEncryptor. Also, this property will be dropped +# in the future. +# @deprecated +Encryptor.EncryptionAlgorithm=AES +# For ESAPI Java 2.0 - New encrypt / decrypt methods use this. +Encryptor.CipherTransformation=AES/CBC/PKCS5Padding + +# Applies to ESAPI 2.0 and later only! +# Comma-separated list of cipher modes that provide *BOTH* +# confidentiality *AND* message authenticity. (NIST refers to such cipher +# modes as "combined modes" so that's what we shall call them.) If any of these +# cipher modes are used then no MAC is calculated and stored +# in the CipherText upon encryption. Likewise, if one of these +# cipher modes is used with decryption, no attempt will be made +# to validate the MAC contained in the CipherText object regardless +# of whether it contains one or not. Since the expectation is that +# these cipher modes support support message authenticity already, +# injecting a MAC in the CipherText object would be at best redundant. +# +# Note that as of JDK 1.5, the SunJCE provider does not support *any* +# of these cipher modes. Of these listed, only GCM and CCM are currently +# NIST approved. YMMV for other JCE providers. E.g., Bouncy Castle supports +# GCM and CCM with "NoPadding" mode, but not with "PKCS5Padding" or other +# padding modes. +Encryptor.cipher_modes.combined_modes=GCM,CCM,IAPM,EAX,OCB,CWC + +# Applies to ESAPI 2.0 and later only! +# Additional cipher modes allowed for ESAPI 2.0 encryption. These +# cipher modes are in _addition_ to those specified by the property +# 'Encryptor.cipher_modes.combined_modes'. +# Note: We will add support for streaming modes like CFB & OFB once +# we add support for 'specified' to the property 'Encryptor.ChooseIVMethod' +# (probably in ESAPI 2.1). +# DISCUSS: Better name? +Encryptor.cipher_modes.additional_allowed=CBC + +# 128-bit is almost always sufficient and appears to be more resistant to +# related key attacks than is 256-bit AES. Use '_' to use default key size +# for cipher algorithms (where it makes sense because the algorithm supports +# a variable key size). Key length must agree to what's provided as the +# cipher transformation, otherwise this will be ignored after logging a +# warning. +# +# NOTE: This is what applies BOTH ESAPI 1.4 and 2.0. See warning above about mixing! +Encryptor.EncryptionKeyLength=128 + +# Because 2.0 uses CBC mode by default, it requires an initialization vector (IV). +# (All cipher modes except ECB require an IV.) There are two choices: we can either +# use a fixed IV known to both parties or allow ESAPI to choose a random IV. While +# the IV does not need to be hidden from adversaries, it is important that the +# adversary not be allowed to choose it. Also, random IVs are generally much more +# secure than fixed IVs. (In fact, it is essential that feed-back cipher modes +# such as CFB and OFB use a different IV for each encryption with a given key so +# in such cases, random IVs are much preferred. By default, ESAPI 2.0 uses random +# IVs. If you wish to use 'fixed' IVs, set 'Encryptor.ChooseIVMethod=fixed' and +# uncomment the Encryptor.fixedIV. +# +# Valid values: random|fixed|specified 'specified' not yet implemented; planned for 2.1 +Encryptor.ChooseIVMethod=random +# If you choose to use a fixed IV, then you must place a fixed IV here that +# is known to all others who are sharing your secret key. The format should +# be a hex string that is the same length as the cipher block size for the +# cipher algorithm that you are using. The following is an *example* for AES +# from an AES test vector for AES-128/CBC as described in: +# NIST Special Publication 800-38A (2001 Edition) +# "Recommendation for Block Cipher Modes of Operation". +# (Note that the block size for AES is 16 bytes == 128 bits.) +# +Encryptor.fixedIV=0x000102030405060708090a0b0c0d0e0f + +# Whether or not CipherText should use a message authentication code (MAC) with it. +# This prevents an adversary from altering the IV as well as allowing a more +# fool-proof way of determining the decryption failed because of an incorrect +# key being supplied. This refers to the "separate" MAC calculated and stored +# in CipherText, not part of any MAC that is calculated as a result of a +# "combined mode" cipher mode. +# +# If you are using ESAPI with a FIPS 140-2 cryptographic module, you *must* also +# set this property to false. +Encryptor.CipherText.useMAC=true + +# Whether or not the PlainText object may be overwritten and then marked +# eligible for garbage collection. If not set, this is still treated as 'true'. +Encryptor.PlainText.overwrite=true + +# Do not use DES except in a legacy situations. 56-bit is way too small key size. +#Encryptor.EncryptionKeyLength=56 +#Encryptor.EncryptionAlgorithm=DES + +# TripleDES is considered strong enough for most purposes. +# Note: There is also a 112-bit version of DESede. Using the 168-bit version +# requires downloading the special jurisdiction policy from Sun. +#Encryptor.EncryptionKeyLength=168 +#Encryptor.EncryptionAlgorithm=DESede + +Encryptor.HashAlgorithm=SHA-512 +Encryptor.HashIterations=1024 +Encryptor.DigitalSignatureAlgorithm=SHA1withDSA +Encryptor.DigitalSignatureKeyLength=1024 +Encryptor.RandomAlgorithm=SHA1PRNG +Encryptor.CharacterEncoding=UTF-8 + +# This is the Pseudo Random Function (PRF) that ESAPI's Key Derivation Function +# (KDF) normally uses. Note this is *only* the PRF used for ESAPI's KDF and +# *not* what is used for ESAPI's MAC. (Currently, HmacSHA1 is always used for +# the MAC, mostly to keep the overall size at a minimum.) +# +# Currently supported choices for JDK 1.5 and 1.6 are: +# HmacSHA1 (160 bits), HmacSHA256 (256 bits), HmacSHA384 (384 bits), and +# HmacSHA512 (512 bits). +# Note that HmacMD5 is *not* supported for the PRF used by the KDF even though +# the JDKs support it. See the ESAPI 2.0 Symmetric Encryption User Guide +# further details. +Encryptor.KDF.PRF=HmacSHA256 +#=========================================================================== +# ESAPI Logging +# Set the application name if these logs are combined with other applications +Logger.ApplicationName=Ecompportal_application +# If you use an HTML log viewer that does not properly HTML escape log data, you can set LogEncodingRequired to true +Logger.LogEncodingRequired=false +# Determines whether ESAPI should log the application name. This might be clutter in some single-server/single-app environments. +Logger.LogApplicationName=true +# Determines whether ESAPI should log the server IP and port. This might be clutter in some single-server environments. +Logger.LogServerIP=true +# LogFileName, the name of the logging file. Provide a full directory path (e.g., C:\\ESAPI\\ESAPI_logging_file) if you +# want to place it in a specific directory. +Logger.LogFileName=Ecompportal_ESAPI_logging_file +# MaxLogFileSize, the max size (in bytes) of a single log file before it cuts over to a new one (default is 10,000,000) +Logger.MaxLogFileSize=10000000 + + +#=========================================================================== +# ESAPI Intrusion Detection +# +# Each event has a base to which .count, .interval, and .action are added +# The IntrusionException will fire if we receive "count" events within "interval" seconds +# The IntrusionDetector is configurable to take the following actions: log, logout, and disable +# (multiple actions separated by commas are allowed e.g. event.test.actions=log,disable +# +# Custom Events +# Names must start with "event." as the base +# Use IntrusionDetector.addEvent( "test" ) in your code to trigger "event.test" here +# You can also disable intrusion detection completely by changing +# the following parameter to true +# +IntrusionDetector.Disable=false +# +IntrusionDetector.event.test.count=2 +IntrusionDetector.event.test.interval=10 +IntrusionDetector.event.test.actions=disable,log + +# Exception Events +# All EnterpriseSecurityExceptions are registered automatically +# Call IntrusionDetector.getInstance().addException(e) for Exceptions that do not extend EnterpriseSecurityException +# Use the fully qualified classname of the exception as the base + +# any intrusion is an attack +IntrusionDetector.org.owasp.esapi.errors.IntrusionException.count=1 +IntrusionDetector.org.owasp.esapi.errors.IntrusionException.interval=1 +IntrusionDetector.org.owasp.esapi.errors.IntrusionException.actions=log,disable,logout + +# for test purposes +# CHECKME: Shouldn't there be something in the property name itself that designates +# that these are for testing??? +IntrusionDetector.org.owasp.esapi.errors.IntegrityException.count=10 +IntrusionDetector.org.owasp.esapi.errors.IntegrityException.interval=5 +IntrusionDetector.org.owasp.esapi.errors.IntegrityException.actions=log,disable,logout + +# rapid validation errors indicate scans or attacks in progress +# org.owasp.esapi.errors.ValidationException.count=10 +# org.owasp.esapi.errors.ValidationException.interval=10 +# org.owasp.esapi.errors.ValidationException.actions=log,logout + +# sessions jumping between hosts indicates session hijacking +IntrusionDetector.org.owasp.esapi.errors.AuthenticationHostException.count=2 +IntrusionDetector.org.owasp.esapi.errors.AuthenticationHostException.interval=10 +IntrusionDetector.org.owasp.esapi.errors.AuthenticationHostException.actions=log,logout + + +#=========================================================================== +# ESAPI Validation +# +# The ESAPI Validator works on regular expressions with defined names. You can define names +# either here, or you may define application specific patterns in a separate file defined below. +# This allows enterprises to specify both organizational standards as well as application specific +# validation rules. +# +Validator.ConfigurationFile=validation.properties +Validator.ConfigurationFile.MultiValued=false + +# Validators used by ESAPI +Validator.AccountName=^[a-zA-Z0-9]{3,20}$ +Validator.SystemCommand=^[a-zA-Z\\-\\/]{1,64}$ +Validator.RoleName=^[a-z]{1,20}$ + +#the word TEST below should be changed to your application +#name - only relative URL's are supported +Validator.Redirect=^\\/test.*$ + +# Global HTTP Validation Rules +# Values with Base64 encoded data (e.g. encrypted state) will need at least [a-zA-Z0-9\/+=] +Validator.HTTPScheme=^(http|https)$ +Validator.HTTPServerName=^[a-zA-Z0-9_.\\-]*$ +Validator.HTTPParameterName=^[a-zA-Z0-9_]{1,32}$ +Validator.HTTPParameterValue=^[a-zA-Z0-9.\\-\\/+=@_ ]*$ +Validator.HTTPCookieName=^[a-zA-Z0-9\\-_]{1,32}$ +Validator.HTTPCookieValue=^[a-zA-Z0-9\\-\\/+=_ ]*$ +Validator.HTTPHeaderName=^[a-zA-Z0-9\\-_]{1,32}$ +Validator.HTTPHeaderValue=^[a-zA-Z0-9()\\-=\\*\\.\\?;,+\\/:&_ ]*$ +Validator.HTTPContextPath=^\\/?[a-zA-Z0-9.\\-\\/_]*$ +Validator.HTTPServletPath=^[a-zA-Z0-9.\\-\\/_]*$ +Validator.HTTPPath=^[a-zA-Z0-9.\\-_]*$ +Validator.HTTPQueryString=^[a-zA-Z0-9()\\-=\\*\\.\\?;,+\\/:&_ %]*$ +Validator.HTTPURI=^[a-zA-Z0-9()\\-=\\*\\.\\?;,+\\/:&_ ]*$ +Validator.HTTPURL=^.*$ +Validator.HTTPJSESSIONID=^[A-Z0-9]{10,30}$ + +# Validation of file related input +Validator.FileName=^[a-zA-Z0-9!@#$%^&{}\\[\\]()_+\\-=,.~'` ]{1,255}$ +Validator.DirectoryName=^[a-zA-Z0-9:/\\\\!@#$%^&{}\\[\\]()_+\\-=,.~'` ]{1,255}$ diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/resources/validation.properties b/ecomp-sdk/epsdk-app-overlay/src/main/resources/validation.properties new file mode 100644 index 00000000..b275093f --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/resources/validation.properties @@ -0,0 +1,32 @@ +# The ESAPI validator does many security checks on input, such as canonicalization +# and whitelist validation. Note that all of these validation rules are applied *after* +# canonicalization. Double-encoded characters (even with different encodings involved, +# are never allowed. +# +# To use: +# +# First set up a pattern below. You can choose any name you want, prefixed by the word +# "Validation." For example: +# Validation.Email=^[A-Za-z0-9._%-]+@[A-Za-z0-9.-]+\\.[a-zA-Z]{2,4}$ +# +# Then you can validate in your code against the pattern like this: +# ESAPI.validator().isValidInput("User Email", input, "Email", maxLength, allowNull); +# Where maxLength and allowNull are set for you needs, respectively. +# +# But note, when you use boolean variants of validation functions, you lose critical +# canonicalization. It is preferable to use the "get" methods (which throw exceptions) and +# and use the returned user input which is in canonical form. Consider the following: +# +# try { +# someObject.setEmail(ESAPI.validator().getValidInput("User Email", input, "Email", maxLength, allowNull)); +# +Validator.SafeString=^[.\\p{Alnum}\\p{Space}]{0,1024}$ +#Given the discussion: https://github.com/ESAPI/esapi-java-legacy/issues/374, a better upper-bound for domain name +#was selected as 62. This is slightly under the length in RFC-1035 +Validator.Email=^[A-Za-z0-9._%'-]+@[A-Za-z0-9.-]+\\.[a-zA-Z]{2,62}$ +Validator.Gmail=^[A-Za-z0-9._%'-+]+@[A-Za-z0-9.-]+\\.[a-zA-Z]{2,62}$ +Validator.IPAddress=^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$ +#Validator.URL=^(?:ht|f)tp(s?+)\\:\\/\\/[0-9a-zA-Z](?:[-.\\w]*[0-9a-zA-Z])*(?::(?:0-9)*)*(?:\\/?+)(?:[a-zA-Z0-9\\-\\.\\?\\,\\:\\'\\/\\\\\\+=&%\\$#_]*)?+$ +Validator.URL=^(?:ht|f)tp(?:s?)(?:[:A-Za-z0-9%/#?&.=-]*)$ +Validator.CreditCard=^(\\d{4}[- ]?){3}\\d{4}$ +Validator.SSN=^(?!000)([0-6]\\d{2}|7([0-6]\\d|7[012]))([ -]?)(?!00)\\d\\d\\3(?!0000)\\d{4}$
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js index 39824ec3..878462db 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js @@ -12318,6932 +12318,6 @@ angular.module('b2b.att.treeNodeCheckbox', ['b2b.att.utilities']) } }; }]); -/*! - * VERSION: 1.7.3 - * DATE: 2014-01-14 - * UPDATES AND DOCS AT: http://www.greensock.com - * - * @license Copyright (c) 2008-2014, GreenSock. All rights reserved. - * This work is subject to the terms at http://www.greensock.com/terms_of_use.html or for - * Club GreenSock members, the software agreement that was issued with your membership. - * - * @author: Jack Doyle, jack@greensock.com - **/ -(window._gsQueue || (window._gsQueue = [])).push( function() { - - "use strict"; - - var _doc = document.documentElement, - _window = window, - _max = function(element, axis) { - var dim = (axis === "x") ? "Width" : "Height", - scroll = "scroll" + dim, - client = "client" + dim, - body = document.body; - return (element === _window || element === _doc || element === body) ? Math.max(_doc[scroll], body[scroll]) - (_window["inner" + dim] || Math.max(_doc[client], body[client])) : element[scroll] - element["offset" + dim]; - }, - - ScrollToPlugin = window._gsDefine.plugin({ - propName: "scrollTo", - API: 2, - version:"1.7.3", - - //called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run. - init: function(target, value, tween) { - this._wdw = (target === _window); - this._target = target; - this._tween = tween; - if (typeof(value) !== "object") { - value = {y:value}; //if we don't receive an object as the parameter, assume the user intends "y". - } - this._autoKill = (value.autoKill !== false); - this.x = this.xPrev = this.getX(); - this.y = this.yPrev = this.getY(); - if (value.x != null) { - this._addTween(this, "x", this.x, (value.x === "max") ? _max(target, "x") : value.x, "scrollTo_x", true); - this._overwriteProps.push("scrollTo_x"); - } else { - this.skipX = true; - } - if (value.y != null) { - this._addTween(this, "y", this.y, (value.y === "max") ? _max(target, "y") : value.y, "scrollTo_y", true); - this._overwriteProps.push("scrollTo_y"); - } else { - this.skipY = true; - } - return true; - }, - - //called each time the values should be updated, and the ratio gets passed as the only parameter (typically it's a value between 0 and 1, but it can exceed those when using an ease like Elastic.easeOut or Back.easeOut, etc.) - set: function(v) { - this._super.setRatio.call(this, v); - - var x = (this._wdw || !this.skipX) ? this.getX() : this.xPrev, - y = (this._wdw || !this.skipY) ? this.getY() : this.yPrev, - yDif = y - this.yPrev, - xDif = x - this.xPrev; - - if (this._autoKill) { - //note: iOS has a bug that throws off the scroll by several pixels, so we need to check if it's within 7 pixels of the previous one that we set instead of just looking for an exact match. - if (!this.skipX && (xDif > 7 || xDif < -7) && x < _max(this._target, "x")) { - this.skipX = true; //if the user scrolls separately, we should stop tweening! - } - if (!this.skipY && (yDif > 7 || yDif < -7) && y < _max(this._target, "y")) { - this.skipY = true; //if the user scrolls separately, we should stop tweening! - } - if (this.skipX && this.skipY) { - this._tween.kill(); - } - } - if (this._wdw) { - _window.scrollTo((!this.skipX) ? this.x : x, (!this.skipY) ? this.y : y); - } else { - if (!this.skipY) { - this._target.scrollTop = this.y; - } - if (!this.skipX) { - this._target.scrollLeft = this.x; - } - } - this.xPrev = this.x; - this.yPrev = this.y; - } - - }), - p = ScrollToPlugin.prototype; - - ScrollToPlugin.max = _max; - - p.getX = function() { - return (!this._wdw) ? this._target.scrollLeft : (_window.pageXOffset != null) ? _window.pageXOffset : (_doc.scrollLeft != null) ? _doc.scrollLeft : document.body.scrollLeft; - }; - - p.getY = function() { - return (!this._wdw) ? this._target.scrollTop : (_window.pageYOffset != null) ? _window.pageYOffset : (_doc.scrollTop != null) ? _doc.scrollTop : document.body.scrollTop; - }; - - p._kill = function(lookup) { - if (lookup.scrollTo_x) { - this.skipX = true; - } - if (lookup.scrollTo_y) { - this.skipY = true; - } - return this._super._kill.call(this, lookup); - }; - -}); if (window._gsDefine) { window._gsQueue.pop()(); } -/*! - * VERSION: 1.12.1 - * DATE: 2014-06-26 - * UPDATES AND DOCS AT: http://www.greensock.com - * - * Includes all of the following: TweenLite, TweenMax, TimelineLite, TimelineMax, EasePack, CSSPlugin, RoundPropsPlugin, BezierPlugin, AttrPlugin, DirectionalRotationPlugin - * - * @license Copyright (c) 2008-2014, GreenSock. All rights reserved. - * This work is subject to the terms at http://www.greensock.com/terms_of_use.html or for - * Club GreenSock members, the software agreement that was issued with your membership. - * - * @author: Jack Doyle, jack@greensock.com - **/ - -(window._gsQueue || (window._gsQueue = [])).push( function() { - - "use strict"; - - window._gsDefine("TweenMax", ["core.Animation","core.SimpleTimeline","TweenLite"], function(Animation, SimpleTimeline, TweenLite) { - - var _slice = [].slice, - TweenMax = function(target, duration, vars) { - TweenLite.call(this, target, duration, vars); - this._cycle = 0; - this._yoyo = (this.vars.yoyo === true); - this._repeat = this.vars.repeat || 0; - this._repeatDelay = this.vars.repeatDelay || 0; - this._dirty = true; //ensures that if there is any repeat, the totalDuration will get recalculated to accurately report it. - this.render = TweenMax.prototype.render; //speed optimization (avoid prototype lookup on this "hot" method) - }, - _tinyNum = 0.0000000001, - TweenLiteInternals = TweenLite._internals, - _isSelector = TweenLiteInternals.isSelector, - _isArray = TweenLiteInternals.isArray, - p = TweenMax.prototype = TweenLite.to({}, 0.1, {}), - _blankArray = []; - - TweenMax.version = "1.12.1"; - p.constructor = TweenMax; - p.kill()._gc = false; - TweenMax.killTweensOf = TweenMax.killDelayedCallsTo = TweenLite.killTweensOf; - TweenMax.getTweensOf = TweenLite.getTweensOf; - TweenMax.lagSmoothing = TweenLite.lagSmoothing; - TweenMax.ticker = TweenLite.ticker; - TweenMax.render = TweenLite.render; - - p.invalidate = function() { - this._yoyo = (this.vars.yoyo === true); - this._repeat = this.vars.repeat || 0; - this._repeatDelay = this.vars.repeatDelay || 0; - this._uncache(true); - return TweenLite.prototype.invalidate.call(this); - }; - - p.updateTo = function(vars, resetDuration) { - var curRatio = this.ratio, p; - if (resetDuration && this._startTime < this._timeline._time) { - this._startTime = this._timeline._time; - this._uncache(false); - if (this._gc) { - this._enabled(true, false); - } else { - this._timeline.insert(this, this._startTime - this._delay); //ensures that any necessary re-sequencing of Animations in the timeline occurs to make sure the rendering order is correct. - } - } - for (p in vars) { - this.vars[p] = vars[p]; - } - if (this._initted) { - if (resetDuration) { - this._initted = false; - } else { - if (this._gc) { - this._enabled(true, false); - } - if (this._notifyPluginsOfEnabled && this._firstPT) { - TweenLite._onPluginEvent("_onDisable", this); //in case a plugin like MotionBlur must perform some cleanup tasks - } - if (this._time / this._duration > 0.998) { //if the tween has finished (or come extremely close to finishing), we just need to rewind it to 0 and then render it again at the end which forces it to re-initialize (parsing the new vars). We allow tweens that are close to finishing (but haven't quite finished) to work this way too because otherwise, the values are so small when determining where to project the starting values that binary math issues creep in and can make the tween appear to render incorrectly when run backwards. - var prevTime = this._time; - this.render(0, true, false); - this._initted = false; - this.render(prevTime, true, false); - } else if (this._time > 0) { - this._initted = false; - this._init(); - var inv = 1 / (1 - curRatio), - pt = this._firstPT, endValue; - while (pt) { - endValue = pt.s + pt.c; - pt.c *= inv; - pt.s = endValue - pt.c; - pt = pt._next; - } - } - } - } - return this; - }; - - p.render = function(time, suppressEvents, force) { - if (!this._initted) if (this._duration === 0 && this.vars.repeat) { //zero duration tweens that render immediately have render() called from TweenLite's constructor, before TweenMax's constructor has finished setting _repeat, _repeatDelay, and _yoyo which are critical in determining totalDuration() so we need to call invalidate() which is a low-kb way to get those set properly. - this.invalidate(); - } - var totalDur = (!this._dirty) ? this._totalDuration : this.totalDuration(), - prevTime = this._time, - prevTotalTime = this._totalTime, - prevCycle = this._cycle, - duration = this._duration, - prevRawPrevTime = this._rawPrevTime, - isComplete, callback, pt, cycleDuration, r, type, pow, rawPrevTime, i; - if (time >= totalDur) { - this._totalTime = totalDur; - this._cycle = this._repeat; - if (this._yoyo && (this._cycle & 1) !== 0) { - this._time = 0; - this.ratio = this._ease._calcEnd ? this._ease.getRatio(0) : 0; - } else { - this._time = duration; - this.ratio = this._ease._calcEnd ? this._ease.getRatio(1) : 1; - } - if (!this._reversed) { - isComplete = true; - callback = "onComplete"; - } - if (duration === 0) if (this._initted || !this.vars.lazy || force) { //zero-duration tweens are tricky because we must discern the momentum/direction of time in order to determine whether the starting values should be rendered or the ending values. If the "playhead" of its timeline goes past the zero-duration tween in the forward direction or lands directly on it, the end values should be rendered, but if the timeline's "playhead" moves past it in the backward direction (from a postitive time to a negative time), the starting values must be rendered. - if (this._startTime === this._timeline._duration) { //if a zero-duration tween is at the VERY end of a timeline and that timeline renders at its end, it will typically add a tiny bit of cushion to the render time to prevent rounding errors from getting in the way of tweens rendering their VERY end. If we then reverse() that timeline, the zero-duration tween will trigger its onReverseComplete even though technically the playhead didn't pass over it again. It's a very specific edge case we must accommodate. - time = 0; - } - if (time === 0 || prevRawPrevTime < 0 || prevRawPrevTime === _tinyNum) if (prevRawPrevTime !== time) { - force = true; - if (prevRawPrevTime > _tinyNum) { - callback = "onReverseComplete"; - } - } - this._rawPrevTime = rawPrevTime = (!suppressEvents || time || prevRawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. - } - - } else if (time < 0.0000001) { //to work around occasional floating point math artifacts, round super small values to 0. - this._totalTime = this._time = this._cycle = 0; - this.ratio = this._ease._calcEnd ? this._ease.getRatio(0) : 0; - if (prevTotalTime !== 0 || (duration === 0 && prevRawPrevTime > 0 && prevRawPrevTime !== _tinyNum)) { - callback = "onReverseComplete"; - isComplete = this._reversed; - } - if (time < 0) { - this._active = false; - if (duration === 0) if (this._initted || !this.vars.lazy || force) { //zero-duration tweens are tricky because we must discern the momentum/direction of time in order to determine whether the starting values should be rendered or the ending values. If the "playhead" of its timeline goes past the zero-duration tween in the forward direction or lands directly on it, the end values should be rendered, but if the timeline's "playhead" moves past it in the backward direction (from a postitive time to a negative time), the starting values must be rendered. - if (prevRawPrevTime >= 0) { - force = true; - } - this._rawPrevTime = rawPrevTime = (!suppressEvents || time || prevRawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. - } - } else if (!this._initted) { //if we render the very beginning (time == 0) of a fromTo(), we must force the render (normal tweens wouldn't need to render at a time of 0 when the prevTime was also 0). This is also mandatory to make sure overwriting kicks in immediately. - force = true; - } - } else { - this._totalTime = this._time = time; - - if (this._repeat !== 0) { - cycleDuration = duration + this._repeatDelay; - this._cycle = (this._totalTime / cycleDuration) >> 0; //originally _totalTime % cycleDuration but floating point errors caused problems, so I normalized it. (4 % 0.8 should be 0 but Flash reports it as 0.79999999!) - if (this._cycle !== 0) if (this._cycle === this._totalTime / cycleDuration) { - this._cycle--; //otherwise when rendered exactly at the end time, it will act as though it is repeating (at the beginning) - } - this._time = this._totalTime - (this._cycle * cycleDuration); - if (this._yoyo) if ((this._cycle & 1) !== 0) { - this._time = duration - this._time; - } - if (this._time > duration) { - this._time = duration; - } else if (this._time < 0) { - this._time = 0; - } - } - - if (this._easeType) { - r = this._time / duration; - type = this._easeType; - pow = this._easePower; - if (type === 1 || (type === 3 && r >= 0.5)) { - r = 1 - r; - } - if (type === 3) { - r *= 2; - } - if (pow === 1) { - r *= r; - } else if (pow === 2) { - r *= r * r; - } else if (pow === 3) { - r *= r * r * r; - } else if (pow === 4) { - r *= r * r * r * r; - } - - if (type === 1) { - this.ratio = 1 - r; - } else if (type === 2) { - this.ratio = r; - } else if (this._time / duration < 0.5) { - this.ratio = r / 2; - } else { - this.ratio = 1 - (r / 2); - } - - } else { - this.ratio = this._ease.getRatio(this._time / duration); - } - - } - - if (prevTime === this._time && !force && prevCycle === this._cycle) { - if (prevTotalTime !== this._totalTime) if (this._onUpdate) if (!suppressEvents) { //so that onUpdate fires even during the repeatDelay - as long as the totalTime changed, we should trigger onUpdate. - this._onUpdate.apply(this.vars.onUpdateScope || this, this.vars.onUpdateParams || _blankArray); - } - return; - } else if (!this._initted) { - this._init(); - if (!this._initted || this._gc) { //immediateRender tweens typically won't initialize until the playhead advances (_time is greater than 0) in order to ensure that overwriting occurs properly. Also, if all of the tweening properties have been overwritten (which would cause _gc to be true, as set in _init()), we shouldn't continue otherwise an onStart callback could be called for example. - return; - } else if (!force && this._firstPT && ((this.vars.lazy !== false && this._duration) || (this.vars.lazy && !this._duration))) { //we stick it in the queue for rendering at the very end of the tick - this is a performance optimization because browsers invalidate styles and force a recalculation if you read, write, and then read style data (so it's better to read/read/read/write/write/write than read/write/read/write/read/write). The down side, of course, is that usually you WANT things to render immediately because you may have code running right after that which depends on the change. Like imagine running TweenLite.set(...) and then immediately after that, creating a nother tween that animates the same property to another value; the starting values of that 2nd tween wouldn't be accurate if lazy is true. - this._time = prevTime; - this._totalTime = prevTotalTime; - this._rawPrevTime = prevRawPrevTime; - this._cycle = prevCycle; - TweenLiteInternals.lazyTweens.push(this); - this._lazy = time; - return; - } - //_ease is initially set to defaultEase, so now that init() has run, _ease is set properly and we need to recalculate the ratio. Overall this is faster than using conditional logic earlier in the method to avoid having to set ratio twice because we only init() once but renderTime() gets called VERY frequently. - if (this._time && !isComplete) { - this.ratio = this._ease.getRatio(this._time / duration); - } else if (isComplete && this._ease._calcEnd) { - this.ratio = this._ease.getRatio((this._time === 0) ? 0 : 1); - } - } - if (this._lazy !== false) { - this._lazy = false; - } - - if (!this._active) if (!this._paused && this._time !== prevTime && time >= 0) { - this._active = true; //so that if the user renders a tween (as opposed to the timeline rendering it), the timeline is forced to re-render and align it with the proper time/frame on the next rendering cycle. Maybe the tween already finished but the user manually re-renders it as halfway done. - } - if (prevTotalTime === 0) { - if (this._initted === 2 && time > 0) { - //this.invalidate(); - this._init(); //will just apply overwriting since _initted of (2) means it was a from() tween that had immediateRender:true - } - if (this._startAt) { - if (time >= 0) { - this._startAt.render(time, suppressEvents, force); - } else if (!callback) { - callback = "_dummyGS"; //if no callback is defined, use a dummy value just so that the condition at the end evaluates as true because _startAt should render AFTER the normal render loop when the time is negative. We could handle this in a more intuitive way, of course, but the render loop is the MOST important thing to optimize, so this technique allows us to avoid adding extra conditional logic in a high-frequency area. - } - } - if (this.vars.onStart) if (this._totalTime !== 0 || duration === 0) if (!suppressEvents) { - this.vars.onStart.apply(this.vars.onStartScope || this, this.vars.onStartParams || _blankArray); - } - } - - pt = this._firstPT; - while (pt) { - if (pt.f) { - pt.t[pt.p](pt.c * this.ratio + pt.s); - } else { - pt.t[pt.p] = pt.c * this.ratio + pt.s; - } - pt = pt._next; - } - - if (this._onUpdate) { - if (time < 0) if (this._startAt && this._startTime) { //if the tween is positioned at the VERY beginning (_startTime 0) of its parent timeline, it's illegal for the playhead to go back further, so we should not render the recorded startAt values. - this._startAt.render(time, suppressEvents, force); //note: for performance reasons, we tuck this conditional logic inside less traveled areas (most tweens don't have an onUpdate). We'd just have it at the end before the onComplete, but the values should be updated before any onUpdate is called, so we ALSO put it here and then if it's not called, we do so later near the onComplete. - } - if (!suppressEvents) if (this._totalTime !== prevTotalTime || isComplete) { - this._onUpdate.apply(this.vars.onUpdateScope || this, this.vars.onUpdateParams || _blankArray); - } - } - if (this._cycle !== prevCycle) if (!suppressEvents) if (!this._gc) if (this.vars.onRepeat) { - this.vars.onRepeat.apply(this.vars.onRepeatScope || this, this.vars.onRepeatParams || _blankArray); - } - if (callback) if (!this._gc) { //check gc because there's a chance that kill() could be called in an onUpdate - if (time < 0 && this._startAt && !this._onUpdate && this._startTime) { //if the tween is positioned at the VERY beginning (_startTime 0) of its parent timeline, it's illegal for the playhead to go back further, so we should not render the recorded startAt values. - this._startAt.render(time, suppressEvents, force); - } - if (isComplete) { - if (this._timeline.autoRemoveChildren) { - this._enabled(false, false); - } - this._active = false; - } - if (!suppressEvents && this.vars[callback]) { - this.vars[callback].apply(this.vars[callback + "Scope"] || this, this.vars[callback + "Params"] || _blankArray); - } - if (duration === 0 && this._rawPrevTime === _tinyNum && rawPrevTime !== _tinyNum) { //the onComplete or onReverseComplete could trigger movement of the playhead and for zero-duration tweens (which must discern direction) that land directly back on their start time, we don't want to fire again on the next render. Think of several addPause()'s in a timeline that forces the playhead to a certain spot, but what if it's already paused and another tween is tweening the "time" of the timeline? Each time it moves [forward] past that spot, it would move back, and since suppressEvents is true, it'd reset _rawPrevTime to _tinyNum so that when it begins again, the callback would fire (so ultimately it could bounce back and forth during that tween). Again, this is a very uncommon scenario, but possible nonetheless. - this._rawPrevTime = 0; - } - } - }; - -//---- STATIC FUNCTIONS ----------------------------------------------------------------------------------------------------------- - - TweenMax.to = function(target, duration, vars) { - return new TweenMax(target, duration, vars); - }; - - TweenMax.from = function(target, duration, vars) { - vars.runBackwards = true; - vars.immediateRender = (vars.immediateRender != false); - return new TweenMax(target, duration, vars); - }; - - TweenMax.fromTo = function(target, duration, fromVars, toVars) { - toVars.startAt = fromVars; - toVars.immediateRender = (toVars.immediateRender != false && fromVars.immediateRender != false); - return new TweenMax(target, duration, toVars); - }; - - TweenMax.staggerTo = TweenMax.allTo = function(targets, duration, vars, stagger, onCompleteAll, onCompleteAllParams, onCompleteAllScope) { - stagger = stagger || 0; - var delay = vars.delay || 0, - a = [], - finalComplete = function() { - if (vars.onComplete) { - vars.onComplete.apply(vars.onCompleteScope || this, arguments); - } - onCompleteAll.apply(onCompleteAllScope || this, onCompleteAllParams || _blankArray); - }, - l, copy, i, p; - if (!_isArray(targets)) { - if (typeof(targets) === "string") { - targets = TweenLite.selector(targets) || targets; - } - if (_isSelector(targets)) { - targets = _slice.call(targets, 0); - } - } - l = targets.length; - for (i = 0; i < l; i++) { - copy = {}; - for (p in vars) { - copy[p] = vars[p]; - } - copy.delay = delay; - if (i === l - 1 && onCompleteAll) { - copy.onComplete = finalComplete; - } - a[i] = new TweenMax(targets[i], duration, copy); - delay += stagger; - } - return a; - }; - - TweenMax.staggerFrom = TweenMax.allFrom = function(targets, duration, vars, stagger, onCompleteAll, onCompleteAllParams, onCompleteAllScope) { - vars.runBackwards = true; - vars.immediateRender = (vars.immediateRender != false); - return TweenMax.staggerTo(targets, duration, vars, stagger, onCompleteAll, onCompleteAllParams, onCompleteAllScope); - }; - - TweenMax.staggerFromTo = TweenMax.allFromTo = function(targets, duration, fromVars, toVars, stagger, onCompleteAll, onCompleteAllParams, onCompleteAllScope) { - toVars.startAt = fromVars; - toVars.immediateRender = (toVars.immediateRender != false && fromVars.immediateRender != false); - return TweenMax.staggerTo(targets, duration, toVars, stagger, onCompleteAll, onCompleteAllParams, onCompleteAllScope); - }; - - TweenMax.delayedCall = function(delay, callback, params, scope, useFrames) { - return new TweenMax(callback, 0, {delay:delay, onComplete:callback, onCompleteParams:params, onCompleteScope:scope, onReverseComplete:callback, onReverseCompleteParams:params, onReverseCompleteScope:scope, immediateRender:false, useFrames:useFrames, overwrite:0}); - }; - - TweenMax.set = function(target, vars) { - return new TweenMax(target, 0, vars); - }; - - TweenMax.isTweening = function(target) { - return (TweenLite.getTweensOf(target, true).length > 0); - }; - - var _getChildrenOf = function(timeline, includeTimelines) { - var a = [], - cnt = 0, - tween = timeline._first; - while (tween) { - if (tween instanceof TweenLite) { - a[cnt++] = tween; - } else { - if (includeTimelines) { - a[cnt++] = tween; - } - a = a.concat(_getChildrenOf(tween, includeTimelines)); - cnt = a.length; - } - tween = tween._next; - } - return a; - }, - getAllTweens = TweenMax.getAllTweens = function(includeTimelines) { - return _getChildrenOf(Animation._rootTimeline, includeTimelines).concat( _getChildrenOf(Animation._rootFramesTimeline, includeTimelines) ); - }; - - TweenMax.killAll = function(complete, tweens, delayedCalls, timelines) { - if (tweens == null) { - tweens = true; - } - if (delayedCalls == null) { - delayedCalls = true; - } - var a = getAllTweens((timelines != false)), - l = a.length, - allTrue = (tweens && delayedCalls && timelines), - isDC, tween, i; - for (i = 0; i < l; i++) { - tween = a[i]; - if (allTrue || (tween instanceof SimpleTimeline) || ((isDC = (tween.target === tween.vars.onComplete)) && delayedCalls) || (tweens && !isDC)) { - if (complete) { - tween.totalTime(tween._reversed ? 0 : tween.totalDuration()); - } else { - tween._enabled(false, false); - } - } - } - }; - - TweenMax.killChildTweensOf = function(parent, complete) { - if (parent == null) { - return; - } - var tl = TweenLiteInternals.tweenLookup, - a, curParent, p, i, l; - if (typeof(parent) === "string") { - parent = TweenLite.selector(parent) || parent; - } - if (_isSelector(parent)) { - parent = _slice.call(parent, 0); - } - if (_isArray(parent)) { - i = parent.length; - while (--i > -1) { - TweenMax.killChildTweensOf(parent[i], complete); - } - return; - } - a = []; - for (p in tl) { - curParent = tl[p].target.parentNode; - while (curParent) { - if (curParent === parent) { - a = a.concat(tl[p].tweens); - } - curParent = curParent.parentNode; - } - } - l = a.length; - for (i = 0; i < l; i++) { - if (complete) { - a[i].totalTime(a[i].totalDuration()); - } - a[i]._enabled(false, false); - } - }; - - var _changePause = function(pause, tweens, delayedCalls, timelines) { - tweens = (tweens !== false); - delayedCalls = (delayedCalls !== false); - timelines = (timelines !== false); - var a = getAllTweens(timelines), - allTrue = (tweens && delayedCalls && timelines), - i = a.length, - isDC, tween; - while (--i > -1) { - tween = a[i]; - if (allTrue || (tween instanceof SimpleTimeline) || ((isDC = (tween.target === tween.vars.onComplete)) && delayedCalls) || (tweens && !isDC)) { - tween.paused(pause); - } - } - }; - - TweenMax.pauseAll = function(tweens, delayedCalls, timelines) { - _changePause(true, tweens, delayedCalls, timelines); - }; - - TweenMax.resumeAll = function(tweens, delayedCalls, timelines) { - _changePause(false, tweens, delayedCalls, timelines); - }; - - TweenMax.globalTimeScale = function(value) { - var tl = Animation._rootTimeline, - t = TweenLite.ticker.time; - if (!arguments.length) { - return tl._timeScale; - } - value = value || _tinyNum; //can't allow zero because it'll throw the math off - tl._startTime = t - ((t - tl._startTime) * tl._timeScale / value); - tl = Animation._rootFramesTimeline; - t = TweenLite.ticker.frame; - tl._startTime = t - ((t - tl._startTime) * tl._timeScale / value); - tl._timeScale = Animation._rootTimeline._timeScale = value; - return value; - }; - - -//---- GETTERS / SETTERS ---------------------------------------------------------------------------------------------------------- - - p.progress = function(value) { - return (!arguments.length) ? this._time / this.duration() : this.totalTime( this.duration() * ((this._yoyo && (this._cycle & 1) !== 0) ? 1 - value : value) + (this._cycle * (this._duration + this._repeatDelay)), false); - }; - - p.totalProgress = function(value) { - return (!arguments.length) ? this._totalTime / this.totalDuration() : this.totalTime( this.totalDuration() * value, false); - }; - - p.time = function(value, suppressEvents) { - if (!arguments.length) { - return this._time; - } - if (this._dirty) { - this.totalDuration(); - } - if (value > this._duration) { - value = this._duration; - } - if (this._yoyo && (this._cycle & 1) !== 0) { - value = (this._duration - value) + (this._cycle * (this._duration + this._repeatDelay)); - } else if (this._repeat !== 0) { - value += this._cycle * (this._duration + this._repeatDelay); - } - return this.totalTime(value, suppressEvents); - }; - - p.duration = function(value) { - if (!arguments.length) { - return this._duration; //don't set _dirty = false because there could be repeats that haven't been factored into the _totalDuration yet. Otherwise, if you create a repeated TweenMax and then immediately check its duration(), it would cache the value and the totalDuration would not be correct, thus repeats wouldn't take effect. - } - return Animation.prototype.duration.call(this, value); - }; - - p.totalDuration = function(value) { - if (!arguments.length) { - if (this._dirty) { - //instead of Infinity, we use 999999999999 so that we can accommodate reverses - this._totalDuration = (this._repeat === -1) ? 999999999999 : this._duration * (this._repeat + 1) + (this._repeatDelay * this._repeat); - this._dirty = false; - } - return this._totalDuration; - } - return (this._repeat === -1) ? this : this.duration( (value - (this._repeat * this._repeatDelay)) / (this._repeat + 1) ); - }; - - p.repeat = function(value) { - if (!arguments.length) { - return this._repeat; - } - this._repeat = value; - return this._uncache(true); - }; - - p.repeatDelay = function(value) { - if (!arguments.length) { - return this._repeatDelay; - } - this._repeatDelay = value; - return this._uncache(true); - }; - - p.yoyo = function(value) { - if (!arguments.length) { - return this._yoyo; - } - this._yoyo = value; - return this; - }; - - - return TweenMax; - - }, true); - - - - - - - - -/* - * ---------------------------------------------------------------- - * TimelineLite - * ---------------------------------------------------------------- - */ - window._gsDefine("TimelineLite", ["core.Animation","core.SimpleTimeline","TweenLite"], function(Animation, SimpleTimeline, TweenLite) { - - var TimelineLite = function(vars) { - SimpleTimeline.call(this, vars); - this._labels = {}; - this.autoRemoveChildren = (this.vars.autoRemoveChildren === true); - this.smoothChildTiming = (this.vars.smoothChildTiming === true); - this._sortChildren = true; - this._onUpdate = this.vars.onUpdate; - var v = this.vars, - val, p; - for (p in v) { - val = v[p]; - if (_isArray(val)) if (val.join("").indexOf("{self}") !== -1) { - v[p] = this._swapSelfInParams(val); - } - } - if (_isArray(v.tweens)) { - this.add(v.tweens, 0, v.align, v.stagger); - } - }, - _tinyNum = 0.0000000001, - _isSelector = TweenLite._internals.isSelector, - _isArray = TweenLite._internals.isArray, - _blankArray = [], - _globals = window._gsDefine.globals, - _copy = function(vars) { - var copy = {}, p; - for (p in vars) { - copy[p] = vars[p]; - } - return copy; - }, - _pauseCallback = function(tween, callback, params, scope) { - tween._timeline.pause(tween._startTime); - if (callback) { - callback.apply(scope || tween._timeline, params || _blankArray); - } - }, - _slice = _blankArray.slice, - p = TimelineLite.prototype = new SimpleTimeline(); - - TimelineLite.version = "1.12.1"; - p.constructor = TimelineLite; - p.kill()._gc = false; - - p.to = function(target, duration, vars, position) { - var Engine = (vars.repeat && _globals.TweenMax) || TweenLite; - return duration ? this.add( new Engine(target, duration, vars), position) : this.set(target, vars, position); - }; - - p.from = function(target, duration, vars, position) { - return this.add( ((vars.repeat && _globals.TweenMax) || TweenLite).from(target, duration, vars), position); - }; - - p.fromTo = function(target, duration, fromVars, toVars, position) { - var Engine = (toVars.repeat && _globals.TweenMax) || TweenLite; - return duration ? this.add( Engine.fromTo(target, duration, fromVars, toVars), position) : this.set(target, toVars, position); - }; - - p.staggerTo = function(targets, duration, vars, stagger, position, onCompleteAll, onCompleteAllParams, onCompleteAllScope) { - var tl = new TimelineLite({onComplete:onCompleteAll, onCompleteParams:onCompleteAllParams, onCompleteScope:onCompleteAllScope, smoothChildTiming:this.smoothChildTiming}), - i; - if (typeof(targets) === "string") { - targets = TweenLite.selector(targets) || targets; - } - if (_isSelector(targets)) { //senses if the targets object is a selector. If it is, we should translate it into an array. - targets = _slice.call(targets, 0); - } - stagger = stagger || 0; - for (i = 0; i < targets.length; i++) { - if (vars.startAt) { - vars.startAt = _copy(vars.startAt); - } - tl.to(targets[i], duration, _copy(vars), i * stagger); - } - return this.add(tl, position); - }; - - p.staggerFrom = function(targets, duration, vars, stagger, position, onCompleteAll, onCompleteAllParams, onCompleteAllScope) { - vars.immediateRender = (vars.immediateRender != false); - vars.runBackwards = true; - return this.staggerTo(targets, duration, vars, stagger, position, onCompleteAll, onCompleteAllParams, onCompleteAllScope); - }; - - p.staggerFromTo = function(targets, duration, fromVars, toVars, stagger, position, onCompleteAll, onCompleteAllParams, onCompleteAllScope) { - toVars.startAt = fromVars; - toVars.immediateRender = (toVars.immediateRender != false && fromVars.immediateRender != false); - return this.staggerTo(targets, duration, toVars, stagger, position, onCompleteAll, onCompleteAllParams, onCompleteAllScope); - }; - - p.call = function(callback, params, scope, position) { - return this.add( TweenLite.delayedCall(0, callback, params, scope), position); - }; - - p.set = function(target, vars, position) { - position = this._parseTimeOrLabel(position, 0, true); - if (vars.immediateRender == null) { - vars.immediateRender = (position === this._time && !this._paused); - } - return this.add( new TweenLite(target, 0, vars), position); - }; - - TimelineLite.exportRoot = function(vars, ignoreDelayedCalls) { - vars = vars || {}; - if (vars.smoothChildTiming == null) { - vars.smoothChildTiming = true; - } - var tl = new TimelineLite(vars), - root = tl._timeline, - tween, next; - if (ignoreDelayedCalls == null) { - ignoreDelayedCalls = true; - } - root._remove(tl, true); - tl._startTime = 0; - tl._rawPrevTime = tl._time = tl._totalTime = root._time; - tween = root._first; - while (tween) { - next = tween._next; - if (!ignoreDelayedCalls || !(tween instanceof TweenLite && tween.target === tween.vars.onComplete)) { - tl.add(tween, tween._startTime - tween._delay); - } - tween = next; - } - root.add(tl, 0); - return tl; - }; - - p.add = function(value, position, align, stagger) { - var curTime, l, i, child, tl, beforeRawTime; - if (typeof(position) !== "number") { - position = this._parseTimeOrLabel(position, 0, true, value); - } - if (!(value instanceof Animation)) { - if ((value instanceof Array) || (value && value.push && _isArray(value))) { - align = align || "normal"; - stagger = stagger || 0; - curTime = position; - l = value.length; - for (i = 0; i < l; i++) { - if (_isArray(child = value[i])) { - child = new TimelineLite({tweens:child}); - } - this.add(child, curTime); - if (typeof(child) !== "string" && typeof(child) !== "function") { - if (align === "sequence") { - curTime = child._startTime + (child.totalDuration() / child._timeScale); - } else if (align === "start") { - child._startTime -= child.delay(); - } - } - curTime += stagger; - } - return this._uncache(true); - } else if (typeof(value) === "string") { - return this.addLabel(value, position); - } else if (typeof(value) === "function") { - value = TweenLite.delayedCall(0, value); - } else { - throw("Cannot add " + value + " into the timeline; it is not a tween, timeline, function, or string."); - } - } - - SimpleTimeline.prototype.add.call(this, value, position); - - //if the timeline has already ended but the inserted tween/timeline extends the duration, we should enable this timeline again so that it renders properly. We should also align the playhead with the parent timeline's when appropriate. - if (this._gc || this._time === this._duration) if (!this._paused) if (this._duration < this.duration()) { - //in case any of the ancestors had completed but should now be enabled... - tl = this; - beforeRawTime = (tl.rawTime() > value._startTime); //if the tween is placed on the timeline so that it starts BEFORE the current rawTime, we should align the playhead (move the timeline). This is because sometimes users will create a timeline, let it finish, and much later append a tween and expect it to run instead of jumping to its end state. While technically one could argue that it should jump to its end state, that's not what users intuitively expect. - while (tl._timeline) { - if (beforeRawTime && tl._timeline.smoothChildTiming) { - tl.totalTime(tl._totalTime, true); //moves the timeline (shifts its startTime) if necessary, and also enables it. - } else if (tl._gc) { - tl._enabled(true, false); - } - tl = tl._timeline; - } - } - - return this; - }; - - p.remove = function(value) { - if (value instanceof Animation) { - return this._remove(value, false); - } else if (value instanceof Array || (value && value.push && _isArray(value))) { - var i = value.length; - while (--i > -1) { - this.remove(value[i]); - } - return this; - } else if (typeof(value) === "string") { - return this.removeLabel(value); - } - return this.kill(null, value); - }; - - p._remove = function(tween, skipDisable) { - SimpleTimeline.prototype._remove.call(this, tween, skipDisable); - var last = this._last; - if (!last) { - this._time = this._totalTime = this._duration = this._totalDuration = 0; - } else if (this._time > last._startTime + last._totalDuration / last._timeScale) { - this._time = this.duration(); - this._totalTime = this._totalDuration; - } - return this; - }; - - p.append = function(value, offsetOrLabel) { - return this.add(value, this._parseTimeOrLabel(null, offsetOrLabel, true, value)); - }; - - p.insert = p.insertMultiple = function(value, position, align, stagger) { - return this.add(value, position || 0, align, stagger); - }; - - p.appendMultiple = function(tweens, offsetOrLabel, align, stagger) { - return this.add(tweens, this._parseTimeOrLabel(null, offsetOrLabel, true, tweens), align, stagger); - }; - - p.addLabel = function(label, position) { - this._labels[label] = this._parseTimeOrLabel(position); - return this; - }; - - p.addPause = function(position, callback, params, scope) { - return this.call(_pauseCallback, ["{self}", callback, params, scope], this, position); - }; - - p.removeLabel = function(label) { - delete this._labels[label]; - return this; - }; - - p.getLabelTime = function(label) { - return (this._labels[label] != null) ? this._labels[label] : -1; - }; - - p._parseTimeOrLabel = function(timeOrLabel, offsetOrLabel, appendIfAbsent, ignore) { - var i; - //if we're about to add a tween/timeline (or an array of them) that's already a child of this timeline, we should remove it first so that it doesn't contaminate the duration(). - if (ignore instanceof Animation && ignore.timeline === this) { - this.remove(ignore); - } else if (ignore && ((ignore instanceof Array) || (ignore.push && _isArray(ignore)))) { - i = ignore.length; - while (--i > -1) { - if (ignore[i] instanceof Animation && ignore[i].timeline === this) { - this.remove(ignore[i]); - } - } - } - if (typeof(offsetOrLabel) === "string") { - return this._parseTimeOrLabel(offsetOrLabel, (appendIfAbsent && typeof(timeOrLabel) === "number" && this._labels[offsetOrLabel] == null) ? timeOrLabel - this.duration() : 0, appendIfAbsent); - } - offsetOrLabel = offsetOrLabel || 0; - if (typeof(timeOrLabel) === "string" && (isNaN(timeOrLabel) || this._labels[timeOrLabel] != null)) { //if the string is a number like "1", check to see if there's a label with that name, otherwise interpret it as a number (absolute value). - i = timeOrLabel.indexOf("="); - if (i === -1) { - if (this._labels[timeOrLabel] == null) { - return appendIfAbsent ? (this._labels[timeOrLabel] = this.duration() + offsetOrLabel) : offsetOrLabel; - } - return this._labels[timeOrLabel] + offsetOrLabel; - } - offsetOrLabel = parseInt(timeOrLabel.charAt(i-1) + "1", 10) * Number(timeOrLabel.substr(i+1)); - timeOrLabel = (i > 1) ? this._parseTimeOrLabel(timeOrLabel.substr(0, i-1), 0, appendIfAbsent) : this.duration(); - } else if (timeOrLabel == null) { - timeOrLabel = this.duration(); - } - return Number(timeOrLabel) + offsetOrLabel; - }; - - p.seek = function(position, suppressEvents) { - return this.totalTime((typeof(position) === "number") ? position : this._parseTimeOrLabel(position), (suppressEvents !== false)); - }; - - p.stop = function() { - return this.paused(true); - }; - - p.gotoAndPlay = function(position, suppressEvents) { - return this.play(position, suppressEvents); - }; - - p.gotoAndStop = function(position, suppressEvents) { - return this.pause(position, suppressEvents); - }; - - p.render = function(time, suppressEvents, force) { - if (this._gc) { - this._enabled(true, false); - } - var totalDur = (!this._dirty) ? this._totalDuration : this.totalDuration(), - prevTime = this._time, - prevStart = this._startTime, - prevTimeScale = this._timeScale, - prevPaused = this._paused, - tween, isComplete, next, callback, internalForce; - if (time >= totalDur) { - this._totalTime = this._time = totalDur; - if (!this._reversed) if (!this._hasPausedChild()) { - isComplete = true; - callback = "onComplete"; - if (this._duration === 0) if (time === 0 || this._rawPrevTime < 0 || this._rawPrevTime === _tinyNum) if (this._rawPrevTime !== time && this._first) { - internalForce = true; - if (this._rawPrevTime > _tinyNum) { - callback = "onReverseComplete"; - } - } - } - this._rawPrevTime = (this._duration || !suppressEvents || time || this._rawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration timeline or tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. - time = totalDur + 0.0001; //to avoid occasional floating point rounding errors - sometimes child tweens/timelines were not being fully completed (their progress might be 0.999999999999998 instead of 1 because when _time - tween._startTime is performed, floating point errors would return a value that was SLIGHTLY off). Try (999999999999.7 - 999999999999) * 1 = 0.699951171875 instead of 0.7. - - } else if (time < 0.0000001) { //to work around occasional floating point math artifacts, round super small values to 0. - this._totalTime = this._time = 0; - if (prevTime !== 0 || (this._duration === 0 && this._rawPrevTime !== _tinyNum && (this._rawPrevTime > 0 || (time < 0 && this._rawPrevTime >= 0)))) { - callback = "onReverseComplete"; - isComplete = this._reversed; - } - if (time < 0) { - this._active = false; - if (this._duration === 0) if (this._rawPrevTime >= 0 && this._first) { //zero-duration timelines are tricky because we must discern the momentum/direction of time in order to determine whether the starting values should be rendered or the ending values. If the "playhead" of its timeline goes past the zero-duration tween in the forward direction or lands directly on it, the end values should be rendered, but if the timeline's "playhead" moves past it in the backward direction (from a postitive time to a negative time), the starting values must be rendered. - internalForce = true; - } - this._rawPrevTime = time; - } else { - this._rawPrevTime = (this._duration || !suppressEvents || time || this._rawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration timeline or tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. - - time = 0; //to avoid occasional floating point rounding errors (could cause problems especially with zero-duration tweens at the very beginning of the timeline) - if (!this._initted) { - internalForce = true; - } - } - - } else { - this._totalTime = this._time = this._rawPrevTime = time; - } - if ((this._time === prevTime || !this._first) && !force && !internalForce) { - return; - } else if (!this._initted) { - this._initted = true; - } - - if (!this._active) if (!this._paused && this._time !== prevTime && time > 0) { - this._active = true; //so that if the user renders the timeline (as opposed to the parent timeline rendering it), it is forced to re-render and align it with the proper time/frame on the next rendering cycle. Maybe the timeline already finished but the user manually re-renders it as halfway done, for example. - } - - if (prevTime === 0) if (this.vars.onStart) if (this._time !== 0) if (!suppressEvents) { - this.vars.onStart.apply(this.vars.onStartScope || this, this.vars.onStartParams || _blankArray); - } - - if (this._time >= prevTime) { - tween = this._first; - while (tween) { - next = tween._next; //record it here because the value could change after rendering... - if (this._paused && !prevPaused) { //in case a tween pauses the timeline when rendering - break; - } else if (tween._active || (tween._startTime <= this._time && !tween._paused && !tween._gc)) { - if (!tween._reversed) { - tween.render((time - tween._startTime) * tween._timeScale, suppressEvents, force); - } else { - tween.render(((!tween._dirty) ? tween._totalDuration : tween.totalDuration()) - ((time - tween._startTime) * tween._timeScale), suppressEvents, force); - } - } - tween = next; - } - } else { - tween = this._last; - while (tween) { - next = tween._prev; //record it here because the value could change after rendering... - if (this._paused && !prevPaused) { //in case a tween pauses the timeline when rendering - break; - } else if (tween._active || (tween._startTime <= prevTime && !tween._paused && !tween._gc)) { - if (!tween._reversed) { - tween.render((time - tween._startTime) * tween._timeScale, suppressEvents, force); - } else { - tween.render(((!tween._dirty) ? tween._totalDuration : tween.totalDuration()) - ((time - tween._startTime) * tween._timeScale), suppressEvents, force); - } - } - tween = next; - } - } - - if (this._onUpdate) if (!suppressEvents) { - this._onUpdate.apply(this.vars.onUpdateScope || this, this.vars.onUpdateParams || _blankArray); - } - - if (callback) if (!this._gc) if (prevStart === this._startTime || prevTimeScale !== this._timeScale) if (this._time === 0 || totalDur >= this.totalDuration()) { //if one of the tweens that was rendered altered this timeline's startTime (like if an onComplete reversed the timeline), it probably isn't complete. If it is, don't worry, because whatever call altered the startTime would complete if it was necessary at the new time. The only exception is the timeScale property. Also check _gc because there's a chance that kill() could be called in an onUpdate - if (isComplete) { - if (this._timeline.autoRemoveChildren) { - this._enabled(false, false); - } - this._active = false; - } - if (!suppressEvents && this.vars[callback]) { - this.vars[callback].apply(this.vars[callback + "Scope"] || this, this.vars[callback + "Params"] || _blankArray); - } - } - }; - - p._hasPausedChild = function() { - var tween = this._first; - while (tween) { - if (tween._paused || ((tween instanceof TimelineLite) && tween._hasPausedChild())) { - return true; - } - tween = tween._next; - } - return false; - }; - - p.getChildren = function(nested, tweens, timelines, ignoreBeforeTime) { - ignoreBeforeTime = ignoreBeforeTime || -9999999999; - var a = [], - tween = this._first, - cnt = 0; - while (tween) { - if (tween._startTime < ignoreBeforeTime) { - //do nothing - } else if (tween instanceof TweenLite) { - if (tweens !== false) { - a[cnt++] = tween; - } - } else { - if (timelines !== false) { - a[cnt++] = tween; - } - if (nested !== false) { - a = a.concat(tween.getChildren(true, tweens, timelines)); - cnt = a.length; - } - } - tween = tween._next; - } - return a; - }; - - p.getTweensOf = function(target, nested) { - var disabled = this._gc, - a = [], - cnt = 0, - tweens, i; - if (disabled) { - this._enabled(true, true); //getTweensOf() filters out disabled tweens, and we have to mark them as _gc = true when the timeline completes in order to allow clean garbage collection, so temporarily re-enable the timeline here. - } - tweens = TweenLite.getTweensOf(target); - i = tweens.length; - while (--i > -1) { - if (tweens[i].timeline === this || (nested && this._contains(tweens[i]))) { - a[cnt++] = tweens[i]; - } - } - if (disabled) { - this._enabled(false, true); - } - return a; - }; - - p._contains = function(tween) { - var tl = tween.timeline; - while (tl) { - if (tl === this) { - return true; - } - tl = tl.timeline; - } - return false; - }; - - p.shiftChildren = function(amount, adjustLabels, ignoreBeforeTime) { - ignoreBeforeTime = ignoreBeforeTime || 0; - var tween = this._first, - labels = this._labels, - p; - while (tween) { - if (tween._startTime >= ignoreBeforeTime) { - tween._startTime += amount; - } - tween = tween._next; - } - if (adjustLabels) { - for (p in labels) { - if (labels[p] >= ignoreBeforeTime) { - labels[p] += amount; - } - } - } - return this._uncache(true); - }; - - p._kill = function(vars, target) { - if (!vars && !target) { - return this._enabled(false, false); - } - var tweens = (!target) ? this.getChildren(true, true, false) : this.getTweensOf(target), - i = tweens.length, - changed = false; - while (--i > -1) { - if (tweens[i]._kill(vars, target)) { - changed = true; - } - } - return changed; - }; - - p.clear = function(labels) { - var tweens = this.getChildren(false, true, true), - i = tweens.length; - this._time = this._totalTime = 0; - while (--i > -1) { - tweens[i]._enabled(false, false); - } - if (labels !== false) { - this._labels = {}; - } - return this._uncache(true); - }; - - p.invalidate = function() { - var tween = this._first; - while (tween) { - tween.invalidate(); - tween = tween._next; - } - return this; - }; - - p._enabled = function(enabled, ignoreTimeline) { - if (enabled === this._gc) { - var tween = this._first; - while (tween) { - tween._enabled(enabled, true); - tween = tween._next; - } - } - return SimpleTimeline.prototype._enabled.call(this, enabled, ignoreTimeline); - }; - - p.duration = function(value) { - if (!arguments.length) { - if (this._dirty) { - this.totalDuration(); //just triggers recalculation - } - return this._duration; - } - if (this.duration() !== 0 && value !== 0) { - this.timeScale(this._duration / value); - } - return this; - }; - - p.totalDuration = function(value) { - if (!arguments.length) { - if (this._dirty) { - var max = 0, - tween = this._last, - prevStart = 999999999999, - prev, end; - while (tween) { - prev = tween._prev; //record it here in case the tween changes position in the sequence... - if (tween._dirty) { - tween.totalDuration(); //could change the tween._startTime, so make sure the tween's cache is clean before analyzing it. - } - if (tween._startTime > prevStart && this._sortChildren && !tween._paused) { //in case one of the tweens shifted out of order, it needs to be re-inserted into the correct position in the sequence - this.add(tween, tween._startTime - tween._delay); - } else { - prevStart = tween._startTime; - } - if (tween._startTime < 0 && !tween._paused) { //children aren't allowed to have negative startTimes unless smoothChildTiming is true, so adjust here if one is found. - max -= tween._startTime; - if (this._timeline.smoothChildTiming) { - this._startTime += tween._startTime / this._timeScale; - } - this.shiftChildren(-tween._startTime, false, -9999999999); - prevStart = 0; - } - end = tween._startTime + (tween._totalDuration / tween._timeScale); - if (end > max) { - max = end; - } - tween = prev; - } - this._duration = this._totalDuration = max; - this._dirty = false; - } - return this._totalDuration; - } - if (this.totalDuration() !== 0) if (value !== 0) { - this.timeScale(this._totalDuration / value); - } - return this; - }; - - p.usesFrames = function() { - var tl = this._timeline; - while (tl._timeline) { - tl = tl._timeline; - } - return (tl === Animation._rootFramesTimeline); - }; - - p.rawTime = function() { - return this._paused ? this._totalTime : (this._timeline.rawTime() - this._startTime) * this._timeScale; - }; - - return TimelineLite; - - }, true); - - - - - - - - - - - - - -/* - * ---------------------------------------------------------------- - * TimelineMax - * ---------------------------------------------------------------- - */ - window._gsDefine("TimelineMax", ["TimelineLite","TweenLite","easing.Ease"], function(TimelineLite, TweenLite, Ease) { - - var TimelineMax = function(vars) { - TimelineLite.call(this, vars); - this._repeat = this.vars.repeat || 0; - this._repeatDelay = this.vars.repeatDelay || 0; - this._cycle = 0; - this._yoyo = (this.vars.yoyo === true); - this._dirty = true; - }, - _tinyNum = 0.0000000001, - _blankArray = [], - _easeNone = new Ease(null, null, 1, 0), - p = TimelineMax.prototype = new TimelineLite(); - - p.constructor = TimelineMax; - p.kill()._gc = false; - TimelineMax.version = "1.12.1"; - - p.invalidate = function() { - this._yoyo = (this.vars.yoyo === true); - this._repeat = this.vars.repeat || 0; - this._repeatDelay = this.vars.repeatDelay || 0; - this._uncache(true); - return TimelineLite.prototype.invalidate.call(this); - }; - - p.addCallback = function(callback, position, params, scope) { - return this.add( TweenLite.delayedCall(0, callback, params, scope), position); - }; - - p.removeCallback = function(callback, position) { - if (callback) { - if (position == null) { - this._kill(null, callback); - } else { - var a = this.getTweensOf(callback, false), - i = a.length, - time = this._parseTimeOrLabel(position); - while (--i > -1) { - if (a[i]._startTime === time) { - a[i]._enabled(false, false); - } - } - } - } - return this; - }; - - p.tweenTo = function(position, vars) { - vars = vars || {}; - var copy = {ease:_easeNone, overwrite:(vars.delay ? 2 : 1), useFrames:this.usesFrames(), immediateRender:false},//note: set overwrite to 1 (true/all) by default unless there's a delay so that we avoid a racing situation that could happen if, for example, an onmousemove creates the same tweenTo() over and over again. - duration, p, t; - for (p in vars) { - copy[p] = vars[p]; - } - copy.time = this._parseTimeOrLabel(position); - duration = (Math.abs(Number(copy.time) - this._time) / this._timeScale) || 0.001; - t = new TweenLite(this, duration, copy); - copy.onStart = function() { - t.target.paused(true); - if (t.vars.time !== t.target.time() && duration === t.duration()) { //don't make the duration zero - if it's supposed to be zero, don't worry because it's already initting the tween and will complete immediately, effectively making the duration zero anyway. If we make duration zero, the tween won't run at all. - t.duration( Math.abs( t.vars.time - t.target.time()) / t.target._timeScale ); - } - if (vars.onStart) { //in case the user had an onStart in the vars - we don't want to overwrite it. - vars.onStart.apply(vars.onStartScope || t, vars.onStartParams || _blankArray); - } - }; - return t; - }; - - p.tweenFromTo = function(fromPosition, toPosition, vars) { - vars = vars || {}; - fromPosition = this._parseTimeOrLabel(fromPosition); - vars.startAt = {onComplete:this.seek, onCompleteParams:[fromPosition], onCompleteScope:this}; - vars.immediateRender = (vars.immediateRender !== false); - var t = this.tweenTo(toPosition, vars); - return t.duration((Math.abs( t.vars.time - fromPosition) / this._timeScale) || 0.001); - }; - - p.render = function(time, suppressEvents, force) { - if (this._gc) { - this._enabled(true, false); - } - var totalDur = (!this._dirty) ? this._totalDuration : this.totalDuration(), - dur = this._duration, - prevTime = this._time, - prevTotalTime = this._totalTime, - prevStart = this._startTime, - prevTimeScale = this._timeScale, - prevRawPrevTime = this._rawPrevTime, - prevPaused = this._paused, - prevCycle = this._cycle, - tween, isComplete, next, callback, internalForce, cycleDuration; - if (time >= totalDur) { - if (!this._locked) { - this._totalTime = totalDur; - this._cycle = this._repeat; - } - if (!this._reversed) if (!this._hasPausedChild()) { - isComplete = true; - callback = "onComplete"; - if (this._duration === 0) if (time === 0 || prevRawPrevTime < 0 || prevRawPrevTime === _tinyNum) if (prevRawPrevTime !== time && this._first) { - internalForce = true; - if (prevRawPrevTime > _tinyNum) { - callback = "onReverseComplete"; - } - } - } - this._rawPrevTime = (this._duration || !suppressEvents || time || this._rawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration timeline or tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. - if (this._yoyo && (this._cycle & 1) !== 0) { - this._time = time = 0; - } else { - this._time = dur; - time = dur + 0.0001; //to avoid occasional floating point rounding errors - sometimes child tweens/timelines were not being fully completed (their progress might be 0.999999999999998 instead of 1 because when _time - tween._startTime is performed, floating point errors would return a value that was SLIGHTLY off). Try (999999999999.7 - 999999999999) * 1 = 0.699951171875 instead of 0.7. We cannot do less then 0.0001 because the same issue can occur when the duration is extremely large like 999999999999 in which case adding 0.00000001, for example, causes it to act like nothing was added. - } - - } else if (time < 0.0000001) { //to work around occasional floating point math artifacts, round super small values to 0. - if (!this._locked) { - this._totalTime = this._cycle = 0; - } - this._time = 0; - if (prevTime !== 0 || (dur === 0 && prevRawPrevTime !== _tinyNum && (prevRawPrevTime > 0 || (time < 0 && prevRawPrevTime >= 0)) && !this._locked)) { //edge case for checking time < 0 && prevRawPrevTime >= 0: a zero-duration fromTo() tween inside a zero-duration timeline (yeah, very rare) - callback = "onReverseComplete"; - isComplete = this._reversed; - } - if (time < 0) { - this._active = false; - if (dur === 0) if (prevRawPrevTime >= 0 && this._first) { //zero-duration timelines are tricky because we must discern the momentum/direction of time in order to determine whether the starting values should be rendered or the ending values. If the "playhead" of its timeline goes past the zero-duration tween in the forward direction or lands directly on it, the end values should be rendered, but if the timeline's "playhead" moves past it in the backward direction (from a postitive time to a negative time), the starting values must be rendered. - internalForce = true; - } - this._rawPrevTime = time; - } else { - this._rawPrevTime = (dur || !suppressEvents || time || this._rawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration timeline or tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. - time = 0; //to avoid occasional floating point rounding errors (could cause problems especially with zero-duration tweens at the very beginning of the timeline) - if (!this._initted) { - internalForce = true; - } - } - - } else { - if (dur === 0 && prevRawPrevTime < 0) { //without this, zero-duration repeating timelines (like with a simple callback nested at the very beginning and a repeatDelay) wouldn't render the first time through. - internalForce = true; - } - this._time = this._rawPrevTime = time; - if (!this._locked) { - this._totalTime = time; - if (this._repeat !== 0) { - cycleDuration = dur + this._repeatDelay; - this._cycle = (this._totalTime / cycleDuration) >> 0; //originally _totalTime % cycleDuration but floating point errors caused problems, so I normalized it. (4 % 0.8 should be 0 but it gets reported as 0.79999999!) - if (this._cycle !== 0) if (this._cycle === this._totalTime / cycleDuration) { - this._cycle--; //otherwise when rendered exactly at the end time, it will act as though it is repeating (at the beginning) - } - this._time = this._totalTime - (this._cycle * cycleDuration); - if (this._yoyo) if ((this._cycle & 1) !== 0) { - this._time = dur - this._time; - } - if (this._time > dur) { - this._time = dur; - time = dur + 0.0001; //to avoid occasional floating point rounding error - } else if (this._time < 0) { - this._time = time = 0; - } else { - time = this._time; - } - } - } - } - - if (this._cycle !== prevCycle) if (!this._locked) { - /* - make sure children at the end/beginning of the timeline are rendered properly. If, for example, - a 3-second long timeline rendered at 2.9 seconds previously, and now renders at 3.2 seconds (which - would get transated to 2.8 seconds if the timeline yoyos or 0.2 seconds if it just repeats), there - could be a callback or a short tween that's at 2.95 or 3 seconds in which wouldn't render. So - we need to push the timeline to the end (and/or beginning depending on its yoyo value). Also we must - ensure that zero-duration tweens at the very beginning or end of the TimelineMax work. - */ - var backwards = (this._yoyo && (prevCycle & 1) !== 0), - wrap = (backwards === (this._yoyo && (this._cycle & 1) !== 0)), - recTotalTime = this._totalTime, - recCycle = this._cycle, - recRawPrevTime = this._rawPrevTime, - recTime = this._time; - - this._totalTime = prevCycle * dur; - if (this._cycle < prevCycle) { - backwards = !backwards; - } else { - this._totalTime += dur; - } - this._time = prevTime; //temporarily revert _time so that render() renders the children in the correct order. Without this, tweens won't rewind correctly. We could arhictect things in a "cleaner" way by splitting out the rendering queue into a separate method but for performance reasons, we kept it all inside this method. - - this._rawPrevTime = (dur === 0) ? prevRawPrevTime - 0.0001 : prevRawPrevTime; - this._cycle = prevCycle; - this._locked = true; //prevents changes to totalTime and skips repeat/yoyo behavior when we recursively call render() - prevTime = (backwards) ? 0 : dur; - this.render(prevTime, suppressEvents, (dur === 0)); - if (!suppressEvents) if (!this._gc) { - if (this.vars.onRepeat) { - this.vars.onRepeat.apply(this.vars.onRepeatScope || this, this.vars.onRepeatParams || _blankArray); - } - } - if (wrap) { - prevTime = (backwards) ? dur + 0.0001 : -0.0001; - this.render(prevTime, true, false); - } - this._locked = false; - if (this._paused && !prevPaused) { //if the render() triggered callback that paused this timeline, we should abort (very rare, but possible) - return; - } - this._time = recTime; - this._totalTime = recTotalTime; - this._cycle = recCycle; - this._rawPrevTime = recRawPrevTime; - } - - if ((this._time === prevTime || !this._first) && !force && !internalForce) { - if (prevTotalTime !== this._totalTime) if (this._onUpdate) if (!suppressEvents) { //so that onUpdate fires even during the repeatDelay - as long as the totalTime changed, we should trigger onUpdate. - this._onUpdate.apply(this.vars.onUpdateScope || this, this.vars.onUpdateParams || _blankArray); - } - return; - } else if (!this._initted) { - this._initted = true; - } - - if (!this._active) if (!this._paused && this._totalTime !== prevTotalTime && time > 0) { - this._active = true; //so that if the user renders the timeline (as opposed to the parent timeline rendering it), it is forced to re-render and align it with the proper time/frame on the next rendering cycle. Maybe the timeline already finished but the user manually re-renders it as halfway done, for example. - } - - if (prevTotalTime === 0) if (this.vars.onStart) if (this._totalTime !== 0) if (!suppressEvents) { - this.vars.onStart.apply(this.vars.onStartScope || this, this.vars.onStartParams || _blankArray); - } - - if (this._time >= prevTime) { - tween = this._first; - while (tween) { - next = tween._next; //record it here because the value could change after rendering... - if (this._paused && !prevPaused) { //in case a tween pauses the timeline when rendering - break; - } else if (tween._active || (tween._startTime <= this._time && !tween._paused && !tween._gc)) { - if (!tween._reversed) { - tween.render((time - tween._startTime) * tween._timeScale, suppressEvents, force); - } else { - tween.render(((!tween._dirty) ? tween._totalDuration : tween.totalDuration()) - ((time - tween._startTime) * tween._timeScale), suppressEvents, force); - } - - } - tween = next; - } - } else { - tween = this._last; - while (tween) { - next = tween._prev; //record it here because the value could change after rendering... - if (this._paused && !prevPaused) { //in case a tween pauses the timeline when rendering - break; - } else if (tween._active || (tween._startTime <= prevTime && !tween._paused && !tween._gc)) { - if (!tween._reversed) { - tween.render((time - tween._startTime) * tween._timeScale, suppressEvents, force); - } else { - tween.render(((!tween._dirty) ? tween._totalDuration : tween.totalDuration()) - ((time - tween._startTime) * tween._timeScale), suppressEvents, force); - } - } - tween = next; - } - } - - if (this._onUpdate) if (!suppressEvents) { - this._onUpdate.apply(this.vars.onUpdateScope || this, this.vars.onUpdateParams || _blankArray); - } - if (callback) if (!this._locked) if (!this._gc) if (prevStart === this._startTime || prevTimeScale !== this._timeScale) if (this._time === 0 || totalDur >= this.totalDuration()) { //if one of the tweens that was rendered altered this timeline's startTime (like if an onComplete reversed the timeline), it probably isn't complete. If it is, don't worry, because whatever call altered the startTime would complete if it was necessary at the new time. The only exception is the timeScale property. Also check _gc because there's a chance that kill() could be called in an onUpdate - if (isComplete) { - if (this._timeline.autoRemoveChildren) { - this._enabled(false, false); - } - this._active = false; - } - if (!suppressEvents && this.vars[callback]) { - this.vars[callback].apply(this.vars[callback + "Scope"] || this, this.vars[callback + "Params"] || _blankArray); - } - } - }; - - p.getActive = function(nested, tweens, timelines) { - if (nested == null) { - nested = true; - } - if (tweens == null) { - tweens = true; - } - if (timelines == null) { - timelines = false; - } - var a = [], - all = this.getChildren(nested, tweens, timelines), - cnt = 0, - l = all.length, - i, tween; - for (i = 0; i < l; i++) { - tween = all[i]; - if (tween.isActive()) { - a[cnt++] = tween; - } - } - return a; - }; - - - p.getLabelAfter = function(time) { - if (!time) if (time !== 0) { //faster than isNan() - time = this._time; - } - var labels = this.getLabelsArray(), - l = labels.length, - i; - for (i = 0; i < l; i++) { - if (labels[i].time > time) { - return labels[i].name; - } - } - return null; - }; - - p.getLabelBefore = function(time) { - if (time == null) { - time = this._time; - } - var labels = this.getLabelsArray(), - i = labels.length; - while (--i > -1) { - if (labels[i].time < time) { - return labels[i].name; - } - } - return null; - }; - - p.getLabelsArray = function() { - var a = [], - cnt = 0, - p; - for (p in this._labels) { - a[cnt++] = {time:this._labels[p], name:p}; - } - a.sort(function(a,b) { - return a.time - b.time; - }); - return a; - }; - - -//---- GETTERS / SETTERS ------------------------------------------------------------------------------------------------------- - - p.progress = function(value) { - return (!arguments.length) ? this._time / this.duration() : this.totalTime( this.duration() * ((this._yoyo && (this._cycle & 1) !== 0) ? 1 - value : value) + (this._cycle * (this._duration + this._repeatDelay)), false); - }; - - p.totalProgress = function(value) { - return (!arguments.length) ? this._totalTime / this.totalDuration() : this.totalTime( this.totalDuration() * value, false); - }; - - p.totalDuration = function(value) { - if (!arguments.length) { - if (this._dirty) { - TimelineLite.prototype.totalDuration.call(this); //just forces refresh - //Instead of Infinity, we use 999999999999 so that we can accommodate reverses. - this._totalDuration = (this._repeat === -1) ? 999999999999 : this._duration * (this._repeat + 1) + (this._repeatDelay * this._repeat); - } - return this._totalDuration; - } - return (this._repeat === -1) ? this : this.duration( (value - (this._repeat * this._repeatDelay)) / (this._repeat + 1) ); - }; - - p.time = function(value, suppressEvents) { - if (!arguments.length) { - return this._time; - } - if (this._dirty) { - this.totalDuration(); - } - if (value > this._duration) { - value = this._duration; - } - if (this._yoyo && (this._cycle & 1) !== 0) { - value = (this._duration - value) + (this._cycle * (this._duration + this._repeatDelay)); - } else if (this._repeat !== 0) { - value += this._cycle * (this._duration + this._repeatDelay); - } - return this.totalTime(value, suppressEvents); - }; - - p.repeat = function(value) { - if (!arguments.length) { - return this._repeat; - } - this._repeat = value; - return this._uncache(true); - }; - - p.repeatDelay = function(value) { - if (!arguments.length) { - return this._repeatDelay; - } - this._repeatDelay = value; - return this._uncache(true); - }; - - p.yoyo = function(value) { - if (!arguments.length) { - return this._yoyo; - } - this._yoyo = value; - return this; - }; - - p.currentLabel = function(value) { - if (!arguments.length) { - return this.getLabelBefore(this._time + 0.00000001); - } - return this.seek(value, true); - }; - - return TimelineMax; - - }, true); - - - - - - - - - - - - -/* - * ---------------------------------------------------------------- - * BezierPlugin - * ---------------------------------------------------------------- - */ - (function() { - - var _RAD2DEG = 180 / Math.PI, - _r1 = [], - _r2 = [], - _r3 = [], - _corProps = {}, - Segment = function(a, b, c, d) { - this.a = a; - this.b = b; - this.c = c; - this.d = d; - this.da = d - a; - this.ca = c - a; - this.ba = b - a; - }, - _correlate = ",x,y,z,left,top,right,bottom,marginTop,marginLeft,marginRight,marginBottom,paddingLeft,paddingTop,paddingRight,paddingBottom,backgroundPosition,backgroundPosition_y,", - cubicToQuadratic = function(a, b, c, d) { - var q1 = {a:a}, - q2 = {}, - q3 = {}, - q4 = {c:d}, - mab = (a + b) / 2, - mbc = (b + c) / 2, - mcd = (c + d) / 2, - mabc = (mab + mbc) / 2, - mbcd = (mbc + mcd) / 2, - m8 = (mbcd - mabc) / 8; - q1.b = mab + (a - mab) / 4; - q2.b = mabc + m8; - q1.c = q2.a = (q1.b + q2.b) / 2; - q2.c = q3.a = (mabc + mbcd) / 2; - q3.b = mbcd - m8; - q4.b = mcd + (d - mcd) / 4; - q3.c = q4.a = (q3.b + q4.b) / 2; - return [q1, q2, q3, q4]; - }, - _calculateControlPoints = function(a, curviness, quad, basic, correlate) { - var l = a.length - 1, - ii = 0, - cp1 = a[0].a, - i, p1, p2, p3, seg, m1, m2, mm, cp2, qb, r1, r2, tl; - for (i = 0; i < l; i++) { - seg = a[ii]; - p1 = seg.a; - p2 = seg.d; - p3 = a[ii+1].d; - - if (correlate) { - r1 = _r1[i]; - r2 = _r2[i]; - tl = ((r2 + r1) * curviness * 0.25) / (basic ? 0.5 : _r3[i] || 0.5); - m1 = p2 - (p2 - p1) * (basic ? curviness * 0.5 : (r1 !== 0 ? tl / r1 : 0)); - m2 = p2 + (p3 - p2) * (basic ? curviness * 0.5 : (r2 !== 0 ? tl / r2 : 0)); - mm = p2 - (m1 + (((m2 - m1) * ((r1 * 3 / (r1 + r2)) + 0.5) / 4) || 0)); - } else { - m1 = p2 - (p2 - p1) * curviness * 0.5; - m2 = p2 + (p3 - p2) * curviness * 0.5; - mm = p2 - (m1 + m2) / 2; - } - m1 += mm; - m2 += mm; - - seg.c = cp2 = m1; - if (i !== 0) { - seg.b = cp1; - } else { - seg.b = cp1 = seg.a + (seg.c - seg.a) * 0.6; //instead of placing b on a exactly, we move it inline with c so that if the user specifies an ease like Back.easeIn or Elastic.easeIn which goes BEYOND the beginning, it will do so smoothly. - } - - seg.da = p2 - p1; - seg.ca = cp2 - p1; - seg.ba = cp1 - p1; - - if (quad) { - qb = cubicToQuadratic(p1, cp1, cp2, p2); - a.splice(ii, 1, qb[0], qb[1], qb[2], qb[3]); - ii += 4; - } else { - ii++; - } - - cp1 = m2; - } - seg = a[ii]; - seg.b = cp1; - seg.c = cp1 + (seg.d - cp1) * 0.4; //instead of placing c on d exactly, we move it inline with b so that if the user specifies an ease like Back.easeOut or Elastic.easeOut which goes BEYOND the end, it will do so smoothly. - seg.da = seg.d - seg.a; - seg.ca = seg.c - seg.a; - seg.ba = cp1 - seg.a; - if (quad) { - qb = cubicToQuadratic(seg.a, cp1, seg.c, seg.d); - a.splice(ii, 1, qb[0], qb[1], qb[2], qb[3]); - } - }, - _parseAnchors = function(values, p, correlate, prepend) { - var a = [], - l, i, p1, p2, p3, tmp; - if (prepend) { - values = [prepend].concat(values); - i = values.length; - while (--i > -1) { - if (typeof( (tmp = values[i][p]) ) === "string") if (tmp.charAt(1) === "=") { - values[i][p] = prepend[p] + Number(tmp.charAt(0) + tmp.substr(2)); //accommodate relative values. Do it inline instead of breaking it out into a function for speed reasons - } - } - } - l = values.length - 2; - if (l < 0) { - a[0] = new Segment(values[0][p], 0, 0, values[(l < -1) ? 0 : 1][p]); - return a; - } - for (i = 0; i < l; i++) { - p1 = values[i][p]; - p2 = values[i+1][p]; - a[i] = new Segment(p1, 0, 0, p2); - if (correlate) { - p3 = values[i+2][p]; - _r1[i] = (_r1[i] || 0) + (p2 - p1) * (p2 - p1); - _r2[i] = (_r2[i] || 0) + (p3 - p2) * (p3 - p2); - } - } - a[i] = new Segment(values[i][p], 0, 0, values[i+1][p]); - return a; - }, - bezierThrough = function(values, curviness, quadratic, basic, correlate, prepend) { - var obj = {}, - props = [], - first = prepend || values[0], - i, p, a, j, r, l, seamless, last; - correlate = (typeof(correlate) === "string") ? ","+correlate+"," : _correlate; - if (curviness == null) { - curviness = 1; - } - for (p in values[0]) { - props.push(p); - } - //check to see if the last and first values are identical (well, within 0.05). If so, make seamless by appending the second element to the very end of the values array and the 2nd-to-last element to the very beginning (we'll remove those segments later) - if (values.length > 1) { - last = values[values.length - 1]; - seamless = true; - i = props.length; - while (--i > -1) { - p = props[i]; - if (Math.abs(first[p] - last[p]) > 0.05) { //build in a tolerance of +/-0.05 to accommodate rounding errors. For example, if you set an object's position to 4.945, Flash will make it 4.9 - seamless = false; - break; - } - } - if (seamless) { - values = values.concat(); //duplicate the array to avoid contaminating the original which the user may be reusing for other tweens - if (prepend) { - values.unshift(prepend); - } - values.push(values[1]); - prepend = values[values.length - 3]; - } - } - _r1.length = _r2.length = _r3.length = 0; - i = props.length; - while (--i > -1) { - p = props[i]; - _corProps[p] = (correlate.indexOf(","+p+",") !== -1); - obj[p] = _parseAnchors(values, p, _corProps[p], prepend); - } - i = _r1.length; - while (--i > -1) { - _r1[i] = Math.sqrt(_r1[i]); - _r2[i] = Math.sqrt(_r2[i]); - } - if (!basic) { - i = props.length; - while (--i > -1) { - if (_corProps[p]) { - a = obj[props[i]]; - l = a.length - 1; - for (j = 0; j < l; j++) { - r = a[j+1].da / _r2[j] + a[j].da / _r1[j]; - _r3[j] = (_r3[j] || 0) + r * r; - } - } - } - i = _r3.length; - while (--i > -1) { - _r3[i] = Math.sqrt(_r3[i]); - } - } - i = props.length; - j = quadratic ? 4 : 1; - while (--i > -1) { - p = props[i]; - a = obj[p]; - _calculateControlPoints(a, curviness, quadratic, basic, _corProps[p]); //this method requires that _parseAnchors() and _setSegmentRatios() ran first so that _r1, _r2, and _r3 values are populated for all properties - if (seamless) { - a.splice(0, j); - a.splice(a.length - j, j); - } - } - return obj; - }, - _parseBezierData = function(values, type, prepend) { - type = type || "soft"; - var obj = {}, - inc = (type === "cubic") ? 3 : 2, - soft = (type === "soft"), - props = [], - a, b, c, d, cur, i, j, l, p, cnt, tmp; - if (soft && prepend) { - values = [prepend].concat(values); - } - if (values == null || values.length < inc + 1) { throw "invalid Bezier data"; } - for (p in values[0]) { - props.push(p); - } - i = props.length; - while (--i > -1) { - p = props[i]; - obj[p] = cur = []; - cnt = 0; - l = values.length; - for (j = 0; j < l; j++) { - a = (prepend == null) ? values[j][p] : (typeof( (tmp = values[j][p]) ) === "string" && tmp.charAt(1) === "=") ? prepend[p] + Number(tmp.charAt(0) + tmp.substr(2)) : Number(tmp); - if (soft) if (j > 1) if (j < l - 1) { - cur[cnt++] = (a + cur[cnt-2]) / 2; - } - cur[cnt++] = a; - } - l = cnt - inc + 1; - cnt = 0; - for (j = 0; j < l; j += inc) { - a = cur[j]; - b = cur[j+1]; - c = cur[j+2]; - d = (inc === 2) ? 0 : cur[j+3]; - cur[cnt++] = tmp = (inc === 3) ? new Segment(a, b, c, d) : new Segment(a, (2 * b + a) / 3, (2 * b + c) / 3, c); - } - cur.length = cnt; - } - return obj; - }, - _addCubicLengths = function(a, steps, resolution) { - var inc = 1 / resolution, - j = a.length, - d, d1, s, da, ca, ba, p, i, inv, bez, index; - while (--j > -1) { - bez = a[j]; - s = bez.a; - da = bez.d - s; - ca = bez.c - s; - ba = bez.b - s; - d = d1 = 0; - for (i = 1; i <= resolution; i++) { - p = inc * i; - inv = 1 - p; - d = d1 - (d1 = (p * p * da + 3 * inv * (p * ca + inv * ba)) * p); - index = j * resolution + i - 1; - steps[index] = (steps[index] || 0) + d * d; - } - } - }, - _parseLengthData = function(obj, resolution) { - resolution = resolution >> 0 || 6; - var a = [], - lengths = [], - d = 0, - total = 0, - threshold = resolution - 1, - segments = [], - curLS = [], //current length segments array - p, i, l, index; - for (p in obj) { - _addCubicLengths(obj[p], a, resolution); - } - l = a.length; - for (i = 0; i < l; i++) { - d += Math.sqrt(a[i]); - index = i % resolution; - curLS[index] = d; - if (index === threshold) { - total += d; - index = (i / resolution) >> 0; - segments[index] = curLS; - lengths[index] = total; - d = 0; - curLS = []; - } - } - return {length:total, lengths:lengths, segments:segments}; - }, - - - - BezierPlugin = window._gsDefine.plugin({ - propName: "bezier", - priority: -1, - version: "1.3.2", - API: 2, - global:true, - - //gets called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run. - init: function(target, vars, tween) { - this._target = target; - if (vars instanceof Array) { - vars = {values:vars}; - } - this._func = {}; - this._round = {}; - this._props = []; - this._timeRes = (vars.timeResolution == null) ? 6 : parseInt(vars.timeResolution, 10); - var values = vars.values || [], - first = {}, - second = values[0], - autoRotate = vars.autoRotate || tween.vars.orientToBezier, - p, isFunc, i, j, prepend; - - this._autoRotate = autoRotate ? (autoRotate instanceof Array) ? autoRotate : [["x","y","rotation",((autoRotate === true) ? 0 : Number(autoRotate) || 0)]] : null; - for (p in second) { - this._props.push(p); - } - - i = this._props.length; - while (--i > -1) { - p = this._props[i]; - - this._overwriteProps.push(p); - isFunc = this._func[p] = (typeof(target[p]) === "function"); - first[p] = (!isFunc) ? parseFloat(target[p]) : target[ ((p.indexOf("set") || typeof(target["get" + p.substr(3)]) !== "function") ? p : "get" + p.substr(3)) ](); - if (!prepend) if (first[p] !== values[0][p]) { - prepend = first; - } - } - this._beziers = (vars.type !== "cubic" && vars.type !== "quadratic" && vars.type !== "soft") ? bezierThrough(values, isNaN(vars.curviness) ? 1 : vars.curviness, false, (vars.type === "thruBasic"), vars.correlate, prepend) : _parseBezierData(values, vars.type, first); - this._segCount = this._beziers[p].length; - - if (this._timeRes) { - var ld = _parseLengthData(this._beziers, this._timeRes); - this._length = ld.length; - this._lengths = ld.lengths; - this._segments = ld.segments; - this._l1 = this._li = this._s1 = this._si = 0; - this._l2 = this._lengths[0]; - this._curSeg = this._segments[0]; - this._s2 = this._curSeg[0]; - this._prec = 1 / this._curSeg.length; - } - - if ((autoRotate = this._autoRotate)) { - this._initialRotations = []; - if (!(autoRotate[0] instanceof Array)) { - this._autoRotate = autoRotate = [autoRotate]; - } - i = autoRotate.length; - while (--i > -1) { - for (j = 0; j < 3; j++) { - p = autoRotate[i][j]; - this._func[p] = (typeof(target[p]) === "function") ? target[ ((p.indexOf("set") || typeof(target["get" + p.substr(3)]) !== "function") ? p : "get" + p.substr(3)) ] : false; - } - p = autoRotate[i][2]; - this._initialRotations[i] = this._func[p] ? this._func[p].call(this._target) : this._target[p]; - } - } - this._startRatio = tween.vars.runBackwards ? 1 : 0; //we determine the starting ratio when the tween inits which is always 0 unless the tween has runBackwards:true (indicating it's a from() tween) in which case it's 1. - return true; - }, - - //called each time the values should be updated, and the ratio gets passed as the only parameter (typically it's a value between 0 and 1, but it can exceed those when using an ease like Elastic.easeOut or Back.easeOut, etc.) - set: function(v) { - var segments = this._segCount, - func = this._func, - target = this._target, - notStart = (v !== this._startRatio), - curIndex, inv, i, p, b, t, val, l, lengths, curSeg; - if (!this._timeRes) { - curIndex = (v < 0) ? 0 : (v >= 1) ? segments - 1 : (segments * v) >> 0; - t = (v - (curIndex * (1 / segments))) * segments; - } else { - lengths = this._lengths; - curSeg = this._curSeg; - v *= this._length; - i = this._li; - //find the appropriate segment (if the currently cached one isn't correct) - if (v > this._l2 && i < segments - 1) { - l = segments - 1; - while (i < l && (this._l2 = lengths[++i]) <= v) { } - this._l1 = lengths[i-1]; - this._li = i; - this._curSeg = curSeg = this._segments[i]; - this._s2 = curSeg[(this._s1 = this._si = 0)]; - } else if (v < this._l1 && i > 0) { - while (i > 0 && (this._l1 = lengths[--i]) >= v) { } - if (i === 0 && v < this._l1) { - this._l1 = 0; - } else { - i++; - } - this._l2 = lengths[i]; - this._li = i; - this._curSeg = curSeg = this._segments[i]; - this._s1 = curSeg[(this._si = curSeg.length - 1) - 1] || 0; - this._s2 = curSeg[this._si]; - } - curIndex = i; - //now find the appropriate sub-segment (we split it into the number of pieces that was defined by "precision" and measured each one) - v -= this._l1; - i = this._si; - if (v > this._s2 && i < curSeg.length - 1) { - l = curSeg.length - 1; - while (i < l && (this._s2 = curSeg[++i]) <= v) { } - this._s1 = curSeg[i-1]; - this._si = i; - } else if (v < this._s1 && i > 0) { - while (i > 0 && (this._s1 = curSeg[--i]) >= v) { } - if (i === 0 && v < this._s1) { - this._s1 = 0; - } else { - i++; - } - this._s2 = curSeg[i]; - this._si = i; - } - t = (i + (v - this._s1) / (this._s2 - this._s1)) * this._prec; - } - inv = 1 - t; - - i = this._props.length; - while (--i > -1) { - p = this._props[i]; - b = this._beziers[p][curIndex]; - val = (t * t * b.da + 3 * inv * (t * b.ca + inv * b.ba)) * t + b.a; - if (this._round[p]) { - val = Math.round(val); - } - if (func[p]) { - target[p](val); - } else { - target[p] = val; - } - } - - if (this._autoRotate) { - var ar = this._autoRotate, - b2, x1, y1, x2, y2, add, conv; - i = ar.length; - while (--i > -1) { - p = ar[i][2]; - add = ar[i][3] || 0; - conv = (ar[i][4] === true) ? 1 : _RAD2DEG; - b = this._beziers[ar[i][0]]; - b2 = this._beziers[ar[i][1]]; - - if (b && b2) { //in case one of the properties got overwritten. - b = b[curIndex]; - b2 = b2[curIndex]; - - x1 = b.a + (b.b - b.a) * t; - x2 = b.b + (b.c - b.b) * t; - x1 += (x2 - x1) * t; - x2 += ((b.c + (b.d - b.c) * t) - x2) * t; - - y1 = b2.a + (b2.b - b2.a) * t; - y2 = b2.b + (b2.c - b2.b) * t; - y1 += (y2 - y1) * t; - y2 += ((b2.c + (b2.d - b2.c) * t) - y2) * t; - - val = notStart ? Math.atan2(y2 - y1, x2 - x1) * conv + add : this._initialRotations[i]; - - if (func[p]) { - target[p](val); - } else { - target[p] = val; - } - } - } - } - } - }), - p = BezierPlugin.prototype; - - - BezierPlugin.bezierThrough = bezierThrough; - BezierPlugin.cubicToQuadratic = cubicToQuadratic; - BezierPlugin._autoCSS = true; //indicates that this plugin can be inserted into the "css" object using the autoCSS feature of TweenLite - BezierPlugin.quadraticToCubic = function(a, b, c) { - return new Segment(a, (2 * b + a) / 3, (2 * b + c) / 3, c); - }; - - BezierPlugin._cssRegister = function() { - var CSSPlugin = window._gsDefine.globals.CSSPlugin; - if (!CSSPlugin) { - return; - } - var _internals = CSSPlugin._internals, - _parseToProxy = _internals._parseToProxy, - _setPluginRatio = _internals._setPluginRatio, - CSSPropTween = _internals.CSSPropTween; - _internals._registerComplexSpecialProp("bezier", {parser:function(t, e, prop, cssp, pt, plugin) { - if (e instanceof Array) { - e = {values:e}; - } - plugin = new BezierPlugin(); - var values = e.values, - l = values.length - 1, - pluginValues = [], - v = {}, - i, p, data; - if (l < 0) { - return pt; - } - for (i = 0; i <= l; i++) { - data = _parseToProxy(t, values[i], cssp, pt, plugin, (l !== i)); - pluginValues[i] = data.end; - } - for (p in e) { - v[p] = e[p]; //duplicate the vars object because we need to alter some things which would cause problems if the user plans to reuse the same vars object for another tween. - } - v.values = pluginValues; - pt = new CSSPropTween(t, "bezier", 0, 0, data.pt, 2); - pt.data = data; - pt.plugin = plugin; - pt.setRatio = _setPluginRatio; - if (v.autoRotate === 0) { - v.autoRotate = true; - } - if (v.autoRotate && !(v.autoRotate instanceof Array)) { - i = (v.autoRotate === true) ? 0 : Number(v.autoRotate); - v.autoRotate = (data.end.left != null) ? [["left","top","rotation",i,false]] : (data.end.x != null) ? [["x","y","rotation",i,false]] : false; - } - if (v.autoRotate) { - if (!cssp._transform) { - cssp._enableTransforms(false); - } - data.autoRotate = cssp._target._gsTransform; - } - plugin._onInitTween(data.proxy, v, cssp._tween); - return pt; - }}); - }; - - p._roundProps = function(lookup, value) { - var op = this._overwriteProps, - i = op.length; - while (--i > -1) { - if (lookup[op[i]] || lookup.bezier || lookup.bezierThrough) { - this._round[op[i]] = value; - } - } - }; - - p._kill = function(lookup) { - var a = this._props, - p, i; - for (p in this._beziers) { - if (p in lookup) { - delete this._beziers[p]; - delete this._func[p]; - i = a.length; - while (--i > -1) { - if (a[i] === p) { - a.splice(i, 1); - } - } - } - } - return this._super._kill.call(this, lookup); - }; - - }()); - - - - - - - - - - - - - - -/* - * ---------------------------------------------------------------- - * CSSPlugin - * ---------------------------------------------------------------- - */ - window._gsDefine("plugins.CSSPlugin", ["plugins.TweenPlugin","TweenLite"], function(TweenPlugin, TweenLite) { - - /** @constructor **/ - var CSSPlugin = function() { - TweenPlugin.call(this, "css"); - this._overwriteProps.length = 0; - this.setRatio = CSSPlugin.prototype.setRatio; //speed optimization (avoid prototype lookup on this "hot" method) - }, - _hasPriority, //turns true whenever a CSSPropTween instance is created that has a priority other than 0. This helps us discern whether or not we should spend the time organizing the linked list or not after a CSSPlugin's _onInitTween() method is called. - _suffixMap, //we set this in _onInitTween() each time as a way to have a persistent variable we can use in other methods like _parse() without having to pass it around as a parameter and we keep _parse() decoupled from a particular CSSPlugin instance - _cs, //computed style (we store this in a shared variable to conserve memory and make minification tighter - _overwriteProps, //alias to the currently instantiating CSSPlugin's _overwriteProps array. We use this closure in order to avoid having to pass a reference around from method to method and aid in minification. - _specialProps = {}, - p = CSSPlugin.prototype = new TweenPlugin("css"); - - p.constructor = CSSPlugin; - CSSPlugin.version = "1.12.1"; - CSSPlugin.API = 2; - CSSPlugin.defaultTransformPerspective = 0; - CSSPlugin.defaultSkewType = "compensated"; - p = "px"; //we'll reuse the "p" variable to keep file size down - CSSPlugin.suffixMap = {top:p, right:p, bottom:p, left:p, width:p, height:p, fontSize:p, padding:p, margin:p, perspective:p, lineHeight:""}; - - - var _numExp = /(?:\d|\-\d|\.\d|\-\.\d)+/g, - _relNumExp = /(?:\d|\-\d|\.\d|\-\.\d|\+=\d|\-=\d|\+=.\d|\-=\.\d)+/g, - _valuesExp = /(?:\+=|\-=|\-|\b)[\d\-\.]+[a-zA-Z0-9]*(?:%|\b)/gi, //finds all the values that begin with numbers or += or -= and then a number. Includes suffixes. We use this to split complex values apart like "1px 5px 20px rgb(255,102,51)" - _NaNExp = /[^\d\-\.]/g, - _suffixExp = /(?:\d|\-|\+|=|#|\.)*/g, - _opacityExp = /opacity *= *([^)]*)/i, - _opacityValExp = /opacity:([^;]*)/i, - _alphaFilterExp = /alpha\(opacity *=.+?\)/i, - _rgbhslExp = /^(rgb|hsl)/, - _capsExp = /([A-Z])/g, - _camelExp = /-([a-z])/gi, - _urlExp = /(^(?:url\(\"|url\())|(?:(\"\))$|\)$)/gi, //for pulling out urls from url(...) or url("...") strings (some browsers wrap urls in quotes, some don't when reporting things like backgroundImage) - _camelFunc = function(s, g) { return g.toUpperCase(); }, - _horizExp = /(?:Left|Right|Width)/i, - _ieGetMatrixExp = /(M11|M12|M21|M22)=[\d\-\.e]+/gi, - _ieSetMatrixExp = /progid\:DXImageTransform\.Microsoft\.Matrix\(.+?\)/i, - _commasOutsideParenExp = /,(?=[^\)]*(?:\(|$))/gi, //finds any commas that are not within parenthesis - _DEG2RAD = Math.PI / 180, - _RAD2DEG = 180 / Math.PI, - _forcePT = {}, - _doc = document, - _tempDiv = _doc.createElement("div"), - _tempImg = _doc.createElement("img"), - _internals = CSSPlugin._internals = {_specialProps:_specialProps}, //provides a hook to a few internal methods that we need to access from inside other plugins - _agent = navigator.userAgent, - _autoRound, - _reqSafariFix, //we won't apply the Safari transform fix until we actually come across a tween that affects a transform property (to maintain best performance). - - _isSafari, - _isFirefox, //Firefox has a bug that causes 3D transformed elements to randomly disappear unless a repaint is forced after each update on each element. - _isSafariLT6, //Safari (and Android 4 which uses a flavor of Safari) has a bug that prevents changes to "top" and "left" properties from rendering properly if changed on the same frame as a transform UNLESS we set the element's WebkitBackfaceVisibility to hidden (weird, I know). Doing this for Android 3 and earlier seems to actually cause other problems, though (fun!) - _ieVers, - _supportsOpacity = (function() { //we set _isSafari, _ieVers, _isFirefox, and _supportsOpacity all in one function here to reduce file size slightly, especially in the minified version. - var i = _agent.indexOf("Android"), - d = _doc.createElement("div"), a; - - _isSafari = (_agent.indexOf("Safari") !== -1 && _agent.indexOf("Chrome") === -1 && (i === -1 || Number(_agent.substr(i+8, 1)) > 3)); - _isSafariLT6 = (_isSafari && (Number(_agent.substr(_agent.indexOf("Version/")+8, 1)) < 6)); - _isFirefox = (_agent.indexOf("Firefox") !== -1); - - if ((/MSIE ([0-9]{1,}[\.0-9]{0,})/).exec(_agent)) { - _ieVers = parseFloat( RegExp.$1 ); - } - - d.innerHTML = "<a title='' style='top:1px;opacity:.55;'>a</a>"; - a = d.getElementsByTagName("a")[0]; - return a ? /^0.55/.test(a.style.opacity) : false; - }()), - _getIEOpacity = function(v) { - return (_opacityExp.test( ((typeof(v) === "string") ? v : (v.currentStyle ? v.currentStyle.filter : v.style.filter) || "") ) ? ( parseFloat( RegExp.$1 ) / 100 ) : 1); - }, - _log = function(s) {//for logging messages, but in a way that won't throw errors in old versions of IE. - if (window.console) { - //console.log(s); - } - }, - _prefixCSS = "", //the non-camelCase vendor prefix like "-o-", "-moz-", "-ms-", or "-webkit-" - _prefix = "", //camelCase vendor prefix like "O", "ms", "Webkit", or "Moz". - - // @private feed in a camelCase property name like "transform" and it will check to see if it is valid as-is or if it needs a vendor prefix. It returns the corrected camelCase property name (i.e. "WebkitTransform" or "MozTransform" or "transform" or null if no such property is found, like if the browser is IE8 or before, "transform" won't be found at all) - _checkPropPrefix = function(p, e) { - e = e || _tempDiv; - var s = e.style, - a, i; - if (s[p] !== undefined) { - return p; - } - p = p.charAt(0).toUpperCase() + p.substr(1); - a = ["O","Moz","ms","Ms","Webkit"]; - i = 5; - while (--i > -1 && s[a[i]+p] === undefined) { } - if (i >= 0) { - _prefix = (i === 3) ? "ms" : a[i]; - _prefixCSS = "-" + _prefix.toLowerCase() + "-"; - return _prefix + p; - } - return null; - }, - - _getComputedStyle = _doc.defaultView ? _doc.defaultView.getComputedStyle : function() {}, - - /** - * @private Returns the css style for a particular property of an element. For example, to get whatever the current "left" css value for an element with an ID of "myElement", you could do: - * var currentLeft = CSSPlugin.getStyle( document.getElementById("myElement"), "left"); - * - * @param {!Object} t Target element whose style property you want to query - * @param {!string} p Property name (like "left" or "top" or "marginTop", etc.) - * @param {Object=} cs Computed style object. This just provides a way to speed processing if you're going to get several properties on the same element in quick succession - you can reuse the result of the getComputedStyle() call. - * @param {boolean=} calc If true, the value will not be read directly from the element's "style" property (if it exists there), but instead the getComputedStyle() result will be used. This can be useful when you want to ensure that the browser itself is interpreting the value. - * @param {string=} dflt Default value that should be returned in the place of null, "none", "auto" or "auto auto". - * @return {?string} The current property value - */ - _getStyle = CSSPlugin.getStyle = function(t, p, cs, calc, dflt) { - var rv; - if (!_supportsOpacity) if (p === "opacity") { //several versions of IE don't use the standard "opacity" property - they use things like filter:alpha(opacity=50), so we parse that here. - return _getIEOpacity(t); - } - if (!calc && t.style[p]) { - rv = t.style[p]; - } else if ((cs = cs || _getComputedStyle(t))) { - rv = cs[p] || cs.getPropertyValue(p) || cs.getPropertyValue(p.replace(_capsExp, "-$1").toLowerCase()); - } else if (t.currentStyle) { - rv = t.currentStyle[p]; - } - return (dflt != null && (!rv || rv === "none" || rv === "auto" || rv === "auto auto")) ? dflt : rv; - }, - - /** - * @private Pass the target element, the property name, the numeric value, and the suffix (like "%", "em", "px", etc.) and it will spit back the equivalent pixel number. - * @param {!Object} t Target element - * @param {!string} p Property name (like "left", "top", "marginLeft", etc.) - * @param {!number} v Value - * @param {string=} sfx Suffix (like "px" or "%" or "em") - * @param {boolean=} recurse If true, the call is a recursive one. In some browsers (like IE7/8), occasionally the value isn't accurately reported initially, but if we run the function again it will take effect. - * @return {number} value in pixels - */ - _convertToPixels = _internals.convertToPixels = function(t, p, v, sfx, recurse) { - if (sfx === "px" || !sfx) { return v; } - if (sfx === "auto" || !v) { return 0; } - var horiz = _horizExp.test(p), - node = t, - style = _tempDiv.style, - neg = (v < 0), - pix, cache, time; - if (neg) { - v = -v; - } - if (sfx === "%" && p.indexOf("border") !== -1) { - pix = (v / 100) * (horiz ? t.clientWidth : t.clientHeight); - } else { - style.cssText = "border:0 solid red;position:" + _getStyle(t, "position") + ";line-height:0;"; - if (sfx === "%" || !node.appendChild) { - node = t.parentNode || _doc.body; - cache = node._gsCache; - time = TweenLite.ticker.frame; - if (cache && horiz && cache.time === time) { //performance optimization: we record the width of elements along with the ticker frame so that we can quickly get it again on the same tick (seems relatively safe to assume it wouldn't change on the same tick) - return cache.width * v / 100; - } - style[(horiz ? "width" : "height")] = v + sfx; - } else { - style[(horiz ? "borderLeftWidth" : "borderTopWidth")] = v + sfx; - } - node.appendChild(_tempDiv); - pix = parseFloat(_tempDiv[(horiz ? "offsetWidth" : "offsetHeight")]); - node.removeChild(_tempDiv); - if (horiz && sfx === "%" && CSSPlugin.cacheWidths !== false) { - cache = node._gsCache = node._gsCache || {}; - cache.time = time; - cache.width = pix / v * 100; - } - if (pix === 0 && !recurse) { - pix = _convertToPixels(t, p, v, sfx, true); - } - } - return neg ? -pix : pix; - }, - _calculateOffset = _internals.calculateOffset = function(t, p, cs) { //for figuring out "top" or "left" in px when it's "auto". We need to factor in margin with the offsetLeft/offsetTop - if (_getStyle(t, "position", cs) !== "absolute") { return 0; } - var dim = ((p === "left") ? "Left" : "Top"), - v = _getStyle(t, "margin" + dim, cs); - return t["offset" + dim] - (_convertToPixels(t, p, parseFloat(v), v.replace(_suffixExp, "")) || 0); - }, - - // @private returns at object containing ALL of the style properties in camelCase and their associated values. - _getAllStyles = function(t, cs) { - var s = {}, - i, tr; - if ((cs = cs || _getComputedStyle(t, null))) { - if ((i = cs.length)) { - while (--i > -1) { - s[cs[i].replace(_camelExp, _camelFunc)] = cs.getPropertyValue(cs[i]); - } - } else { //Opera behaves differently - cs.length is always 0, so we must do a for...in loop. - for (i in cs) { - s[i] = cs[i]; - } - } - } else if ((cs = t.currentStyle || t.style)) { - for (i in cs) { - if (typeof(i) === "string" && s[i] === undefined) { - s[i.replace(_camelExp, _camelFunc)] = cs[i]; - } - } - } - if (!_supportsOpacity) { - s.opacity = _getIEOpacity(t); - } - tr = _getTransform(t, cs, false); - s.rotation = tr.rotation; - s.skewX = tr.skewX; - s.scaleX = tr.scaleX; - s.scaleY = tr.scaleY; - s.x = tr.x; - s.y = tr.y; - if (_supports3D) { - s.z = tr.z; - s.rotationX = tr.rotationX; - s.rotationY = tr.rotationY; - s.scaleZ = tr.scaleZ; - } - if (s.filters) { - delete s.filters; - } - return s; - }, - - // @private analyzes two style objects (as returned by _getAllStyles()) and only looks for differences between them that contain tweenable values (like a number or color). It returns an object with a "difs" property which refers to an object containing only those isolated properties and values for tweening, and a "firstMPT" property which refers to the first MiniPropTween instance in a linked list that recorded all the starting values of the different properties so that we can revert to them at the end or beginning of the tween - we don't want the cascading to get messed up. The forceLookup parameter is an optional generic object with properties that should be forced into the results - this is necessary for className tweens that are overwriting others because imagine a scenario where a rollover/rollout adds/removes a class and the user swipes the mouse over the target SUPER fast, thus nothing actually changed yet and the subsequent comparison of the properties would indicate they match (especially when px rounding is taken into consideration), thus no tweening is necessary even though it SHOULD tween and remove those properties after the tween (otherwise the inline styles will contaminate things). See the className SpecialProp code for details. - _cssDif = function(t, s1, s2, vars, forceLookup) { - var difs = {}, - style = t.style, - val, p, mpt; - for (p in s2) { - if (p !== "cssText") if (p !== "length") if (isNaN(p)) if (s1[p] !== (val = s2[p]) || (forceLookup && forceLookup[p])) if (p.indexOf("Origin") === -1) if (typeof(val) === "number" || typeof(val) === "string") { - difs[p] = (val === "auto" && (p === "left" || p === "top")) ? _calculateOffset(t, p) : ((val === "" || val === "auto" || val === "none") && typeof(s1[p]) === "string" && s1[p].replace(_NaNExp, "") !== "") ? 0 : val; //if the ending value is defaulting ("" or "auto"), we check the starting value and if it can be parsed into a number (a string which could have a suffix too, like 700px), then we swap in 0 for "" or "auto" so that things actually tween. - if (style[p] !== undefined) { //for className tweens, we must remember which properties already existed inline - the ones that didn't should be removed when the tween isn't in progress because they were only introduced to facilitate the transition between classes. - mpt = new MiniPropTween(style, p, style[p], mpt); - } - } - } - if (vars) { - for (p in vars) { //copy properties (except className) - if (p !== "className") { - difs[p] = vars[p]; - } - } - } - return {difs:difs, firstMPT:mpt}; - }, - _dimensions = {width:["Left","Right"], height:["Top","Bottom"]}, - _margins = ["marginLeft","marginRight","marginTop","marginBottom"], - - /** - * @private Gets the width or height of an element - * @param {!Object} t Target element - * @param {!string} p Property name ("width" or "height") - * @param {Object=} cs Computed style object (if one exists). Just a speed optimization. - * @return {number} Dimension (in pixels) - */ - _getDimension = function(t, p, cs) { - var v = parseFloat((p === "width") ? t.offsetWidth : t.offsetHeight), - a = _dimensions[p], - i = a.length; - cs = cs || _getComputedStyle(t, null); - while (--i > -1) { - v -= parseFloat( _getStyle(t, "padding" + a[i], cs, true) ) || 0; - v -= parseFloat( _getStyle(t, "border" + a[i] + "Width", cs, true) ) || 0; - } - return v; - }, - - // @private Parses position-related complex strings like "top left" or "50px 10px" or "70% 20%", etc. which are used for things like transformOrigin or backgroundPosition. Optionally decorates a supplied object (recObj) with the following properties: "ox" (offsetX), "oy" (offsetY), "oxp" (if true, "ox" is a percentage not a pixel value), and "oxy" (if true, "oy" is a percentage not a pixel value) - _parsePosition = function(v, recObj) { - if (v == null || v === "" || v === "auto" || v === "auto auto") { //note: Firefox uses "auto auto" as default whereas Chrome uses "auto". - v = "0 0"; - } - var a = v.split(" "), - x = (v.indexOf("left") !== -1) ? "0%" : (v.indexOf("right") !== -1) ? "100%" : a[0], - y = (v.indexOf("top") !== -1) ? "0%" : (v.indexOf("bottom") !== -1) ? "100%" : a[1]; - if (y == null) { - y = "0"; - } else if (y === "center") { - y = "50%"; - } - if (x === "center" || (isNaN(parseFloat(x)) && (x + "").indexOf("=") === -1)) { //remember, the user could flip-flop the values and say "bottom center" or "center bottom", etc. "center" is ambiguous because it could be used to describe horizontal or vertical, hence the isNaN(). If there's an "=" sign in the value, it's relative. - x = "50%"; - } - if (recObj) { - recObj.oxp = (x.indexOf("%") !== -1); - recObj.oyp = (y.indexOf("%") !== -1); - recObj.oxr = (x.charAt(1) === "="); - recObj.oyr = (y.charAt(1) === "="); - recObj.ox = parseFloat(x.replace(_NaNExp, "")); - recObj.oy = parseFloat(y.replace(_NaNExp, "")); - } - return x + " " + y + ((a.length > 2) ? " " + a[2] : ""); - }, - - /** - * @private Takes an ending value (typically a string, but can be a number) and a starting value and returns the change between the two, looking for relative value indicators like += and -= and it also ignores suffixes (but make sure the ending value starts with a number or +=/-= and that the starting value is a NUMBER!) - * @param {(number|string)} e End value which is typically a string, but could be a number - * @param {(number|string)} b Beginning value which is typically a string but could be a number - * @return {number} Amount of change between the beginning and ending values (relative values that have a "+=" or "-=" are recognized) - */ - _parseChange = function(e, b) { - return (typeof(e) === "string" && e.charAt(1) === "=") ? parseInt(e.charAt(0) + "1", 10) * parseFloat(e.substr(2)) : parseFloat(e) - parseFloat(b); - }, - - /** - * @private Takes a value and a default number, checks if the value is relative, null, or numeric and spits back a normalized number accordingly. Primarily used in the _parseTransform() function. - * @param {Object} v Value to be parsed - * @param {!number} d Default value (which is also used for relative calculations if "+=" or "-=" is found in the first parameter) - * @return {number} Parsed value - */ - _parseVal = function(v, d) { - return (v == null) ? d : (typeof(v) === "string" && v.charAt(1) === "=") ? parseInt(v.charAt(0) + "1", 10) * Number(v.substr(2)) + d : parseFloat(v); - }, - - /** - * @private Translates strings like "40deg" or "40" or 40rad" or "+=40deg" or "270_short" or "-90_cw" or "+=45_ccw" to a numeric radian angle. Of course a starting/default value must be fed in too so that relative values can be calculated properly. - * @param {Object} v Value to be parsed - * @param {!number} d Default value (which is also used for relative calculations if "+=" or "-=" is found in the first parameter) - * @param {string=} p property name for directionalEnd (optional - only used when the parsed value is directional ("_short", "_cw", or "_ccw" suffix). We need a way to store the uncompensated value so that at the end of the tween, we set it to exactly what was requested with no directional compensation). Property name would be "rotation", "rotationX", or "rotationY" - * @param {Object=} directionalEnd An object that will store the raw end values for directional angles ("_short", "_cw", or "_ccw" suffix). We need a way to store the uncompensated value so that at the end of the tween, we set it to exactly what was requested with no directional compensation. - * @return {number} parsed angle in radians - */ - _parseAngle = function(v, d, p, directionalEnd) { - var min = 0.000001, - cap, split, dif, result; - if (v == null) { - result = d; - } else if (typeof(v) === "number") { - result = v; - } else { - cap = 360; - split = v.split("_"); - dif = Number(split[0].replace(_NaNExp, "")) * ((v.indexOf("rad") === -1) ? 1 : _RAD2DEG) - ((v.charAt(1) === "=") ? 0 : d); - if (split.length) { - if (directionalEnd) { - directionalEnd[p] = d + dif; - } - if (v.indexOf("short") !== -1) { - dif = dif % cap; - if (dif !== dif % (cap / 2)) { - dif = (dif < 0) ? dif + cap : dif - cap; - } - } - if (v.indexOf("_cw") !== -1 && dif < 0) { - dif = ((dif + cap * 9999999999) % cap) - ((dif / cap) | 0) * cap; - } else if (v.indexOf("ccw") !== -1 && dif > 0) { - dif = ((dif - cap * 9999999999) % cap) - ((dif / cap) | 0) * cap; - } - } - result = d + dif; - } - if (result < min && result > -min) { - result = 0; - } - return result; - }, - - _colorLookup = {aqua:[0,255,255], - lime:[0,255,0], - silver:[192,192,192], - black:[0,0,0], - maroon:[128,0,0], - teal:[0,128,128], - blue:[0,0,255], - navy:[0,0,128], - white:[255,255,255], - fuchsia:[255,0,255], - olive:[128,128,0], - yellow:[255,255,0], - orange:[255,165,0], - gray:[128,128,128], - purple:[128,0,128], - green:[0,128,0], - red:[255,0,0], - pink:[255,192,203], - cyan:[0,255,255], - transparent:[255,255,255,0]}, - - _hue = function(h, m1, m2) { - h = (h < 0) ? h + 1 : (h > 1) ? h - 1 : h; - return ((((h * 6 < 1) ? m1 + (m2 - m1) * h * 6 : (h < 0.5) ? m2 : (h * 3 < 2) ? m1 + (m2 - m1) * (2 / 3 - h) * 6 : m1) * 255) + 0.5) | 0; - }, - - /** - * @private Parses a color (like #9F0, #FF9900, or rgb(255,51,153)) into an array with 3 elements for red, green, and blue. Also handles rgba() values (splits into array of 4 elements of course) - * @param {(string|number)} v The value the should be parsed which could be a string like #9F0 or rgb(255,102,51) or rgba(255,0,0,0.5) or it could be a number like 0xFF00CC or even a named color like red, blue, purple, etc. - * @return {Array.<number>} An array containing red, green, and blue (and optionally alpha) in that order. - */ - _parseColor = function(v) { - var c1, c2, c3, h, s, l; - if (!v || v === "") { - return _colorLookup.black; - } - if (typeof(v) === "number") { - return [v >> 16, (v >> 8) & 255, v & 255]; - } - if (v.charAt(v.length - 1) === ",") { //sometimes a trailing commma is included and we should chop it off (typically from a comma-delimited list of values like a textShadow:"2px 2px 2px blue, 5px 5px 5px rgb(255,0,0)" - in this example "blue," has a trailing comma. We could strip it out inside parseComplex() but we'd need to do it to the beginning and ending values plus it wouldn't provide protection from other potential scenarios like if the user passes in a similar value. - v = v.substr(0, v.length - 1); - } - if (_colorLookup[v]) { - return _colorLookup[v]; - } - if (v.charAt(0) === "#") { - if (v.length === 4) { //for shorthand like #9F0 - c1 = v.charAt(1), - c2 = v.charAt(2), - c3 = v.charAt(3); - v = "#" + c1 + c1 + c2 + c2 + c3 + c3; - } - v = parseInt(v.substr(1), 16); - return [v >> 16, (v >> 8) & 255, v & 255]; - } - if (v.substr(0, 3) === "hsl") { - v = v.match(_numExp); - h = (Number(v[0]) % 360) / 360; - s = Number(v[1]) / 100; - l = Number(v[2]) / 100; - c2 = (l <= 0.5) ? l * (s + 1) : l + s - l * s; - c1 = l * 2 - c2; - if (v.length > 3) { - v[3] = Number(v[3]); - } - v[0] = _hue(h + 1 / 3, c1, c2); - v[1] = _hue(h, c1, c2); - v[2] = _hue(h - 1 / 3, c1, c2); - return v; - } - v = v.match(_numExp) || _colorLookup.transparent; - v[0] = Number(v[0]); - v[1] = Number(v[1]); - v[2] = Number(v[2]); - if (v.length > 3) { - v[3] = Number(v[3]); - } - return v; - }, - _colorExp = "(?:\\b(?:(?:rgb|rgba|hsl|hsla)\\(.+?\\))|\\B#.+?\\b"; //we'll dynamically build this Regular Expression to conserve file size. After building it, it will be able to find rgb(), rgba(), # (hexadecimal), and named color values like red, blue, purple, etc. - - for (p in _colorLookup) { - _colorExp += "|" + p + "\\b"; - } - _colorExp = new RegExp(_colorExp+")", "gi"); - - /** - * @private Returns a formatter function that handles taking a string (or number in some cases) and returning a consistently formatted one in terms of delimiters, quantity of values, etc. For example, we may get boxShadow values defined as "0px red" or "0px 0px 10px rgb(255,0,0)" or "0px 0px 20px 20px #F00" and we need to ensure that what we get back is described with 4 numbers and a color. This allows us to feed it into the _parseComplex() method and split the values up appropriately. The neat thing about this _getFormatter() function is that the dflt defines a pattern as well as a default, so for example, _getFormatter("0px 0px 0px 0px #777", true) not only sets the default as 0px for all distances and #777 for the color, but also sets the pattern such that 4 numbers and a color will always get returned. - * @param {!string} dflt The default value and pattern to follow. So "0px 0px 0px 0px #777" will ensure that 4 numbers and a color will always get returned. - * @param {boolean=} clr If true, the values should be searched for color-related data. For example, boxShadow values typically contain a color whereas borderRadius don't. - * @param {boolean=} collapsible If true, the value is a top/left/right/bottom style one that acts like margin or padding, where if only one value is received, it's used for all 4; if 2 are received, the first is duplicated for 3rd (bottom) and the 2nd is duplicated for the 4th spot (left), etc. - * @return {Function} formatter function - */ - var _getFormatter = function(dflt, clr, collapsible, multi) { - if (dflt == null) { - return function(v) {return v;}; - } - var dColor = clr ? (dflt.match(_colorExp) || [""])[0] : "", - dVals = dflt.split(dColor).join("").match(_valuesExp) || [], - pfx = dflt.substr(0, dflt.indexOf(dVals[0])), - sfx = (dflt.charAt(dflt.length - 1) === ")") ? ")" : "", - delim = (dflt.indexOf(" ") !== -1) ? " " : ",", - numVals = dVals.length, - dSfx = (numVals > 0) ? dVals[0].replace(_numExp, "") : "", - formatter; - if (!numVals) { - return function(v) {return v;}; - } - if (clr) { - formatter = function(v) { - var color, vals, i, a; - if (typeof(v) === "number") { - v += dSfx; - } else if (multi && _commasOutsideParenExp.test(v)) { - a = v.replace(_commasOutsideParenExp, "|").split("|"); - for (i = 0; i < a.length; i++) { - a[i] = formatter(a[i]); - } - return a.join(","); - } - color = (v.match(_colorExp) || [dColor])[0]; - vals = v.split(color).join("").match(_valuesExp) || []; - i = vals.length; - if (numVals > i--) { - while (++i < numVals) { - vals[i] = collapsible ? vals[(((i - 1) / 2) | 0)] : dVals[i]; - } - } - return pfx + vals.join(delim) + delim + color + sfx + (v.indexOf("inset") !== -1 ? " inset" : ""); - }; - return formatter; - - } - formatter = function(v) { - var vals, a, i; - if (typeof(v) === "number") { - v += dSfx; - } else if (multi && _commasOutsideParenExp.test(v)) { - a = v.replace(_commasOutsideParenExp, "|").split("|"); - for (i = 0; i < a.length; i++) { - a[i] = formatter(a[i]); - } - return a.join(","); - } - vals = v.match(_valuesExp) || []; - i = vals.length; - if (numVals > i--) { - while (++i < numVals) { - vals[i] = collapsible ? vals[(((i - 1) / 2) | 0)] : dVals[i]; - } - } - return pfx + vals.join(delim) + sfx; - }; - return formatter; - }, - - /** - * @private returns a formatter function that's used for edge-related values like marginTop, marginLeft, paddingBottom, paddingRight, etc. Just pass a comma-delimited list of property names related to the edges. - * @param {!string} props a comma-delimited list of property names in order from top to left, like "marginTop,marginRight,marginBottom,marginLeft" - * @return {Function} a formatter function - */ - _getEdgeParser = function(props) { - props = props.split(","); - return function(t, e, p, cssp, pt, plugin, vars) { - var a = (e + "").split(" "), - i; - vars = {}; - for (i = 0; i < 4; i++) { - vars[props[i]] = a[i] = a[i] || a[(((i - 1) / 2) >> 0)]; - } - return cssp.parse(t, vars, pt, plugin); - }; - }, - - // @private used when other plugins must tween values first, like BezierPlugin or ThrowPropsPlugin, etc. That plugin's setRatio() gets called first so that the values are updated, and then we loop through the MiniPropTweens which handle copying the values into their appropriate slots so that they can then be applied correctly in the main CSSPlugin setRatio() method. Remember, we typically create a proxy object that has a bunch of uniquely-named properties that we feed to the sub-plugin and it does its magic normally, and then we must interpret those values and apply them to the css because often numbers must get combined/concatenated, suffixes added, etc. to work with css, like boxShadow could have 4 values plus a color. - _setPluginRatio = _internals._setPluginRatio = function(v) { - this.plugin.setRatio(v); - var d = this.data, - proxy = d.proxy, - mpt = d.firstMPT, - min = 0.000001, - val, pt, i, str; - while (mpt) { - val = proxy[mpt.v]; - if (mpt.r) { - val = Math.round(val); - } else if (val < min && val > -min) { - val = 0; - } - mpt.t[mpt.p] = val; - mpt = mpt._next; - } - if (d.autoRotate) { - d.autoRotate.rotation = proxy.rotation; - } - //at the end, we must set the CSSPropTween's "e" (end) value dynamically here because that's what is used in the final setRatio() method. - if (v === 1) { - mpt = d.firstMPT; - while (mpt) { - pt = mpt.t; - if (!pt.type) { - pt.e = pt.s + pt.xs0; - } else if (pt.type === 1) { - str = pt.xs0 + pt.s + pt.xs1; - for (i = 1; i < pt.l; i++) { - str += pt["xn"+i] + pt["xs"+(i+1)]; - } - pt.e = str; - } - mpt = mpt._next; - } - } - }, - - /** - * @private @constructor Used by a few SpecialProps to hold important values for proxies. For example, _parseToProxy() creates a MiniPropTween instance for each property that must get tweened on the proxy, and we record the original property name as well as the unique one we create for the proxy, plus whether or not the value needs to be rounded plus the original value. - * @param {!Object} t target object whose property we're tweening (often a CSSPropTween) - * @param {!string} p property name - * @param {(number|string|object)} v value - * @param {MiniPropTween=} next next MiniPropTween in the linked list - * @param {boolean=} r if true, the tweened value should be rounded to the nearest integer - */ - MiniPropTween = function(t, p, v, next, r) { - this.t = t; - this.p = p; - this.v = v; - this.r = r; - if (next) { - next._prev = this; - this._next = next; - } - }, - - /** - * @private Most other plugins (like BezierPlugin and ThrowPropsPlugin and others) can only tween numeric values, but CSSPlugin must accommodate special values that have a bunch of extra data (like a suffix or strings between numeric values, etc.). For example, boxShadow has values like "10px 10px 20px 30px rgb(255,0,0)" which would utterly confuse other plugins. This method allows us to split that data apart and grab only the numeric data and attach it to uniquely-named properties of a generic proxy object ({}) so that we can feed that to virtually any plugin to have the numbers tweened. However, we must also keep track of which properties from the proxy go with which CSSPropTween values and instances. So we create a linked list of MiniPropTweens. Each one records a target (the original CSSPropTween), property (like "s" or "xn1" or "xn2") that we're tweening and the unique property name that was used for the proxy (like "boxShadow_xn1" and "boxShadow_xn2") and whether or not they need to be rounded. That way, in the _setPluginRatio() method we can simply copy the values over from the proxy to the CSSPropTween instance(s). Then, when the main CSSPlugin setRatio() method runs and applies the CSSPropTween values accordingly, they're updated nicely. So the external plugin tweens the numbers, _setPluginRatio() copies them over, and setRatio() acts normally, applying css-specific values to the element. - * This method returns an object that has the following properties: - * - proxy: a generic object containing the starting values for all the properties that will be tweened by the external plugin. This is what we feed to the external _onInitTween() as the target - * - end: a generic object containing the ending values for all the properties that will be tweened by the external plugin. This is what we feed to the external plugin's _onInitTween() as the destination values - * - firstMPT: the first MiniPropTween in the linked list - * - pt: the first CSSPropTween in the linked list that was created when parsing. If shallow is true, this linked list will NOT attach to the one passed into the _parseToProxy() as the "pt" (4th) parameter. - * @param {!Object} t target object to be tweened - * @param {!(Object|string)} vars the object containing the information about the tweening values (typically the end/destination values) that should be parsed - * @param {!CSSPlugin} cssp The CSSPlugin instance - * @param {CSSPropTween=} pt the next CSSPropTween in the linked list - * @param {TweenPlugin=} plugin the external TweenPlugin instance that will be handling tweening the numeric values - * @param {boolean=} shallow if true, the resulting linked list from the parse will NOT be attached to the CSSPropTween that was passed in as the "pt" (4th) parameter. - * @return An object containing the following properties: proxy, end, firstMPT, and pt (see above for descriptions) - */ - _parseToProxy = _internals._parseToProxy = function(t, vars, cssp, pt, plugin, shallow) { - var bpt = pt, - start = {}, - end = {}, - transform = cssp._transform, - oldForce = _forcePT, - i, p, xp, mpt, firstPT; - cssp._transform = null; - _forcePT = vars; - pt = firstPT = cssp.parse(t, vars, pt, plugin); - _forcePT = oldForce; - //break off from the linked list so the new ones are isolated. - if (shallow) { - cssp._transform = transform; - if (bpt) { - bpt._prev = null; - if (bpt._prev) { - bpt._prev._next = null; - } - } - } - while (pt && pt !== bpt) { - if (pt.type <= 1) { - p = pt.p; - end[p] = pt.s + pt.c; - start[p] = pt.s; - if (!shallow) { - mpt = new MiniPropTween(pt, "s", p, mpt, pt.r); - pt.c = 0; - } - if (pt.type === 1) { - i = pt.l; - while (--i > 0) { - xp = "xn" + i; - p = pt.p + "_" + xp; - end[p] = pt.data[xp]; - start[p] = pt[xp]; - if (!shallow) { - mpt = new MiniPropTween(pt, xp, p, mpt, pt.rxp[xp]); - } - } - } - } - pt = pt._next; - } - return {proxy:start, end:end, firstMPT:mpt, pt:firstPT}; - }, - - - - /** - * @constructor Each property that is tweened has at least one CSSPropTween associated with it. These instances store important information like the target, property, starting value, amount of change, etc. They can also optionally have a number of "extra" strings and numeric values named xs1, xn1, xs2, xn2, xs3, xn3, etc. where "s" indicates string and "n" indicates number. These can be pieced together in a complex-value tween (type:1) that has alternating types of data like a string, number, string, number, etc. For example, boxShadow could be "5px 5px 8px rgb(102, 102, 51)". In that value, there are 6 numbers that may need to tween and then pieced back together into a string again with spaces, suffixes, etc. xs0 is special in that it stores the suffix for standard (type:0) tweens, -OR- the first string (prefix) in a complex-value (type:1) CSSPropTween -OR- it can be the non-tweening value in a type:-1 CSSPropTween. We do this to conserve memory. - * CSSPropTweens have the following optional properties as well (not defined through the constructor): - * - l: Length in terms of the number of extra properties that the CSSPropTween has (default: 0). For example, for a boxShadow we may need to tween 5 numbers in which case l would be 5; Keep in mind that the start/end values for the first number that's tweened are always stored in the s and c properties to conserve memory. All additional values thereafter are stored in xn1, xn2, etc. - * - xfirst: The first instance of any sub-CSSPropTweens that are tweening properties of this instance. For example, we may split up a boxShadow tween so that there's a main CSSPropTween of type:1 that has various xs* and xn* values associated with the h-shadow, v-shadow, blur, color, etc. Then we spawn a CSSPropTween for each of those that has a higher priority and runs BEFORE the main CSSPropTween so that the values are all set by the time it needs to re-assemble them. The xfirst gives us an easy way to identify the first one in that chain which typically ends at the main one (because they're all prepende to the linked list) - * - plugin: The TweenPlugin instance that will handle the tweening of any complex values. For example, sometimes we don't want to use normal subtweens (like xfirst refers to) to tween the values - we might want ThrowPropsPlugin or BezierPlugin some other plugin to do the actual tweening, so we create a plugin instance and store a reference here. We need this reference so that if we get a request to round values or disable a tween, we can pass along that request. - * - data: Arbitrary data that needs to be stored with the CSSPropTween. Typically if we're going to have a plugin handle the tweening of a complex-value tween, we create a generic object that stores the END values that we're tweening to and the CSSPropTween's xs1, xs2, etc. have the starting values. We store that object as data. That way, we can simply pass that object to the plugin and use the CSSPropTween as the target. - * - setRatio: Only used for type:2 tweens that require custom functionality. In this case, we call the CSSPropTween's setRatio() method and pass the ratio each time the tween updates. This isn't quite as efficient as doing things directly in the CSSPlugin's setRatio() method, but it's very convenient and flexible. - * @param {!Object} t Target object whose property will be tweened. Often a DOM element, but not always. It could be anything. - * @param {string} p Property to tween (name). For example, to tween element.width, p would be "width". - * @param {number} s Starting numeric value - * @param {number} c Change in numeric value over the course of the entire tween. For example, if element.width starts at 5 and should end at 100, c would be 95. - * @param {CSSPropTween=} next The next CSSPropTween in the linked list. If one is defined, we will define its _prev as the new instance, and the new instance's _next will be pointed at it. - * @param {number=} type The type of CSSPropTween where -1 = a non-tweening value, 0 = a standard simple tween, 1 = a complex value (like one that has multiple numbers in a comma- or space-delimited string like border:"1px solid red"), and 2 = one that uses a custom setRatio function that does all of the work of applying the values on each update. - * @param {string=} n Name of the property that should be used for overwriting purposes which is typically the same as p but not always. For example, we may need to create a subtween for the 2nd part of a "clip:rect(...)" tween in which case "p" might be xs1 but "n" is still "clip" - * @param {boolean=} r If true, the value(s) should be rounded - * @param {number=} pr Priority in the linked list order. Higher priority CSSPropTweens will be updated before lower priority ones. The default priority is 0. - * @param {string=} b Beginning value. We store this to ensure that it is EXACTLY what it was when the tween began without any risk of interpretation issues. - * @param {string=} e Ending value. We store this to ensure that it is EXACTLY what the user defined at the end of the tween without any risk of interpretation issues. - */ - CSSPropTween = _internals.CSSPropTween = function(t, p, s, c, next, type, n, r, pr, b, e) { - this.t = t; //target - this.p = p; //property - this.s = s; //starting value - this.c = c; //change value - this.n = n || p; //name that this CSSPropTween should be associated to (usually the same as p, but not always - n is what overwriting looks at) - if (!(t instanceof CSSPropTween)) { - _overwriteProps.push(this.n); - } - this.r = r; //round (boolean) - this.type = type || 0; //0 = normal tween, -1 = non-tweening (in which case xs0 will be applied to the target's property, like tp.t[tp.p] = tp.xs0), 1 = complex-value SpecialProp, 2 = custom setRatio() that does all the work - if (pr) { - this.pr = pr; - _hasPriority = true; - } - this.b = (b === undefined) ? s : b; - this.e = (e === undefined) ? s + c : e; - if (next) { - this._next = next; - next._prev = this; - } - }, - - /** - * Takes a target, the beginning value and ending value (as strings) and parses them into a CSSPropTween (possibly with child CSSPropTweens) that accommodates multiple numbers, colors, comma-delimited values, etc. For example: - * sp.parseComplex(element, "boxShadow", "5px 10px 20px rgb(255,102,51)", "0px 0px 0px red", true, "0px 0px 0px rgb(0,0,0,0)", pt); - * It will walk through the beginning and ending values (which should be in the same format with the same number and type of values) and figure out which parts are numbers, what strings separate the numeric/tweenable values, and then create the CSSPropTweens accordingly. If a plugin is defined, no child CSSPropTweens will be created. Instead, the ending values will be stored in the "data" property of the returned CSSPropTween like: {s:-5, xn1:-10, xn2:-20, xn3:255, xn4:0, xn5:0} so that it can be fed to any other plugin and it'll be plain numeric tweens but the recomposition of the complex value will be handled inside CSSPlugin's setRatio(). - * If a setRatio is defined, the type of the CSSPropTween will be set to 2 and recomposition of the values will be the responsibility of that method. - * - * @param {!Object} t Target whose property will be tweened - * @param {!string} p Property that will be tweened (its name, like "left" or "backgroundColor" or "boxShadow") - * @param {string} b Beginning value - * @param {string} e Ending value - * @param {boolean} clrs If true, the value could contain a color value like "rgb(255,0,0)" or "#F00" or "red". The default is false, so no colors will be recognized (a performance optimization) - * @param {(string|number|Object)} dflt The default beginning value that should be used if no valid beginning value is defined or if the number of values inside the complex beginning and ending values don't match - * @param {?CSSPropTween} pt CSSPropTween instance that is the current head of the linked list (we'll prepend to this). - * @param {number=} pr Priority in the linked list order. Higher priority properties will be updated before lower priority ones. The default priority is 0. - * @param {TweenPlugin=} plugin If a plugin should handle the tweening of extra properties, pass the plugin instance here. If one is defined, then NO subtweens will be created for any extra properties (the properties will be created - just not additional CSSPropTween instances to tween them) because the plugin is expected to do so. However, the end values WILL be populated in the "data" property, like {s:100, xn1:50, xn2:300} - * @param {function(number)=} setRatio If values should be set in a custom function instead of being pieced together in a type:1 (complex-value) CSSPropTween, define that custom function here. - * @return {CSSPropTween} The first CSSPropTween in the linked list which includes the new one(s) added by the parseComplex() call. - */ - _parseComplex = CSSPlugin.parseComplex = function(t, p, b, e, clrs, dflt, pt, pr, plugin, setRatio) { - //DEBUG: _log("parseComplex: "+p+", b: "+b+", e: "+e); - b = b || dflt || ""; - pt = new CSSPropTween(t, p, 0, 0, pt, (setRatio ? 2 : 1), null, false, pr, b, e); - e += ""; //ensures it's a string - var ba = b.split(", ").join(",").split(" "), //beginning array - ea = e.split(", ").join(",").split(" "), //ending array - l = ba.length, - autoRound = (_autoRound !== false), - i, xi, ni, bv, ev, bnums, enums, bn, rgba, temp, cv, str; - if (e.indexOf(",") !== -1 || b.indexOf(",") !== -1) { - ba = ba.join(" ").replace(_commasOutsideParenExp, ", ").split(" "); - ea = ea.join(" ").replace(_commasOutsideParenExp, ", ").split(" "); - l = ba.length; - } - if (l !== ea.length) { - //DEBUG: _log("mismatched formatting detected on " + p + " (" + b + " vs " + e + ")"); - ba = (dflt || "").split(" "); - l = ba.length; - } - pt.plugin = plugin; - pt.setRatio = setRatio; - for (i = 0; i < l; i++) { - bv = ba[i]; - ev = ea[i]; - bn = parseFloat(bv); - - //if the value begins with a number (most common). It's fine if it has a suffix like px - if (bn || bn === 0) { - pt.appendXtra("", bn, _parseChange(ev, bn), ev.replace(_relNumExp, ""), (autoRound && ev.indexOf("px") !== -1), true); - - //if the value is a color - } else if (clrs && (bv.charAt(0) === "#" || _colorLookup[bv] || _rgbhslExp.test(bv))) { - str = ev.charAt(ev.length - 1) === "," ? ")," : ")"; //if there's a comma at the end, retain it. - bv = _parseColor(bv); - ev = _parseColor(ev); - rgba = (bv.length + ev.length > 6); - if (rgba && !_supportsOpacity && ev[3] === 0) { //older versions of IE don't support rgba(), so if the destination alpha is 0, just use "transparent" for the end color - pt["xs" + pt.l] += pt.l ? " transparent" : "transparent"; - pt.e = pt.e.split(ea[i]).join("transparent"); - } else { - if (!_supportsOpacity) { //old versions of IE don't support rgba(). - rgba = false; - } - pt.appendXtra((rgba ? "rgba(" : "rgb("), bv[0], ev[0] - bv[0], ",", true, true) - .appendXtra("", bv[1], ev[1] - bv[1], ",", true) - .appendXtra("", bv[2], ev[2] - bv[2], (rgba ? "," : str), true); - if (rgba) { - bv = (bv.length < 4) ? 1 : bv[3]; - pt.appendXtra("", bv, ((ev.length < 4) ? 1 : ev[3]) - bv, str, false); - } - } - - } else { - bnums = bv.match(_numExp); //gets each group of numbers in the beginning value string and drops them into an array - - //if no number is found, treat it as a non-tweening value and just append the string to the current xs. - if (!bnums) { - pt["xs" + pt.l] += pt.l ? " " + bv : bv; - - //loop through all the numbers that are found and construct the extra values on the pt. - } else { - enums = ev.match(_relNumExp); //get each group of numbers in the end value string and drop them into an array. We allow relative values too, like +=50 or -=.5 - if (!enums || enums.length !== bnums.length) { - //DEBUG: _log("mismatched formatting detected on " + p + " (" + b + " vs " + e + ")"); - return pt; - } - ni = 0; - for (xi = 0; xi < bnums.length; xi++) { - cv = bnums[xi]; - temp = bv.indexOf(cv, ni); - pt.appendXtra(bv.substr(ni, temp - ni), Number(cv), _parseChange(enums[xi], cv), "", (autoRound && bv.substr(temp + cv.length, 2) === "px"), (xi === 0)); - ni = temp + cv.length; - } - pt["xs" + pt.l] += bv.substr(ni); - } - } - } - //if there are relative values ("+=" or "-=" prefix), we need to adjust the ending value to eliminate the prefixes and combine the values properly. - if (e.indexOf("=") !== -1) if (pt.data) { - str = pt.xs0 + pt.data.s; - for (i = 1; i < pt.l; i++) { - str += pt["xs" + i] + pt.data["xn" + i]; - } - pt.e = str + pt["xs" + i]; - } - if (!pt.l) { - pt.type = -1; - pt.xs0 = pt.e; - } - return pt.xfirst || pt; - }, - i = 9; - - - p = CSSPropTween.prototype; - p.l = p.pr = 0; //length (number of extra properties like xn1, xn2, xn3, etc. - while (--i > 0) { - p["xn" + i] = 0; - p["xs" + i] = ""; - } - p.xs0 = ""; - p._next = p._prev = p.xfirst = p.data = p.plugin = p.setRatio = p.rxp = null; - - - /** - * Appends and extra tweening value to a CSSPropTween and automatically manages any prefix and suffix strings. The first extra value is stored in the s and c of the main CSSPropTween instance, but thereafter any extras are stored in the xn1, xn2, xn3, etc. The prefixes and suffixes are stored in the xs0, xs1, xs2, etc. properties. For example, if I walk through a clip value like "rect(10px, 5px, 0px, 20px)", the values would be stored like this: - * xs0:"rect(", s:10, xs1:"px, ", xn1:5, xs2:"px, ", xn2:0, xs3:"px, ", xn3:20, xn4:"px)" - * And they'd all get joined together when the CSSPlugin renders (in the setRatio() method). - * @param {string=} pfx Prefix (if any) - * @param {!number} s Starting value - * @param {!number} c Change in numeric value over the course of the entire tween. For example, if the start is 5 and the end is 100, the change would be 95. - * @param {string=} sfx Suffix (if any) - * @param {boolean=} r Round (if true). - * @param {boolean=} pad If true, this extra value should be separated by the previous one by a space. If there is no previous extra and pad is true, it will automatically drop the space. - * @return {CSSPropTween} returns itself so that multiple methods can be chained together. - */ - p.appendXtra = function(pfx, s, c, sfx, r, pad) { - var pt = this, - l = pt.l; - pt["xs" + l] += (pad && l) ? " " + pfx : pfx || ""; - if (!c) if (l !== 0 && !pt.plugin) { //typically we'll combine non-changing values right into the xs to optimize performance, but we don't combine them when there's a plugin that will be tweening the values because it may depend on the values being split apart, like for a bezier, if a value doesn't change between the first and second iteration but then it does on the 3rd, we'll run into trouble because there's no xn slot for that value! - pt["xs" + l] += s + (sfx || ""); - return pt; - } - pt.l++; - pt.type = pt.setRatio ? 2 : 1; - pt["xs" + pt.l] = sfx || ""; - if (l > 0) { - pt.data["xn" + l] = s + c; - pt.rxp["xn" + l] = r; //round extra property (we need to tap into this in the _parseToProxy() method) - pt["xn" + l] = s; - if (!pt.plugin) { - pt.xfirst = new CSSPropTween(pt, "xn" + l, s, c, pt.xfirst || pt, 0, pt.n, r, pt.pr); - pt.xfirst.xs0 = 0; //just to ensure that the property stays numeric which helps modern browsers speed up processing. Remember, in the setRatio() method, we do pt.t[pt.p] = val + pt.xs0 so if pt.xs0 is "" (the default), it'll cast the end value as a string. When a property is a number sometimes and a string sometimes, it prevents the compiler from locking in the data type, slowing things down slightly. - } - return pt; - } - pt.data = {s:s + c}; - pt.rxp = {}; - pt.s = s; - pt.c = c; - pt.r = r; - return pt; - }; - - /** - * @constructor A SpecialProp is basically a css property that needs to be treated in a non-standard way, like if it may contain a complex value like boxShadow:"5px 10px 15px rgb(255, 102, 51)" or if it is associated with another plugin like ThrowPropsPlugin or BezierPlugin. Every SpecialProp is associated with a particular property name like "boxShadow" or "throwProps" or "bezier" and it will intercept those values in the vars object that's passed to the CSSPlugin and handle them accordingly. - * @param {!string} p Property name (like "boxShadow" or "throwProps") - * @param {Object=} options An object containing any of the following configuration options: - * - defaultValue: the default value - * - parser: A function that should be called when the associated property name is found in the vars. This function should return a CSSPropTween instance and it should ensure that it is properly inserted into the linked list. It will receive 4 paramters: 1) The target, 2) The value defined in the vars, 3) The CSSPlugin instance (whose _firstPT should be used for the linked list), and 4) A computed style object if one was calculated (this is a speed optimization that allows retrieval of starting values quicker) - * - formatter: a function that formats any value received for this special property (for example, boxShadow could take "5px 5px red" and format it to "5px 5px 0px 0px red" so that both the beginning and ending values have a common order and quantity of values.) - * - prefix: if true, we'll determine whether or not this property requires a vendor prefix (like Webkit or Moz or ms or O) - * - color: set this to true if the value for this SpecialProp may contain color-related values like rgb(), rgba(), etc. - * - priority: priority in the linked list order. Higher priority SpecialProps will be updated before lower priority ones. The default priority is 0. - * - multi: if true, the formatter should accommodate a comma-delimited list of values, like boxShadow could have multiple boxShadows listed out. - * - collapsible: if true, the formatter should treat the value like it's a top/right/bottom/left value that could be collapsed, like "5px" would apply to all, "5px, 10px" would use 5px for top/bottom and 10px for right/left, etc. - * - keyword: a special keyword that can [optionally] be found inside the value (like "inset" for boxShadow). This allows us to validate beginning/ending values to make sure they match (if the keyword is found in one, it'll be added to the other for consistency by default). - */ - var SpecialProp = function(p, options) { - options = options || {}; - this.p = options.prefix ? _checkPropPrefix(p) || p : p; - _specialProps[p] = _specialProps[this.p] = this; - this.format = options.formatter || _getFormatter(options.defaultValue, options.color, options.collapsible, options.multi); - if (options.parser) { - this.parse = options.parser; - } - this.clrs = options.color; - this.multi = options.multi; - this.keyword = options.keyword; - this.dflt = options.defaultValue; - this.pr = options.priority || 0; - }, - - //shortcut for creating a new SpecialProp that can accept multiple properties as a comma-delimited list (helps minification). dflt can be an array for multiple values (we don't do a comma-delimited list because the default value may contain commas, like rect(0px,0px,0px,0px)). We attach this method to the SpecialProp class/object instead of using a private _createSpecialProp() method so that we can tap into it externally if necessary, like from another plugin. - _registerComplexSpecialProp = _internals._registerComplexSpecialProp = function(p, options, defaults) { - if (typeof(options) !== "object") { - options = {parser:defaults}; //to make backwards compatible with older versions of BezierPlugin and ThrowPropsPlugin - } - var a = p.split(","), - d = options.defaultValue, - i, temp; - defaults = defaults || [d]; - for (i = 0; i < a.length; i++) { - options.prefix = (i === 0 && options.prefix); - options.defaultValue = defaults[i] || d; - temp = new SpecialProp(a[i], options); - } - }, - - //creates a placeholder special prop for a plugin so that the property gets caught the first time a tween of it is attempted, and at that time it makes the plugin register itself, thus taking over for all future tweens of that property. This allows us to not mandate that things load in a particular order and it also allows us to log() an error that informs the user when they attempt to tween an external plugin-related property without loading its .js file. - _registerPluginProp = function(p) { - if (!_specialProps[p]) { - var pluginName = p.charAt(0).toUpperCase() + p.substr(1) + "Plugin"; - _registerComplexSpecialProp(p, {parser:function(t, e, p, cssp, pt, plugin, vars) { - var pluginClass = (window.GreenSockGlobals || window).com.greensock.plugins[pluginName]; - if (!pluginClass) { - _log("Error: " + pluginName + " js file not loaded."); - return pt; - } - pluginClass._cssRegister(); - return _specialProps[p].parse(t, e, p, cssp, pt, plugin, vars); - }}); - } - }; - - - p = SpecialProp.prototype; - - /** - * Alias for _parseComplex() that automatically plugs in certain values for this SpecialProp, like its property name, whether or not colors should be sensed, the default value, and priority. It also looks for any keyword that the SpecialProp defines (like "inset" for boxShadow) and ensures that the beginning and ending values have the same number of values for SpecialProps where multi is true (like boxShadow and textShadow can have a comma-delimited list) - * @param {!Object} t target element - * @param {(string|number|object)} b beginning value - * @param {(string|number|object)} e ending (destination) value - * @param {CSSPropTween=} pt next CSSPropTween in the linked list - * @param {TweenPlugin=} plugin If another plugin will be tweening the complex value, that TweenPlugin instance goes here. - * @param {function=} setRatio If a custom setRatio() method should be used to handle this complex value, that goes here. - * @return {CSSPropTween=} First CSSPropTween in the linked list - */ - p.parseComplex = function(t, b, e, pt, plugin, setRatio) { - var kwd = this.keyword, - i, ba, ea, l, bi, ei; - //if this SpecialProp's value can contain a comma-delimited list of values (like boxShadow or textShadow), we must parse them in a special way, and look for a keyword (like "inset" for boxShadow) and ensure that the beginning and ending BOTH have it if the end defines it as such. We also must ensure that there are an equal number of values specified (we can't tween 1 boxShadow to 3 for example) - if (this.multi) if (_commasOutsideParenExp.test(e) || _commasOutsideParenExp.test(b)) { - ba = b.replace(_commasOutsideParenExp, "|").split("|"); - ea = e.replace(_commasOutsideParenExp, "|").split("|"); - } else if (kwd) { - ba = [b]; - ea = [e]; - } - if (ea) { - l = (ea.length > ba.length) ? ea.length : ba.length; - for (i = 0; i < l; i++) { - b = ba[i] = ba[i] || this.dflt; - e = ea[i] = ea[i] || this.dflt; - if (kwd) { - bi = b.indexOf(kwd); - ei = e.indexOf(kwd); - if (bi !== ei) { - e = (ei === -1) ? ea : ba; - e[i] += " " + kwd; - } - } - } - b = ba.join(", "); - e = ea.join(", "); - } - return _parseComplex(t, this.p, b, e, this.clrs, this.dflt, pt, this.pr, plugin, setRatio); - }; - - /** - * Accepts a target and end value and spits back a CSSPropTween that has been inserted into the CSSPlugin's linked list and conforms with all the conventions we use internally, like type:-1, 0, 1, or 2, setting up any extra property tweens, priority, etc. For example, if we have a boxShadow SpecialProp and call: - * this._firstPT = sp.parse(element, "5px 10px 20px rgb(2550,102,51)", "boxShadow", this); - * It should figure out the starting value of the element's boxShadow, compare it to the provided end value and create all the necessary CSSPropTweens of the appropriate types to tween the boxShadow. The CSSPropTween that gets spit back should already be inserted into the linked list (the 4th parameter is the current head, so prepend to that). - * @param {!Object} t Target object whose property is being tweened - * @param {Object} e End value as provided in the vars object (typically a string, but not always - like a throwProps would be an object). - * @param {!string} p Property name - * @param {!CSSPlugin} cssp The CSSPlugin instance that should be associated with this tween. - * @param {?CSSPropTween} pt The CSSPropTween that is the current head of the linked list (we'll prepend to it) - * @param {TweenPlugin=} plugin If a plugin will be used to tween the parsed value, this is the plugin instance. - * @param {Object=} vars Original vars object that contains the data for parsing. - * @return {CSSPropTween} The first CSSPropTween in the linked list which includes the new one(s) added by the parse() call. - */ - p.parse = function(t, e, p, cssp, pt, plugin, vars) { - return this.parseComplex(t.style, this.format(_getStyle(t, this.p, _cs, false, this.dflt)), this.format(e), pt, plugin); - }; - - /** - * Registers a special property that should be intercepted from any "css" objects defined in tweens. This allows you to handle them however you want without CSSPlugin doing it for you. The 2nd parameter should be a function that accepts 3 parameters: - * 1) Target object whose property should be tweened (typically a DOM element) - * 2) The end/destination value (could be a string, number, object, or whatever you want) - * 3) The tween instance (you probably don't need to worry about this, but it can be useful for looking up information like the duration) - * - * Then, your function should return a function which will be called each time the tween gets rendered, passing a numeric "ratio" parameter to your function that indicates the change factor (usually between 0 and 1). For example: - * - * CSSPlugin.registerSpecialProp("myCustomProp", function(target, value, tween) { - * var start = target.style.width; - * return function(ratio) { - * target.style.width = (start + value * ratio) + "px"; - * console.log("set width to " + target.style.width); - * } - * }, 0); - * - * Then, when I do this tween, it will trigger my special property: - * - * TweenLite.to(element, 1, {css:{myCustomProp:100}}); - * - * In the example, of course, we're just changing the width, but you can do anything you want. - * - * @param {!string} name Property name (or comma-delimited list of property names) that should be intercepted and handled by your function. For example, if I define "myCustomProp", then it would handle that portion of the following tween: TweenLite.to(element, 1, {css:{myCustomProp:100}}) - * @param {!function(Object, Object, Object, string):function(number)} onInitTween The function that will be called when a tween of this special property is performed. The function will receive 4 parameters: 1) Target object that should be tweened, 2) Value that was passed to the tween, 3) The tween instance itself (rarely used), and 4) The property name that's being tweened. Your function should return a function that should be called on every update of the tween. That function will receive a single parameter that is a "change factor" value (typically between 0 and 1) indicating the amount of change as a ratio. You can use this to determine how to set the values appropriately in your function. - * @param {number=} priority Priority that helps the engine determine the order in which to set the properties (default: 0). Higher priority properties will be updated before lower priority ones. - */ - CSSPlugin.registerSpecialProp = function(name, onInitTween, priority) { - _registerComplexSpecialProp(name, {parser:function(t, e, p, cssp, pt, plugin, vars) { - var rv = new CSSPropTween(t, p, 0, 0, pt, 2, p, false, priority); - rv.plugin = plugin; - rv.setRatio = onInitTween(t, e, cssp._tween, p); - return rv; - }, priority:priority}); - }; - - - - - - - - - //transform-related methods and properties - var _transformProps = ("scaleX,scaleY,scaleZ,x,y,z,skewX,skewY,rotation,rotationX,rotationY,perspective").split(","), - _transformProp = _checkPropPrefix("transform"), //the Javascript (camelCase) transform property, like msTransform, WebkitTransform, MozTransform, or OTransform. - _transformPropCSS = _prefixCSS + "transform", - _transformOriginProp = _checkPropPrefix("transformOrigin"), - _supports3D = (_checkPropPrefix("perspective") !== null), - Transform = _internals.Transform = function() { - this.skewY = 0; - }, - - /** - * Parses the transform values for an element, returning an object with x, y, z, scaleX, scaleY, scaleZ, rotation, rotationX, rotationY, skewX, and skewY properties. Note: by default (for performance reasons), all skewing is combined into skewX and rotation but skewY still has a place in the transform object so that we can record how much of the skew is attributed to skewX vs skewY. Remember, a skewY of 10 looks the same as a rotation of 10 and skewX of -10. - * @param {!Object} t target element - * @param {Object=} cs computed style object (optional) - * @param {boolean=} rec if true, the transform values will be recorded to the target element's _gsTransform object, like target._gsTransform = {x:0, y:0, z:0, scaleX:1...} - * @param {boolean=} parse if true, we'll ignore any _gsTransform values that already exist on the element, and force a reparsing of the css (calculated style) - * @return {object} object containing all of the transform properties/values like {x:0, y:0, z:0, scaleX:1...} - */ - _getTransform = _internals.getTransform = function(t, cs, rec, parse) { - if (t._gsTransform && rec && !parse) { - return t._gsTransform; //if the element already has a _gsTransform, use that. Note: some browsers don't accurately return the calculated style for the transform (particularly for SVG), so it's almost always safest to just use the values we've already applied rather than re-parsing things. - } - var tm = rec ? t._gsTransform || new Transform() : new Transform(), - invX = (tm.scaleX < 0), //in order to interpret things properly, we need to know if the user applied a negative scaleX previously so that we can adjust the rotation and skewX accordingly. Otherwise, if we always interpret a flipped matrix as affecting scaleY and the user only wants to tween the scaleX on multiple sequential tweens, it would keep the negative scaleY without that being the user's intent. - min = 0.00002, - rnd = 100000, - minAngle = 179.99, - minPI = minAngle * _DEG2RAD, - zOrigin = _supports3D ? parseFloat(_getStyle(t, _transformOriginProp, cs, false, "0 0 0").split(" ")[2]) || tm.zOrigin || 0 : 0, - s, m, i, n, dec, scaleX, scaleY, rotation, skewX, difX, difY, difR, difS; - if (_transformProp) { - s = _getStyle(t, _transformPropCSS, cs, true); - } else if (t.currentStyle) { - //for older versions of IE, we need to interpret the filter portion that is in the format: progid:DXImageTransform.Microsoft.Matrix(M11=6.123233995736766e-17, M12=-1, M21=1, M22=6.123233995736766e-17, sizingMethod='auto expand') Notice that we need to swap b and c compared to a normal matrix. - s = t.currentStyle.filter.match(_ieGetMatrixExp); - s = (s && s.length === 4) ? [s[0].substr(4), Number(s[2].substr(4)), Number(s[1].substr(4)), s[3].substr(4), (tm.x || 0), (tm.y || 0)].join(",") : ""; - } - //split the matrix values out into an array (m for matrix) - m = (s || "").match(/(?:\-|\b)[\d\-\.e]+\b/gi) || []; - i = m.length; - while (--i > -1) { - n = Number(m[i]); - m[i] = (dec = n - (n |= 0)) ? ((dec * rnd + (dec < 0 ? -0.5 : 0.5)) | 0) / rnd + n : n; //convert strings to Numbers and round to 5 decimal places to avoid issues with tiny numbers. Roughly 20x faster than Number.toFixed(). We also must make sure to round before dividing so that values like 0.9999999999 become 1 to avoid glitches in browser rendering and interpretation of flipped/rotated 3D matrices. And don't just multiply the number by rnd, floor it, and then divide by rnd because the bitwise operations max out at a 32-bit signed integer, thus it could get clipped at a relatively low value (like 22,000.00000 for example). - } - if (m.length === 16) { - - //we'll only look at these position-related 6 variables first because if x/y/z all match, it's relatively safe to assume we don't need to re-parse everything which risks losing important rotational information (like rotationX:180 plus rotationY:180 would look the same as rotation:180 - there's no way to know for sure which direction was taken based solely on the matrix3d() values) - var a13 = m[8], a23 = m[9], a33 = m[10], - a14 = m[12], a24 = m[13], a34 = m[14]; - - //we manually compensate for non-zero z component of transformOrigin to work around bugs in Safari - if (tm.zOrigin) { - a34 = -tm.zOrigin; - a14 = a13*a34-m[12]; - a24 = a23*a34-m[13]; - a34 = a33*a34+tm.zOrigin-m[14]; - } - - //only parse from the matrix if we MUST because not only is it usually unnecessary due to the fact that we store the values in the _gsTransform object, but also because it's impossible to accurately interpret rotationX, rotationY, rotationZ, scaleX, and scaleY if all are applied, so it's much better to rely on what we store. However, we must parse the first time that an object is tweened. We also assume that if the position has changed, the user must have done some styling changes outside of CSSPlugin, thus we force a parse in that scenario. - if (!rec || parse || tm.rotationX == null) { - var a11 = m[0], a21 = m[1], a31 = m[2], a41 = m[3], - a12 = m[4], a22 = m[5], a32 = m[6], a42 = m[7], - a43 = m[11], - angle = Math.atan2(a32, a33), - xFlip = (angle < -minPI || angle > minPI), - t1, t2, t3, cos, sin, yFlip, zFlip; - tm.rotationX = angle * _RAD2DEG; - //rotationX - if (angle) { - cos = Math.cos(-angle); - sin = Math.sin(-angle); - t1 = a12*cos+a13*sin; - t2 = a22*cos+a23*sin; - t3 = a32*cos+a33*sin; - a13 = a12*-sin+a13*cos; - a23 = a22*-sin+a23*cos; - a33 = a32*-sin+a33*cos; - a43 = a42*-sin+a43*cos; - a12 = t1; - a22 = t2; - a32 = t3; - } - //rotationY - angle = Math.atan2(a13, a11); - tm.rotationY = angle * _RAD2DEG; - if (angle) { - yFlip = (angle < -minPI || angle > minPI); - cos = Math.cos(-angle); - sin = Math.sin(-angle); - t1 = a11*cos-a13*sin; - t2 = a21*cos-a23*sin; - t3 = a31*cos-a33*sin; - a23 = a21*sin+a23*cos; - a33 = a31*sin+a33*cos; - a43 = a41*sin+a43*cos; - a11 = t1; - a21 = t2; - a31 = t3; - } - //rotationZ - angle = Math.atan2(a21, a22); - tm.rotation = angle * _RAD2DEG; - if (angle) { - zFlip = (angle < -minPI || angle > minPI); - cos = Math.cos(-angle); - sin = Math.sin(-angle); - a11 = a11*cos+a12*sin; - t2 = a21*cos+a22*sin; - a22 = a21*-sin+a22*cos; - a32 = a31*-sin+a32*cos; - a21 = t2; - } - - if (zFlip && xFlip) { - tm.rotation = tm.rotationX = 0; - } else if (zFlip && yFlip) { - tm.rotation = tm.rotationY = 0; - } else if (yFlip && xFlip) { - tm.rotationY = tm.rotationX = 0; - } - - tm.scaleX = ((Math.sqrt(a11 * a11 + a21 * a21) * rnd + 0.5) | 0) / rnd; - tm.scaleY = ((Math.sqrt(a22 * a22 + a23 * a23) * rnd + 0.5) | 0) / rnd; - tm.scaleZ = ((Math.sqrt(a32 * a32 + a33 * a33) * rnd + 0.5) | 0) / rnd; - tm.skewX = 0; - tm.perspective = a43 ? 1 / ((a43 < 0) ? -a43 : a43) : 0; - tm.x = a14; - tm.y = a24; - tm.z = a34; - } - - } else if ((!_supports3D || parse || !m.length || tm.x !== m[4] || tm.y !== m[5] || (!tm.rotationX && !tm.rotationY)) && !(tm.x !== undefined && _getStyle(t, "display", cs) === "none")) { //sometimes a 6-element matrix is returned even when we performed 3D transforms, like if rotationX and rotationY are 180. In cases like this, we still need to honor the 3D transforms. If we just rely on the 2D info, it could affect how the data is interpreted, like scaleY might get set to -1 or rotation could get offset by 180 degrees. For example, do a TweenLite.to(element, 1, {css:{rotationX:180, rotationY:180}}) and then later, TweenLite.to(element, 1, {css:{rotationX:0}}) and without this conditional logic in place, it'd jump to a state of being unrotated when the 2nd tween starts. Then again, we need to honor the fact that the user COULD alter the transforms outside of CSSPlugin, like by manually applying new css, so we try to sense that by looking at x and y because if those changed, we know the changes were made outside CSSPlugin and we force a reinterpretation of the matrix values. Also, in Webkit browsers, if the element's "display" is "none", its calculated style value will always return empty, so if we've already recorded the values in the _gsTransform object, we'll just rely on those. - var k = (m.length >= 6), - a = k ? m[0] : 1, - b = m[1] || 0, - c = m[2] || 0, - d = k ? m[3] : 1; - tm.x = m[4] || 0; - tm.y = m[5] || 0; - scaleX = Math.sqrt(a * a + b * b); - scaleY = Math.sqrt(d * d + c * c); - rotation = (a || b) ? Math.atan2(b, a) * _RAD2DEG : tm.rotation || 0; //note: if scaleX is 0, we cannot accurately measure rotation. Same for skewX with a scaleY of 0. Therefore, we default to the previously recorded value (or zero if that doesn't exist). - skewX = (c || d) ? Math.atan2(c, d) * _RAD2DEG + rotation : tm.skewX || 0; - difX = scaleX - Math.abs(tm.scaleX || 0); - difY = scaleY - Math.abs(tm.scaleY || 0); - if (Math.abs(skewX) > 90 && Math.abs(skewX) < 270) { - if (invX) { - scaleX *= -1; - skewX += (rotation <= 0) ? 180 : -180; - rotation += (rotation <= 0) ? 180 : -180; - } else { - scaleY *= -1; - skewX += (skewX <= 0) ? 180 : -180; - } - } - difR = (rotation - tm.rotation) % 180; //note: matching ranges would be very small (+/-0.0001) or very close to 180. - difS = (skewX - tm.skewX) % 180; - //if there's already a recorded _gsTransform in place for the target, we should leave those values in place unless we know things changed for sure (beyond a super small amount). This gets around ambiguous interpretations, like if scaleX and scaleY are both -1, the matrix would be the same as if the rotation was 180 with normal scaleX/scaleY. If the user tweened to particular values, those must be prioritized to ensure animation is consistent. - if (tm.skewX === undefined || difX > min || difX < -min || difY > min || difY < -min || (difR > -minAngle && difR < minAngle && (difR * rnd) | 0 !== 0) || (difS > -minAngle && difS < minAngle && (difS * rnd) | 0 !== 0)) { - tm.scaleX = scaleX; - tm.scaleY = scaleY; - tm.rotation = rotation; - tm.skewX = skewX; - } - if (_supports3D) { - tm.rotationX = tm.rotationY = tm.z = 0; - tm.perspective = parseFloat(CSSPlugin.defaultTransformPerspective) || 0; - tm.scaleZ = 1; - } - } - tm.zOrigin = zOrigin; - - //some browsers have a hard time with very small values like 2.4492935982947064e-16 (notice the "e-" towards the end) and would render the object slightly off. So we round to 0 in these cases. The conditional logic here is faster than calling Math.abs(). Also, browsers tend to render a SLIGHTLY rotated object in a fuzzy way, so we need to snap to exactly 0 when appropriate. - for (i in tm) { - if (tm[i] < min) if (tm[i] > -min) { - tm[i] = 0; - } - } - //DEBUG: _log("parsed rotation: "+(tm.rotationX)+", "+(tm.rotationY)+", "+(tm.rotation)+", scale: "+tm.scaleX+", "+tm.scaleY+", "+tm.scaleZ+", position: "+tm.x+", "+tm.y+", "+tm.z+", perspective: "+tm.perspective); - if (rec) { - t._gsTransform = tm; //record to the object's _gsTransform which we use so that tweens can control individual properties independently (we need all the properties to accurately recompose the matrix in the setRatio() method) - } - return tm; - }, - - //for setting 2D transforms in IE6, IE7, and IE8 (must use a "filter" to emulate the behavior of modern day browser transforms) - _setIETransformRatio = function(v) { - var t = this.data, //refers to the element's _gsTransform object - ang = -t.rotation * _DEG2RAD, - skew = ang + t.skewX * _DEG2RAD, - rnd = 100000, - a = ((Math.cos(ang) * t.scaleX * rnd) | 0) / rnd, - b = ((Math.sin(ang) * t.scaleX * rnd) | 0) / rnd, - c = ((Math.sin(skew) * -t.scaleY * rnd) | 0) / rnd, - d = ((Math.cos(skew) * t.scaleY * rnd) | 0) / rnd, - style = this.t.style, - cs = this.t.currentStyle, - filters, val; - if (!cs) { - return; - } - val = b; //just for swapping the variables an inverting them (reused "val" to avoid creating another variable in memory). IE's filter matrix uses a non-standard matrix configuration (angle goes the opposite way, and b and c are reversed and inverted) - b = -c; - c = -val; - filters = cs.filter; - style.filter = ""; //remove filters so that we can accurately measure offsetWidth/offsetHeight - var w = this.t.offsetWidth, - h = this.t.offsetHeight, - clip = (cs.position !== "absolute"), - m = "progid:DXImageTransform.Microsoft.Matrix(M11=" + a + ", M12=" + b + ", M21=" + c + ", M22=" + d, - ox = t.x, - oy = t.y, - dx, dy; - - //if transformOrigin is being used, adjust the offset x and y - if (t.ox != null) { - dx = ((t.oxp) ? w * t.ox * 0.01 : t.ox) - w / 2; - dy = ((t.oyp) ? h * t.oy * 0.01 : t.oy) - h / 2; - ox += dx - (dx * a + dy * b); - oy += dy - (dx * c + dy * d); - } - - if (!clip) { - m += ", sizingMethod='auto expand')"; - } else { - dx = (w / 2); - dy = (h / 2); - //translate to ensure that transformations occur around the correct origin (default is center). - m += ", Dx=" + (dx - (dx * a + dy * b) + ox) + ", Dy=" + (dy - (dx * c + dy * d) + oy) + ")"; - } - if (filters.indexOf("DXImageTransform.Microsoft.Matrix(") !== -1) { - style.filter = filters.replace(_ieSetMatrixExp, m); - } else { - style.filter = m + " " + filters; //we must always put the transform/matrix FIRST (before alpha(opacity=xx)) to avoid an IE bug that slices part of the object when rotation is applied with alpha. - } - - //at the end or beginning of the tween, if the matrix is normal (1, 0, 0, 1) and opacity is 100 (or doesn't exist), remove the filter to improve browser performance. - if (v === 0 || v === 1) if (a === 1) if (b === 0) if (c === 0) if (d === 1) if (!clip || m.indexOf("Dx=0, Dy=0") !== -1) if (!_opacityExp.test(filters) || parseFloat(RegExp.$1) === 100) if (filters.indexOf("gradient(" && filters.indexOf("Alpha")) === -1) { - style.removeAttribute("filter"); - } - - //we must set the margins AFTER applying the filter in order to avoid some bugs in IE8 that could (in rare scenarios) cause them to be ignored intermittently (vibration). - if (!clip) { - var mult = (_ieVers < 8) ? 1 : -1, //in Internet Explorer 7 and before, the box model is broken, causing the browser to treat the width/height of the actual rotated filtered image as the width/height of the box itself, but Microsoft corrected that in IE8. We must use a negative offset in IE8 on the right/bottom - marg, prop, dif; - dx = t.ieOffsetX || 0; - dy = t.ieOffsetY || 0; - t.ieOffsetX = Math.round((w - ((a < 0 ? -a : a) * w + (b < 0 ? -b : b) * h)) / 2 + ox); - t.ieOffsetY = Math.round((h - ((d < 0 ? -d : d) * h + (c < 0 ? -c : c) * w)) / 2 + oy); - for (i = 0; i < 4; i++) { - prop = _margins[i]; - marg = cs[prop]; - //we need to get the current margin in case it is being tweened separately (we want to respect that tween's changes) - val = (marg.indexOf("px") !== -1) ? parseFloat(marg) : _convertToPixels(this.t, prop, parseFloat(marg), marg.replace(_suffixExp, "")) || 0; - if (val !== t[prop]) { - dif = (i < 2) ? -t.ieOffsetX : -t.ieOffsetY; //if another tween is controlling a margin, we cannot only apply the difference in the ieOffsets, so we essentially zero-out the dx and dy here in that case. We record the margin(s) later so that we can keep comparing them, making this code very flexible. - } else { - dif = (i < 2) ? dx - t.ieOffsetX : dy - t.ieOffsetY; - } - style[prop] = (t[prop] = Math.round( val - dif * ((i === 0 || i === 2) ? 1 : mult) )) + "px"; - } - } - }, - - _set3DTransformRatio = _internals.set3DTransformRatio = function(v) { - var t = this.data, //refers to the element's _gsTransform object - style = this.t.style, - angle = t.rotation * _DEG2RAD, - sx = t.scaleX, - sy = t.scaleY, - sz = t.scaleZ, - perspective = t.perspective, - a11, a12, a13, a14, a21, a22, a23, a24, a31, a32, a33, a34, a41, a42, a43, - zOrigin, rnd, cos, sin, t1, t2, t3, t4; - if (v === 1 || v === 0) if (t.force3D === "auto") if (!t.rotationY && !t.rotationX && sz === 1 && !perspective && !t.z) { //on the final render (which could be 0 for a from tween), if there are no 3D aspects, render in 2D to free up memory and improve performance especially on mobile devices - _set2DTransformRatio.call(this, v); - return; - } - if (_isFirefox) { - var n = 0.0001; - if (sx < n && sx > -n) { //Firefox has a bug (at least in v25) that causes it to render the transparent part of 32-bit PNG images as black when displayed inside an iframe and the 3D scale is very small and doesn't change sufficiently enough between renders (like if you use a Power4.easeInOut to scale from 0 to 1 where the beginning values only change a tiny amount to begin the tween before accelerating). In this case, we force the scale to be 0.00002 instead which is visually the same but works around the Firefox issue. - sx = sz = 0.00002; - } - if (sy < n && sy > -n) { - sy = sz = 0.00002; - } - if (perspective && !t.z && !t.rotationX && !t.rotationY) { //Firefox has a bug that causes elements to have an odd super-thin, broken/dotted black border on elements that have a perspective set but aren't utilizing 3D space (no rotationX, rotationY, or z). - perspective = 0; - } - } - if (angle || t.skewX) { - cos = Math.cos(angle); - sin = Math.sin(angle); - a11 = cos; - a21 = sin; - if (t.skewX) { - angle -= t.skewX * _DEG2RAD; - cos = Math.cos(angle); - sin = Math.sin(angle); - if (t.skewType === "simple") { //by default, we compensate skewing on the other axis to make it look more natural, but you can set the skewType to "simple" to use the uncompensated skewing that CSS does - t1 = Math.tan(t.skewX * _DEG2RAD); - t1 = Math.sqrt(1 + t1 * t1); - cos *= t1; - sin *= t1; - } - } - a12 = -sin; - a22 = cos; - - } else if (!t.rotationY && !t.rotationX && sz === 1 && !perspective) { //if we're only translating and/or 2D scaling, this is faster... - style[_transformProp] = "translate3d(" + t.x + "px," + t.y + "px," + t.z +"px)" + ((sx !== 1 || sy !== 1) ? " scale(" + sx + "," + sy + ")" : ""); - return; - } else { - a11 = a22 = 1; - a12 = a21 = 0; - } - a33 = 1; - a13 = a14 = a23 = a24 = a31 = a32 = a34 = a41 = a42 = 0; - a43 = (perspective) ? -1 / perspective : 0; - zOrigin = t.zOrigin; - rnd = 100000; - angle = t.rotationY * _DEG2RAD; - if (angle) { - cos = Math.cos(angle); - sin = Math.sin(angle); - a31 = a33*-sin; - a41 = a43*-sin; - a13 = a11*sin; - a23 = a21*sin; - a33 *= cos; - a43 *= cos; - a11 *= cos; - a21 *= cos; - } - angle = t.rotationX * _DEG2RAD; - if (angle) { - cos = Math.cos(angle); - sin = Math.sin(angle); - t1 = a12*cos+a13*sin; - t2 = a22*cos+a23*sin; - t3 = a32*cos+a33*sin; - t4 = a42*cos+a43*sin; - a13 = a12*-sin+a13*cos; - a23 = a22*-sin+a23*cos; - a33 = a32*-sin+a33*cos; - a43 = a42*-sin+a43*cos; - a12 = t1; - a22 = t2; - a32 = t3; - a42 = t4; - } - if (sz !== 1) { - a13*=sz; - a23*=sz; - a33*=sz; - a43*=sz; - } - if (sy !== 1) { - a12*=sy; - a22*=sy; - a32*=sy; - a42*=sy; - } - if (sx !== 1) { - a11*=sx; - a21*=sx; - a31*=sx; - a41*=sx; - } - if (zOrigin) { - a34 -= zOrigin; - a14 = a13*a34; - a24 = a23*a34; - a34 = a33*a34+zOrigin; - } - //we round the x, y, and z slightly differently to allow even larger values. - a14 = (t1 = (a14 += t.x) - (a14 |= 0)) ? ((t1 * rnd + (t1 < 0 ? -0.5 : 0.5)) | 0) / rnd + a14 : a14; - a24 = (t1 = (a24 += t.y) - (a24 |= 0)) ? ((t1 * rnd + (t1 < 0 ? -0.5 : 0.5)) | 0) / rnd + a24 : a24; - a34 = (t1 = (a34 += t.z) - (a34 |= 0)) ? ((t1 * rnd + (t1 < 0 ? -0.5 : 0.5)) | 0) / rnd + a34 : a34; - style[_transformProp] = "matrix3d(" + [ (((a11 * rnd) | 0) / rnd), (((a21 * rnd) | 0) / rnd), (((a31 * rnd) | 0) / rnd), (((a41 * rnd) | 0) / rnd), (((a12 * rnd) | 0) / rnd), (((a22 * rnd) | 0) / rnd), (((a32 * rnd) | 0) / rnd), (((a42 * rnd) | 0) / rnd), (((a13 * rnd) | 0) / rnd), (((a23 * rnd) | 0) / rnd), (((a33 * rnd) | 0) / rnd), (((a43 * rnd) | 0) / rnd), a14, a24, a34, (perspective ? (1 + (-a34 / perspective)) : 1) ].join(",") + ")"; - }, - - _set2DTransformRatio = _internals.set2DTransformRatio = function(v) { - var t = this.data, //refers to the element's _gsTransform object - targ = this.t, - style = targ.style, - ang, skew, rnd, sx, sy; - if (t.rotationX || t.rotationY || t.z || t.force3D === true || (t.force3D === "auto" && v !== 1 && v !== 0)) { //if a 3D tween begins while a 2D one is running, we need to kick the rendering over to the 3D method. For example, imagine a yoyo-ing, infinitely repeating scale tween running, and then the object gets rotated in 3D space with a different tween. - this.setRatio = _set3DTransformRatio; - _set3DTransformRatio.call(this, v); - return; - } - if (!t.rotation && !t.skewX) { - style[_transformProp] = "matrix(" + t.scaleX + ",0,0," + t.scaleY + "," + t.x + "," + t.y + ")"; - } else { - ang = t.rotation * _DEG2RAD; - skew = ang - t.skewX * _DEG2RAD; - rnd = 100000; - sx = t.scaleX * rnd; - sy = t.scaleY * rnd; - //some browsers have a hard time with very small values like 2.4492935982947064e-16 (notice the "e-" towards the end) and would render the object slightly off. So we round to 5 decimal places. - style[_transformProp] = "matrix(" + (((Math.cos(ang) * sx) | 0) / rnd) + "," + (((Math.sin(ang) * sx) | 0) / rnd) + "," + (((Math.sin(skew) * -sy) | 0) / rnd) + "," + (((Math.cos(skew) * sy) | 0) / rnd) + "," + t.x + "," + t.y + ")"; - } - }; - - _registerComplexSpecialProp("transform,scale,scaleX,scaleY,scaleZ,x,y,z,rotation,rotationX,rotationY,rotationZ,skewX,skewY,shortRotation,shortRotationX,shortRotationY,shortRotationZ,transformOrigin,transformPerspective,directionalRotation,parseTransform,force3D,skewType", {parser:function(t, e, p, cssp, pt, plugin, vars) { - if (cssp._transform) { return pt; } //only need to parse the transform once, and only if the browser supports it. - var m1 = cssp._transform = _getTransform(t, _cs, true, vars.parseTransform), - style = t.style, - min = 0.000001, - i = _transformProps.length, - v = vars, - endRotations = {}, - m2, skewY, copy, orig, has3D, hasChange, dr; - if (typeof(v.transform) === "string" && _transformProp) { //for values like transform:"rotate(60deg) scale(0.5, 0.8)" - copy = _tempDiv.style; //don't use the original target because it might be SVG in which case some browsers don't report computed style correctly. - copy[_transformProp] = v.transform; - copy.display = "block"; //if display is "none", the browser often refuses to report the transform properties correctly. - copy.position = "absolute"; - _doc.body.appendChild(_tempDiv); - m2 = _getTransform(_tempDiv, null, false); - _doc.body.removeChild(_tempDiv); - } else if (typeof(v) === "object") { //for values like scaleX, scaleY, rotation, x, y, skewX, and skewY or transform:{...} (object) - m2 = {scaleX:_parseVal((v.scaleX != null) ? v.scaleX : v.scale, m1.scaleX), - scaleY:_parseVal((v.scaleY != null) ? v.scaleY : v.scale, m1.scaleY), - scaleZ:_parseVal(v.scaleZ, m1.scaleZ), - x:_parseVal(v.x, m1.x), - y:_parseVal(v.y, m1.y), - z:_parseVal(v.z, m1.z), - perspective:_parseVal(v.transformPerspective, m1.perspective)}; - dr = v.directionalRotation; - if (dr != null) { - if (typeof(dr) === "object") { - for (copy in dr) { - v[copy] = dr[copy]; - } - } else { - v.rotation = dr; - } - } - m2.rotation = _parseAngle(("rotation" in v) ? v.rotation : ("shortRotation" in v) ? v.shortRotation + "_short" : ("rotationZ" in v) ? v.rotationZ : m1.rotation, m1.rotation, "rotation", endRotations); - if (_supports3D) { - m2.rotationX = _parseAngle(("rotationX" in v) ? v.rotationX : ("shortRotationX" in v) ? v.shortRotationX + "_short" : m1.rotationX || 0, m1.rotationX, "rotationX", endRotations); - m2.rotationY = _parseAngle(("rotationY" in v) ? v.rotationY : ("shortRotationY" in v) ? v.shortRotationY + "_short" : m1.rotationY || 0, m1.rotationY, "rotationY", endRotations); - } - m2.skewX = (v.skewX == null) ? m1.skewX : _parseAngle(v.skewX, m1.skewX); - - //note: for performance reasons, we combine all skewing into the skewX and rotation values, ignoring skewY but we must still record it so that we can discern how much of the overall skew is attributed to skewX vs. skewY. Otherwise, if the skewY would always act relative (tween skewY to 10deg, for example, multiple times and if we always combine things into skewX, we can't remember that skewY was 10 from last time). Remember, a skewY of 10 degrees looks the same as a rotation of 10 degrees plus a skewX of -10 degrees. - m2.skewY = (v.skewY == null) ? m1.skewY : _parseAngle(v.skewY, m1.skewY); - if ((skewY = m2.skewY - m1.skewY)) { - m2.skewX += skewY; - m2.rotation += skewY; - } - } - - if (_supports3D && v.force3D != null) { - m1.force3D = v.force3D; - hasChange = true; - } - - m1.skewType = v.skewType || m1.skewType || CSSPlugin.defaultSkewType; - - has3D = (m1.force3D || m1.z || m1.rotationX || m1.rotationY || m2.z || m2.rotationX || m2.rotationY || m2.perspective); - if (!has3D && v.scale != null) { - m2.scaleZ = 1; //no need to tween scaleZ. - } - - while (--i > -1) { - p = _transformProps[i]; - orig = m2[p] - m1[p]; - if (orig > min || orig < -min || _forcePT[p] != null) { - hasChange = true; - pt = new CSSPropTween(m1, p, m1[p], orig, pt); - if (p in endRotations) { - pt.e = endRotations[p]; //directional rotations typically have compensated values during the tween, but we need to make sure they end at exactly what the user requested - } - pt.xs0 = 0; //ensures the value stays numeric in setRatio() - pt.plugin = plugin; - cssp._overwriteProps.push(pt.n); - } - } - - orig = v.transformOrigin; - if (orig || (_supports3D && has3D && m1.zOrigin)) { //if anything 3D is happening and there's a transformOrigin with a z component that's non-zero, we must ensure that the transformOrigin's z-component is set to 0 so that we can manually do those calculations to get around Safari bugs. Even if the user didn't specifically define a "transformOrigin" in this particular tween (maybe they did it via css directly). - if (_transformProp) { - hasChange = true; - p = _transformOriginProp; - orig = (orig || _getStyle(t, p, _cs, false, "50% 50%")) + ""; //cast as string to avoid errors - pt = new CSSPropTween(style, p, 0, 0, pt, -1, "transformOrigin"); - pt.b = style[p]; - pt.plugin = plugin; - if (_supports3D) { - copy = m1.zOrigin; - orig = orig.split(" "); - m1.zOrigin = ((orig.length > 2 && !(copy !== 0 && orig[2] === "0px")) ? parseFloat(orig[2]) : copy) || 0; //Safari doesn't handle the z part of transformOrigin correctly, so we'll manually handle it in the _set3DTransformRatio() method. - pt.xs0 = pt.e = orig[0] + " " + (orig[1] || "50%") + " 0px"; //we must define a z value of 0px specifically otherwise iOS 5 Safari will stick with the old one (if one was defined)! - pt = new CSSPropTween(m1, "zOrigin", 0, 0, pt, -1, pt.n); //we must create a CSSPropTween for the _gsTransform.zOrigin so that it gets reset properly at the beginning if the tween runs backward (as opposed to just setting m1.zOrigin here) - pt.b = copy; - pt.xs0 = pt.e = m1.zOrigin; - } else { - pt.xs0 = pt.e = orig; - } - - //for older versions of IE (6-8), we need to manually calculate things inside the setRatio() function. We record origin x and y (ox and oy) and whether or not the values are percentages (oxp and oyp). - } else { - _parsePosition(orig + "", m1); - } - } - - if (hasChange) { - cssp._transformType = (has3D || this._transformType === 3) ? 3 : 2; //quicker than calling cssp._enableTransforms(); - } - return pt; - }, prefix:true}); - - _registerComplexSpecialProp("boxShadow", {defaultValue:"0px 0px 0px 0px #999", prefix:true, color:true, multi:true, keyword:"inset"}); - - _registerComplexSpecialProp("borderRadius", {defaultValue:"0px", parser:function(t, e, p, cssp, pt, plugin) { - e = this.format(e); - var props = ["borderTopLeftRadius","borderTopRightRadius","borderBottomRightRadius","borderBottomLeftRadius"], - style = t.style, - ea1, i, es2, bs2, bs, es, bn, en, w, h, esfx, bsfx, rel, hn, vn, em; - w = parseFloat(t.offsetWidth); - h = parseFloat(t.offsetHeight); - ea1 = e.split(" "); - for (i = 0; i < props.length; i++) { //if we're dealing with percentages, we must convert things separately for the horizontal and vertical axis! - if (this.p.indexOf("border")) { //older browsers used a prefix - props[i] = _checkPropPrefix(props[i]); - } - bs = bs2 = _getStyle(t, props[i], _cs, false, "0px"); - if (bs.indexOf(" ") !== -1) { - bs2 = bs.split(" "); - bs = bs2[0]; - bs2 = bs2[1]; - } - es = es2 = ea1[i]; - bn = parseFloat(bs); - bsfx = bs.substr((bn + "").length); - rel = (es.charAt(1) === "="); - if (rel) { - en = parseInt(es.charAt(0)+"1", 10); - es = es.substr(2); - en *= parseFloat(es); - esfx = es.substr((en + "").length - (en < 0 ? 1 : 0)) || ""; - } else { - en = parseFloat(es); - esfx = es.substr((en + "").length); - } - if (esfx === "") { - esfx = _suffixMap[p] || bsfx; - } - if (esfx !== bsfx) { - hn = _convertToPixels(t, "borderLeft", bn, bsfx); //horizontal number (we use a bogus "borderLeft" property just because the _convertToPixels() method searches for the keywords "Left", "Right", "Top", and "Bottom" to determine of it's a horizontal or vertical property, and we need "border" in the name so that it knows it should measure relative to the element itself, not its parent. - vn = _convertToPixels(t, "borderTop", bn, bsfx); //vertical number - if (esfx === "%") { - bs = (hn / w * 100) + "%"; - bs2 = (vn / h * 100) + "%"; - } else if (esfx === "em") { - em = _convertToPixels(t, "borderLeft", 1, "em"); - bs = (hn / em) + "em"; - bs2 = (vn / em) + "em"; - } else { - bs = hn + "px"; - bs2 = vn + "px"; - } - if (rel) { - es = (parseFloat(bs) + en) + esfx; - es2 = (parseFloat(bs2) + en) + esfx; - } - } - pt = _parseComplex(style, props[i], bs + " " + bs2, es + " " + es2, false, "0px", pt); - } - return pt; - }, prefix:true, formatter:_getFormatter("0px 0px 0px 0px", false, true)}); - _registerComplexSpecialProp("backgroundPosition", {defaultValue:"0 0", parser:function(t, e, p, cssp, pt, plugin) { - var bp = "background-position", - cs = (_cs || _getComputedStyle(t, null)), - bs = this.format( ((cs) ? _ieVers ? cs.getPropertyValue(bp + "-x") + " " + cs.getPropertyValue(bp + "-y") : cs.getPropertyValue(bp) : t.currentStyle.backgroundPositionX + " " + t.currentStyle.backgroundPositionY) || "0 0"), //Internet Explorer doesn't report background-position correctly - we must query background-position-x and background-position-y and combine them (even in IE10). Before IE9, we must do the same with the currentStyle object and use camelCase - es = this.format(e), - ba, ea, i, pct, overlap, src; - if ((bs.indexOf("%") !== -1) !== (es.indexOf("%") !== -1)) { - src = _getStyle(t, "backgroundImage").replace(_urlExp, ""); - if (src && src !== "none") { - ba = bs.split(" "); - ea = es.split(" "); - _tempImg.setAttribute("src", src); //set the temp <img>'s src to the background-image so that we can measure its width/height - i = 2; - while (--i > -1) { - bs = ba[i]; - pct = (bs.indexOf("%") !== -1); - if (pct !== (ea[i].indexOf("%") !== -1)) { - overlap = (i === 0) ? t.offsetWidth - _tempImg.width : t.offsetHeight - _tempImg.height; - ba[i] = pct ? (parseFloat(bs) / 100 * overlap) + "px" : (parseFloat(bs) / overlap * 100) + "%"; - } - } - bs = ba.join(" "); - } - } - return this.parseComplex(t.style, bs, es, pt, plugin); - }, formatter:_parsePosition}); - _registerComplexSpecialProp("backgroundSize", {defaultValue:"0 0", formatter:_parsePosition}); - _registerComplexSpecialProp("perspective", {defaultValue:"0px", prefix:true}); - _registerComplexSpecialProp("perspectiveOrigin", {defaultValue:"50% 50%", prefix:true}); - _registerComplexSpecialProp("transformStyle", {prefix:true}); - _registerComplexSpecialProp("backfaceVisibility", {prefix:true}); - _registerComplexSpecialProp("userSelect", {prefix:true}); - _registerComplexSpecialProp("margin", {parser:_getEdgeParser("marginTop,marginRight,marginBottom,marginLeft")}); - _registerComplexSpecialProp("padding", {parser:_getEdgeParser("paddingTop,paddingRight,paddingBottom,paddingLeft")}); - _registerComplexSpecialProp("clip", {defaultValue:"rect(0px,0px,0px,0px)", parser:function(t, e, p, cssp, pt, plugin){ - var b, cs, delim; - if (_ieVers < 9) { //IE8 and earlier don't report a "clip" value in the currentStyle - instead, the values are split apart into clipTop, clipRight, clipBottom, and clipLeft. Also, in IE7 and earlier, the values inside rect() are space-delimited, not comma-delimited. - cs = t.currentStyle; - delim = _ieVers < 8 ? " " : ","; - b = "rect(" + cs.clipTop + delim + cs.clipRight + delim + cs.clipBottom + delim + cs.clipLeft + ")"; - e = this.format(e).split(",").join(delim); - } else { - b = this.format(_getStyle(t, this.p, _cs, false, this.dflt)); - e = this.format(e); - } - return this.parseComplex(t.style, b, e, pt, plugin); - }}); - _registerComplexSpecialProp("textShadow", {defaultValue:"0px 0px 0px #999", color:true, multi:true}); - _registerComplexSpecialProp("autoRound,strictUnits", {parser:function(t, e, p, cssp, pt) {return pt;}}); //just so that we can ignore these properties (not tween them) - _registerComplexSpecialProp("border", {defaultValue:"0px solid #000", parser:function(t, e, p, cssp, pt, plugin) { - return this.parseComplex(t.style, this.format(_getStyle(t, "borderTopWidth", _cs, false, "0px") + " " + _getStyle(t, "borderTopStyle", _cs, false, "solid") + " " + _getStyle(t, "borderTopColor", _cs, false, "#000")), this.format(e), pt, plugin); - }, color:true, formatter:function(v) { - var a = v.split(" "); - return a[0] + " " + (a[1] || "solid") + " " + (v.match(_colorExp) || ["#000"])[0]; - }}); - _registerComplexSpecialProp("borderWidth", {parser:_getEdgeParser("borderTopWidth,borderRightWidth,borderBottomWidth,borderLeftWidth")}); //Firefox doesn't pick up on borderWidth set in style sheets (only inline). - _registerComplexSpecialProp("float,cssFloat,styleFloat", {parser:function(t, e, p, cssp, pt, plugin) { - var s = t.style, - prop = ("cssFloat" in s) ? "cssFloat" : "styleFloat"; - return new CSSPropTween(s, prop, 0, 0, pt, -1, p, false, 0, s[prop], e); - }}); - - //opacity-related - var _setIEOpacityRatio = function(v) { - var t = this.t, //refers to the element's style property - filters = t.filter || _getStyle(this.data, "filter"), - val = (this.s + this.c * v) | 0, - skip; - if (val === 100) { //for older versions of IE that need to use a filter to apply opacity, we should remove the filter if opacity hits 1 in order to improve performance, but make sure there isn't a transform (matrix) or gradient in the filters. - if (filters.indexOf("atrix(") === -1 && filters.indexOf("radient(") === -1 && filters.indexOf("oader(") === -1) { - t.removeAttribute("filter"); - skip = (!_getStyle(this.data, "filter")); //if a class is applied that has an alpha filter, it will take effect (we don't want that), so re-apply our alpha filter in that case. We must first remove it and then check. - } else { - t.filter = filters.replace(_alphaFilterExp, ""); - skip = true; - } - } - if (!skip) { - if (this.xn1) { - t.filter = filters = filters || ("alpha(opacity=" + val + ")"); //works around bug in IE7/8 that prevents changes to "visibility" from being applied properly if the filter is changed to a different alpha on the same frame. - } - if (filters.indexOf("pacity") === -1) { //only used if browser doesn't support the standard opacity style property (IE 7 and 8). We omit the "O" to avoid case-sensitivity issues - if (val !== 0 || !this.xn1) { //bugs in IE7/8 won't render the filter properly if opacity is ADDED on the same frame/render as "visibility" changes (this.xn1 is 1 if this tween is an "autoAlpha" tween) - t.filter = filters + " alpha(opacity=" + val + ")"; //we round the value because otherwise, bugs in IE7/8 can prevent "visibility" changes from being applied properly. - } - } else { - t.filter = filters.replace(_opacityExp, "opacity=" + val); - } - } - }; - _registerComplexSpecialProp("opacity,alpha,autoAlpha", {defaultValue:"1", parser:function(t, e, p, cssp, pt, plugin) { - var b = parseFloat(_getStyle(t, "opacity", _cs, false, "1")), - style = t.style, - isAutoAlpha = (p === "autoAlpha"); - if (typeof(e) === "string" && e.charAt(1) === "=") { - e = ((e.charAt(0) === "-") ? -1 : 1) * parseFloat(e.substr(2)) + b; - } - if (isAutoAlpha && b === 1 && _getStyle(t, "visibility", _cs) === "hidden" && e !== 0) { //if visibility is initially set to "hidden", we should interpret that as intent to make opacity 0 (a convenience) - b = 0; - } - if (_supportsOpacity) { - pt = new CSSPropTween(style, "opacity", b, e - b, pt); - } else { - pt = new CSSPropTween(style, "opacity", b * 100, (e - b) * 100, pt); - pt.xn1 = isAutoAlpha ? 1 : 0; //we need to record whether or not this is an autoAlpha so that in the setRatio(), we know to duplicate the setting of the alpha in order to work around a bug in IE7 and IE8 that prevents changes to "visibility" from taking effect if the filter is changed to a different alpha(opacity) at the same time. Setting it to the SAME value first, then the new value works around the IE7/8 bug. - style.zoom = 1; //helps correct an IE issue. - pt.type = 2; - pt.b = "alpha(opacity=" + pt.s + ")"; - pt.e = "alpha(opacity=" + (pt.s + pt.c) + ")"; - pt.data = t; - pt.plugin = plugin; - pt.setRatio = _setIEOpacityRatio; - } - if (isAutoAlpha) { //we have to create the "visibility" PropTween after the opacity one in the linked list so that they run in the order that works properly in IE8 and earlier - pt = new CSSPropTween(style, "visibility", 0, 0, pt, -1, null, false, 0, ((b !== 0) ? "inherit" : "hidden"), ((e === 0) ? "hidden" : "inherit")); - pt.xs0 = "inherit"; - cssp._overwriteProps.push(pt.n); - cssp._overwriteProps.push(p); - } - return pt; - }}); - - - var _removeProp = function(s, p) { - if (p) { - if (s.removeProperty) { - if (p.substr(0,2) === "ms") { //Microsoft browsers don't conform to the standard of capping the first prefix character, so we adjust so that when we prefix the caps with a dash, it's correct (otherwise it'd be "ms-transform" instead of "-ms-transform" for IE9, for example) - p = "M" + p.substr(1); - } - s.removeProperty(p.replace(_capsExp, "-$1").toLowerCase()); - } else { //note: old versions of IE use "removeAttribute()" instead of "removeProperty()" - s.removeAttribute(p); - } - } - }, - _setClassNameRatio = function(v) { - this.t._gsClassPT = this; - if (v === 1 || v === 0) { - this.t.setAttribute("class", (v === 0) ? this.b : this.e); - var mpt = this.data, //first MiniPropTween - s = this.t.style; - while (mpt) { - if (!mpt.v) { - _removeProp(s, mpt.p); - } else { - s[mpt.p] = mpt.v; - } - mpt = mpt._next; - } - if (v === 1 && this.t._gsClassPT === this) { - this.t._gsClassPT = null; - } - } else if (this.t.getAttribute("class") !== this.e) { - this.t.setAttribute("class", this.e); - } - }; - _registerComplexSpecialProp("className", {parser:function(t, e, p, cssp, pt, plugin, vars) { - var b = t.getAttribute("class") || "", //don't use t.className because it doesn't work consistently on SVG elements; getAttribute("class") and setAttribute("class", value") is more reliable. - cssText = t.style.cssText, - difData, bs, cnpt, cnptLookup, mpt; - pt = cssp._classNamePT = new CSSPropTween(t, p, 0, 0, pt, 2); - pt.setRatio = _setClassNameRatio; - pt.pr = -11; - _hasPriority = true; - pt.b = b; - bs = _getAllStyles(t, _cs); - //if there's a className tween already operating on the target, force it to its end so that the necessary inline styles are removed and the class name is applied before we determine the end state (we don't want inline styles interfering that were there just for class-specific values) - cnpt = t._gsClassPT; - if (cnpt) { - cnptLookup = {}; - mpt = cnpt.data; //first MiniPropTween which stores the inline styles - we need to force these so that the inline styles don't contaminate things. Otherwise, there's a small chance that a tween could start and the inline values match the destination values and they never get cleaned. - while (mpt) { - cnptLookup[mpt.p] = 1; - mpt = mpt._next; - } - cnpt.setRatio(1); - } - t._gsClassPT = pt; - pt.e = (e.charAt(1) !== "=") ? e : b.replace(new RegExp("\\s*\\b" + e.substr(2) + "\\b"), "") + ((e.charAt(0) === "+") ? " " + e.substr(2) : ""); - if (cssp._tween._duration) { //if it's a zero-duration tween, there's no need to tween anything or parse the data. In fact, if we switch classes temporarily (which we must do for proper parsing) and the class has a transition applied, it could cause a quick flash to the end state and back again initially in some browsers. - t.setAttribute("class", pt.e); - difData = _cssDif(t, bs, _getAllStyles(t), vars, cnptLookup); - t.setAttribute("class", b); - pt.data = difData.firstMPT; - t.style.cssText = cssText; //we recorded cssText before we swapped classes and ran _getAllStyles() because in cases when a className tween is overwritten, we remove all the related tweening properties from that class change (otherwise class-specific stuff can't override properties we've directly set on the target's style object due to specificity). - pt = pt.xfirst = cssp.parse(t, difData.difs, pt, plugin); //we record the CSSPropTween as the xfirst so that we can handle overwriting propertly (if "className" gets overwritten, we must kill all the properties associated with the className part of the tween, so we can loop through from xfirst to the pt itself) - } - return pt; - }}); - - - var _setClearPropsRatio = function(v) { - if (v === 1 || v === 0) if (this.data._totalTime === this.data._totalDuration && this.data.data !== "isFromStart") { //this.data refers to the tween. Only clear at the END of the tween (remember, from() tweens make the ratio go from 1 to 0, so we can't just check that and if the tween is the zero-duration one that's created internally to render the starting values in a from() tween, ignore that because otherwise, for example, from(...{height:100, clearProps:"height", delay:1}) would wipe the height at the beginning of the tween and after 1 second, it'd kick back in). - var s = this.t.style, - transformParse = _specialProps.transform.parse, - a, p, i, clearTransform; - if (this.e === "all") { - s.cssText = ""; - clearTransform = true; - } else { - a = this.e.split(","); - i = a.length; - while (--i > -1) { - p = a[i]; - if (_specialProps[p]) { - if (_specialProps[p].parse === transformParse) { - clearTransform = true; - } else { - p = (p === "transformOrigin") ? _transformOriginProp : _specialProps[p].p; //ensures that special properties use the proper browser-specific property name, like "scaleX" might be "-webkit-transform" or "boxShadow" might be "-moz-box-shadow" - } - } - _removeProp(s, p); - } - } - if (clearTransform) { - _removeProp(s, _transformProp); - if (this.t._gsTransform) { - delete this.t._gsTransform; - } - } - - } - }; - _registerComplexSpecialProp("clearProps", {parser:function(t, e, p, cssp, pt) { - pt = new CSSPropTween(t, p, 0, 0, pt, 2); - pt.setRatio = _setClearPropsRatio; - pt.e = e; - pt.pr = -10; - pt.data = cssp._tween; - _hasPriority = true; - return pt; - }}); - - p = "bezier,throwProps,physicsProps,physics2D".split(","); - i = p.length; - while (i--) { - _registerPluginProp(p[i]); - } - - - - - - - - - p = CSSPlugin.prototype; - p._firstPT = null; - - //gets called when the tween renders for the first time. This kicks everything off, recording start/end values, etc. - p._onInitTween = function(target, vars, tween) { - if (!target.nodeType) { //css is only for dom elements - return false; - } - this._target = target; - this._tween = tween; - this._vars = vars; - _autoRound = vars.autoRound; - _hasPriority = false; - _suffixMap = vars.suffixMap || CSSPlugin.suffixMap; - _cs = _getComputedStyle(target, ""); - _overwriteProps = this._overwriteProps; - var style = target.style, - v, pt, pt2, first, last, next, zIndex, tpt, threeD; - if (_reqSafariFix) if (style.zIndex === "") { - v = _getStyle(target, "zIndex", _cs); - if (v === "auto" || v === "") { - //corrects a bug in [non-Android] Safari that prevents it from repainting elements in their new positions if they don't have a zIndex set. We also can't just apply this inside _parseTransform() because anything that's moved in any way (like using "left" or "top" instead of transforms like "x" and "y") can be affected, so it is best to ensure that anything that's tweening has a z-index. Setting "WebkitPerspective" to a non-zero value worked too except that on iOS Safari things would flicker randomly. Plus zIndex is less memory-intensive. - this._addLazySet(style, "zIndex", 0); - } - } - - if (typeof(vars) === "string") { - first = style.cssText; - v = _getAllStyles(target, _cs); - style.cssText = first + ";" + vars; - v = _cssDif(target, v, _getAllStyles(target)).difs; - if (!_supportsOpacity && _opacityValExp.test(vars)) { - v.opacity = parseFloat( RegExp.$1 ); - } - vars = v; - style.cssText = first; - } - this._firstPT = pt = this.parse(target, vars, null); - - if (this._transformType) { - threeD = (this._transformType === 3); - if (!_transformProp) { - style.zoom = 1; //helps correct an IE issue. - } else if (_isSafari) { - _reqSafariFix = true; - //if zIndex isn't set, iOS Safari doesn't repaint things correctly sometimes (seemingly at random). - if (style.zIndex === "") { - zIndex = _getStyle(target, "zIndex", _cs); - if (zIndex === "auto" || zIndex === "") { - this._addLazySet(style, "zIndex", 0); - } - } - //Setting WebkitBackfaceVisibility corrects 3 bugs: - // 1) [non-Android] Safari skips rendering changes to "top" and "left" that are made on the same frame/render as a transform update. - // 2) iOS Safari sometimes neglects to repaint elements in their new positions. Setting "WebkitPerspective" to a non-zero value worked too except that on iOS Safari things would flicker randomly. - // 3) Safari sometimes displayed odd artifacts when tweening the transform (or WebkitTransform) property, like ghosts of the edges of the element remained. Definitely a browser bug. - //Note: we allow the user to override the auto-setting by defining WebkitBackfaceVisibility in the vars of the tween. - if (_isSafariLT6) { - this._addLazySet(style, "WebkitBackfaceVisibility", this._vars.WebkitBackfaceVisibility || (threeD ? "visible" : "hidden")); - } - } - pt2 = pt; - while (pt2 && pt2._next) { - pt2 = pt2._next; - } - tpt = new CSSPropTween(target, "transform", 0, 0, null, 2); - this._linkCSSP(tpt, null, pt2); - tpt.setRatio = (threeD && _supports3D) ? _set3DTransformRatio : _transformProp ? _set2DTransformRatio : _setIETransformRatio; - tpt.data = this._transform || _getTransform(target, _cs, true); - _overwriteProps.pop(); //we don't want to force the overwrite of all "transform" tweens of the target - we only care about individual transform properties like scaleX, rotation, etc. The CSSPropTween constructor automatically adds the property to _overwriteProps which is why we need to pop() here. - } - - if (_hasPriority) { - //reorders the linked list in order of pr (priority) - while (pt) { - next = pt._next; - pt2 = first; - while (pt2 && pt2.pr > pt.pr) { - pt2 = pt2._next; - } - if ((pt._prev = pt2 ? pt2._prev : last)) { - pt._prev._next = pt; - } else { - first = pt; - } - if ((pt._next = pt2)) { - pt2._prev = pt; - } else { - last = pt; - } - pt = next; - } - this._firstPT = first; - } - return true; - }; - - - p.parse = function(target, vars, pt, plugin) { - var style = target.style, - p, sp, bn, en, bs, es, bsfx, esfx, isStr, rel; - for (p in vars) { - es = vars[p]; //ending value string - sp = _specialProps[p]; //SpecialProp lookup. - if (sp) { - pt = sp.parse(target, es, p, this, pt, plugin, vars); - - } else { - bs = _getStyle(target, p, _cs) + ""; - isStr = (typeof(es) === "string"); - if (p === "color" || p === "fill" || p === "stroke" || p.indexOf("Color") !== -1 || (isStr && _rgbhslExp.test(es))) { //Opera uses background: to define color sometimes in addition to backgroundColor: - if (!isStr) { - es = _parseColor(es); - es = ((es.length > 3) ? "rgba(" : "rgb(") + es.join(",") + ")"; - } - pt = _parseComplex(style, p, bs, es, true, "transparent", pt, 0, plugin); - - } else if (isStr && (es.indexOf(" ") !== -1 || es.indexOf(",") !== -1)) { - pt = _parseComplex(style, p, bs, es, true, null, pt, 0, plugin); - - } else { - bn = parseFloat(bs); - bsfx = (bn || bn === 0) ? bs.substr((bn + "").length) : ""; //remember, bs could be non-numeric like "normal" for fontWeight, so we should default to a blank suffix in that case. - - if (bs === "" || bs === "auto") { - if (p === "width" || p === "height") { - bn = _getDimension(target, p, _cs); - bsfx = "px"; - } else if (p === "left" || p === "top") { - bn = _calculateOffset(target, p, _cs); - bsfx = "px"; - } else { - bn = (p !== "opacity") ? 0 : 1; - bsfx = ""; - } - } - - rel = (isStr && es.charAt(1) === "="); - if (rel) { - en = parseInt(es.charAt(0) + "1", 10); - es = es.substr(2); - en *= parseFloat(es); - esfx = es.replace(_suffixExp, ""); - } else { - en = parseFloat(es); - esfx = isStr ? es.substr((en + "").length) || "" : ""; - } - - if (esfx === "") { - esfx = (p in _suffixMap) ? _suffixMap[p] : bsfx; //populate the end suffix, prioritizing the map, then if none is found, use the beginning suffix. - } - - es = (en || en === 0) ? (rel ? en + bn : en) + esfx : vars[p]; //ensures that any += or -= prefixes are taken care of. Record the end value before normalizing the suffix because we always want to end the tween on exactly what they intended even if it doesn't match the beginning value's suffix. - - //if the beginning/ending suffixes don't match, normalize them... - if (bsfx !== esfx) if (esfx !== "") if (en || en === 0) if (bn) { //note: if the beginning value (bn) is 0, we don't need to convert units! - bn = _convertToPixels(target, p, bn, bsfx); - if (esfx === "%") { - bn /= _convertToPixels(target, p, 100, "%") / 100; - if (vars.strictUnits !== true) { //some browsers report only "px" values instead of allowing "%" with getComputedStyle(), so we assume that if we're tweening to a %, we should start there too unless strictUnits:true is defined. This approach is particularly useful for responsive designs that use from() tweens. - bs = bn + "%"; - } - - } else if (esfx === "em") { - bn /= _convertToPixels(target, p, 1, "em"); - - //otherwise convert to pixels. - } else if (esfx !== "px") { - en = _convertToPixels(target, p, en, esfx); - esfx = "px"; //we don't use bsfx after this, so we don't need to set it to px too. - } - if (rel) if (en || en === 0) { - es = (en + bn) + esfx; //the changes we made affect relative calculations, so adjust the end value here. - } - } - - if (rel) { - en += bn; - } - - if ((bn || bn === 0) && (en || en === 0)) { //faster than isNaN(). Also, previously we required en !== bn but that doesn't really gain much performance and it prevents _parseToProxy() from working properly if beginning and ending values match but need to get tweened by an external plugin anyway. For example, a bezier tween where the target starts at left:0 and has these points: [{left:50},{left:0}] wouldn't work properly because when parsing the last point, it'd match the first (current) one and a non-tweening CSSPropTween would be recorded when we actually need a normal tween (type:0) so that things get updated during the tween properly. - pt = new CSSPropTween(style, p, bn, en - bn, pt, 0, p, (_autoRound !== false && (esfx === "px" || p === "zIndex")), 0, bs, es); - pt.xs0 = esfx; - //DEBUG: _log("tween "+p+" from "+pt.b+" ("+bn+esfx+") to "+pt.e+" with suffix: "+pt.xs0); - } else if (style[p] === undefined || !es && (es + "" === "NaN" || es == null)) { - _log("invalid " + p + " tween value: " + vars[p]); - } else { - pt = new CSSPropTween(style, p, en || bn || 0, 0, pt, -1, p, false, 0, bs, es); - pt.xs0 = (es === "none" && (p === "display" || p.indexOf("Style") !== -1)) ? bs : es; //intermediate value should typically be set immediately (end value) except for "display" or things like borderTopStyle, borderBottomStyle, etc. which should use the beginning value during the tween. - //DEBUG: _log("non-tweening value "+p+": "+pt.xs0); - } - } - } - if (plugin) if (pt && !pt.plugin) { - pt.plugin = plugin; - } - } - return pt; - }; - - - //gets called every time the tween updates, passing the new ratio (typically a value between 0 and 1, but not always (for example, if an Elastic.easeOut is used, the value can jump above 1 mid-tween). It will always start and 0 and end at 1. - p.setRatio = function(v) { - var pt = this._firstPT, - min = 0.000001, - val, str, i; - - //at the end of the tween, we set the values to exactly what we received in order to make sure non-tweening values (like "position" or "float" or whatever) are set and so that if the beginning/ending suffixes (units) didn't match and we normalized to px, the value that the user passed in is used here. We check to see if the tween is at its beginning in case it's a from() tween in which case the ratio will actually go from 1 to 0 over the course of the tween (backwards). - if (v === 1 && (this._tween._time === this._tween._duration || this._tween._time === 0)) { - while (pt) { - if (pt.type !== 2) { - pt.t[pt.p] = pt.e; - } else { - pt.setRatio(v); - } - pt = pt._next; - } - - } else if (v || !(this._tween._time === this._tween._duration || this._tween._time === 0) || this._tween._rawPrevTime === -0.000001) { - while (pt) { - val = pt.c * v + pt.s; - if (pt.r) { - val = Math.round(val); - } else if (val < min) if (val > -min) { - val = 0; - } - if (!pt.type) { - pt.t[pt.p] = val + pt.xs0; - } else if (pt.type === 1) { //complex value (one that typically has multiple numbers inside a string, like "rect(5px,10px,20px,25px)" - i = pt.l; - if (i === 2) { - pt.t[pt.p] = pt.xs0 + val + pt.xs1 + pt.xn1 + pt.xs2; - } else if (i === 3) { - pt.t[pt.p] = pt.xs0 + val + pt.xs1 + pt.xn1 + pt.xs2 + pt.xn2 + pt.xs3; - } else if (i === 4) { - pt.t[pt.p] = pt.xs0 + val + pt.xs1 + pt.xn1 + pt.xs2 + pt.xn2 + pt.xs3 + pt.xn3 + pt.xs4; - } else if (i === 5) { - pt.t[pt.p] = pt.xs0 + val + pt.xs1 + pt.xn1 + pt.xs2 + pt.xn2 + pt.xs3 + pt.xn3 + pt.xs4 + pt.xn4 + pt.xs5; - } else { - str = pt.xs0 + val + pt.xs1; - for (i = 1; i < pt.l; i++) { - str += pt["xn"+i] + pt["xs"+(i+1)]; - } - pt.t[pt.p] = str; - } - - } else if (pt.type === -1) { //non-tweening value - pt.t[pt.p] = pt.xs0; - - } else if (pt.setRatio) { //custom setRatio() for things like SpecialProps, external plugins, etc. - pt.setRatio(v); - } - pt = pt._next; - } - - //if the tween is reversed all the way back to the beginning, we need to restore the original values which may have different units (like % instead of px or em or whatever). - } else { - while (pt) { - if (pt.type !== 2) { - pt.t[pt.p] = pt.b; - } else { - pt.setRatio(v); - } - pt = pt._next; - } - } - }; - - /** - * @private - * Forces rendering of the target's transforms (rotation, scale, etc.) whenever the CSSPlugin's setRatio() is called. - * Basically, this tells the CSSPlugin to create a CSSPropTween (type 2) after instantiation that runs last in the linked - * list and calls the appropriate (3D or 2D) rendering function. We separate this into its own method so that we can call - * it from other plugins like BezierPlugin if, for example, it needs to apply an autoRotation and this CSSPlugin - * doesn't have any transform-related properties of its own. You can call this method as many times as you - * want and it won't create duplicate CSSPropTweens. - * - * @param {boolean} threeD if true, it should apply 3D tweens (otherwise, just 2D ones are fine and typically faster) - */ - p._enableTransforms = function(threeD) { - this._transformType = (threeD || this._transformType === 3) ? 3 : 2; - this._transform = this._transform || _getTransform(this._target, _cs, true); //ensures that the element has a _gsTransform property with the appropriate values. - }; - - var lazySet = function(v) { - this.t[this.p] = this.e; - this.data._linkCSSP(this, this._next, null, true); //we purposefully keep this._next even though it'd make sense to null it, but this is a performance optimization, as this happens during the while (pt) {} loop in setRatio() at the bottom of which it sets pt = pt._next, so if we null it, the linked list will be broken in that loop. - }; - /** @private Gives us a way to set a value on the first render (and only the first render). **/ - p._addLazySet = function(t, p, v) { - var pt = this._firstPT = new CSSPropTween(t, p, 0, 0, this._firstPT, 2); - pt.e = v; - pt.setRatio = lazySet; - pt.data = this; - }; - - /** @private **/ - p._linkCSSP = function(pt, next, prev, remove) { - if (pt) { - if (next) { - next._prev = pt; - } - if (pt._next) { - pt._next._prev = pt._prev; - } - if (pt._prev) { - pt._prev._next = pt._next; - } else if (this._firstPT === pt) { - this._firstPT = pt._next; - remove = true; //just to prevent resetting this._firstPT 5 lines down in case pt._next is null. (optimized for speed) - } - if (prev) { - prev._next = pt; - } else if (!remove && this._firstPT === null) { - this._firstPT = pt; - } - pt._next = next; - pt._prev = prev; - } - return pt; - }; - - //we need to make sure that if alpha or autoAlpha is killed, opacity is too. And autoAlpha affects the "visibility" property. - p._kill = function(lookup) { - var copy = lookup, - pt, p, xfirst; - if (lookup.autoAlpha || lookup.alpha) { - copy = {}; - for (p in lookup) { //copy the lookup so that we're not changing the original which may be passed elsewhere. - copy[p] = lookup[p]; - } - copy.opacity = 1; - if (copy.autoAlpha) { - copy.visibility = 1; - } - } - if (lookup.className && (pt = this._classNamePT)) { //for className tweens, we need to kill any associated CSSPropTweens too; a linked list starts at the className's "xfirst". - xfirst = pt.xfirst; - if (xfirst && xfirst._prev) { - this._linkCSSP(xfirst._prev, pt._next, xfirst._prev._prev); //break off the prev - } else if (xfirst === this._firstPT) { - this._firstPT = pt._next; - } - if (pt._next) { - this._linkCSSP(pt._next, pt._next._next, xfirst._prev); - } - this._classNamePT = null; - } - return TweenPlugin.prototype._kill.call(this, copy); - }; - - - - //used by cascadeTo() for gathering all the style properties of each child element into an array for comparison. - var _getChildStyles = function(e, props, targets) { - var children, i, child, type; - if (e.slice) { - i = e.length; - while (--i > -1) { - _getChildStyles(e[i], props, targets); - } - return; - } - children = e.childNodes; - i = children.length; - while (--i > -1) { - child = children[i]; - type = child.type; - if (child.style) { - props.push(_getAllStyles(child)); - if (targets) { - targets.push(child); - } - } - if ((type === 1 || type === 9 || type === 11) && child.childNodes.length) { - _getChildStyles(child, props, targets); - } - } - }; - - /** - * Typically only useful for className tweens that may affect child elements, this method creates a TweenLite - * and then compares the style properties of all the target's child elements at the tween's start and end, and - * if any are different, it also creates tweens for those and returns an array containing ALL of the resulting - * tweens (so that you can easily add() them to a TimelineLite, for example). The reason this functionality is - * wrapped into a separate static method of CSSPlugin instead of being integrated into all regular className tweens - * is because it creates entirely new tweens that may have completely different targets than the original tween, - * so if they were all lumped into the original tween instance, it would be inconsistent with the rest of the API - * and it would create other problems. For example: - * - If I create a tween of elementA, that tween instance may suddenly change its target to include 50 other elements (unintuitive if I specifically defined the target I wanted) - * - We can't just create new independent tweens because otherwise, what happens if the original/parent tween is reversed or pause or dropped into a TimelineLite for tight control? You'd expect that tween's behavior to affect all the others. - * - Analyzing every style property of every child before and after the tween is an expensive operation when there are many children, so this behavior shouldn't be imposed on all className tweens by default, especially since it's probably rare that this extra functionality is needed. - * - * @param {Object} target object to be tweened - * @param {number} Duration in seconds (or frames for frames-based tweens) - * @param {Object} Object containing the end values, like {className:"newClass", ease:Linear.easeNone} - * @return {Array} An array of TweenLite instances - */ - CSSPlugin.cascadeTo = function(target, duration, vars) { - var tween = TweenLite.to(target, duration, vars), - results = [tween], - b = [], - e = [], - targets = [], - _reservedProps = TweenLite._internals.reservedProps, - i, difs, p; - target = tween._targets || tween.target; - _getChildStyles(target, b, targets); - tween.render(duration, true); - _getChildStyles(target, e); - tween.render(0, true); - tween._enabled(true); - i = targets.length; - while (--i > -1) { - difs = _cssDif(targets[i], b[i], e[i]); - if (difs.firstMPT) { - difs = difs.difs; - for (p in vars) { - if (_reservedProps[p]) { - difs[p] = vars[p]; - } - } - results.push( TweenLite.to(targets[i], duration, difs) ); - } - } - return results; - }; - - TweenPlugin.activate([CSSPlugin]); - return CSSPlugin; - - }, true); - - - - - - - - - - - -/* - * ---------------------------------------------------------------- - * RoundPropsPlugin - * ---------------------------------------------------------------- - */ - (function() { - - var RoundPropsPlugin = window._gsDefine.plugin({ - propName: "roundProps", - priority: -1, - API: 2, - - //called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run. - init: function(target, value, tween) { - this._tween = tween; - return true; - } - - }), - p = RoundPropsPlugin.prototype; - - p._onInitAllProps = function() { - var tween = this._tween, - rp = (tween.vars.roundProps instanceof Array) ? tween.vars.roundProps : tween.vars.roundProps.split(","), - i = rp.length, - lookup = {}, - rpt = tween._propLookup.roundProps, - prop, pt, next; - while (--i > -1) { - lookup[rp[i]] = 1; - } - i = rp.length; - while (--i > -1) { - prop = rp[i]; - pt = tween._firstPT; - while (pt) { - next = pt._next; //record here, because it may get removed - if (pt.pg) { - pt.t._roundProps(lookup, true); - } else if (pt.n === prop) { - this._add(pt.t, prop, pt.s, pt.c); - //remove from linked list - if (next) { - next._prev = pt._prev; - } - if (pt._prev) { - pt._prev._next = next; - } else if (tween._firstPT === pt) { - tween._firstPT = next; - } - pt._next = pt._prev = null; - tween._propLookup[prop] = rpt; - } - pt = next; - } - } - return false; - }; - - p._add = function(target, p, s, c) { - this._addTween(target, p, s, s + c, p, true); - this._overwriteProps.push(p); - }; - - }()); - - - - - - - - - - -/* - * ---------------------------------------------------------------- - * AttrPlugin - * ---------------------------------------------------------------- - */ - window._gsDefine.plugin({ - propName: "attr", - API: 2, - version: "0.3.2", - - //called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run. - init: function(target, value, tween) { - var p, start, end; - if (typeof(target.setAttribute) !== "function") { - return false; - } - this._target = target; - this._proxy = {}; - this._start = {}; // we record start and end values exactly as they are in case they're strings (not numbers) - we need to be able to revert to them cleanly. - this._end = {}; - for (p in value) { - this._start[p] = this._proxy[p] = start = target.getAttribute(p); - end = this._addTween(this._proxy, p, parseFloat(start), value[p], p); - this._end[p] = end ? end.s + end.c : value[p]; - this._overwriteProps.push(p); - } - return true; - }, - - //called each time the values should be updated, and the ratio gets passed as the only parameter (typically it's a value between 0 and 1, but it can exceed those when using an ease like Elastic.easeOut or Back.easeOut, etc.) - set: function(ratio) { - this._super.setRatio.call(this, ratio); - var props = this._overwriteProps, - i = props.length, - lookup = (ratio === 1) ? this._end : ratio ? this._proxy : this._start, - p; - while (--i > -1) { - p = props[i]; - this._target.setAttribute(p, lookup[p] + ""); - } - } - - }); - - - - - - - - - - -/* - * ---------------------------------------------------------------- - * DirectionalRotationPlugin - * ---------------------------------------------------------------- - */ - window._gsDefine.plugin({ - propName: "directionalRotation", - API: 2, - version: "0.2.0", - - //called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run. - init: function(target, value, tween) { - if (typeof(value) !== "object") { - value = {rotation:value}; - } - this.finals = {}; - var cap = (value.useRadians === true) ? Math.PI * 2 : 360, - min = 0.000001, - p, v, start, end, dif, split; - for (p in value) { - if (p !== "useRadians") { - split = (value[p] + "").split("_"); - v = split[0]; - start = parseFloat( (typeof(target[p]) !== "function") ? target[p] : target[ ((p.indexOf("set") || typeof(target["get" + p.substr(3)]) !== "function") ? p : "get" + p.substr(3)) ]() ); - end = this.finals[p] = (typeof(v) === "string" && v.charAt(1) === "=") ? start + parseInt(v.charAt(0) + "1", 10) * Number(v.substr(2)) : Number(v) || 0; - dif = end - start; - if (split.length) { - v = split.join("_"); - if (v.indexOf("short") !== -1) { - dif = dif % cap; - if (dif !== dif % (cap / 2)) { - dif = (dif < 0) ? dif + cap : dif - cap; - } - } - if (v.indexOf("_cw") !== -1 && dif < 0) { - dif = ((dif + cap * 9999999999) % cap) - ((dif / cap) | 0) * cap; - } else if (v.indexOf("ccw") !== -1 && dif > 0) { - dif = ((dif - cap * 9999999999) % cap) - ((dif / cap) | 0) * cap; - } - } - if (dif > min || dif < -min) { - this._addTween(target, p, start, start + dif, p); - this._overwriteProps.push(p); - } - } - } - return true; - }, - - //called each time the values should be updated, and the ratio gets passed as the only parameter (typically it's a value between 0 and 1, but it can exceed those when using an ease like Elastic.easeOut or Back.easeOut, etc.) - set: function(ratio) { - var pt; - if (ratio !== 1) { - this._super.setRatio.call(this, ratio); - } else { - pt = this._firstPT; - while (pt) { - if (pt.f) { - pt.t[pt.p](this.finals[pt.p]); - } else { - pt.t[pt.p] = this.finals[pt.p]; - } - pt = pt._next; - } - } - } - - })._autoCSS = true; - - - - - - - - - - - -/* - * ---------------------------------------------------------------- - * EasePack - * ---------------------------------------------------------------- - */ - window._gsDefine("easing.Back", ["easing.Ease"], function(Ease) { - - var w = (window.GreenSockGlobals || window), - gs = w.com.greensock, - _2PI = Math.PI * 2, - _HALF_PI = Math.PI / 2, - _class = gs._class, - _create = function(n, f) { - var C = _class("easing." + n, function(){}, true), - p = C.prototype = new Ease(); - p.constructor = C; - p.getRatio = f; - return C; - }, - _easeReg = Ease.register || function(){}, //put an empty function in place just as a safety measure in case someone loads an OLD version of TweenLite.js where Ease.register doesn't exist. - _wrap = function(name, EaseOut, EaseIn, EaseInOut, aliases) { - var C = _class("easing."+name, { - easeOut:new EaseOut(), - easeIn:new EaseIn(), - easeInOut:new EaseInOut() - }, true); - _easeReg(C, name); - return C; - }, - EasePoint = function(time, value, next) { - this.t = time; - this.v = value; - if (next) { - this.next = next; - next.prev = this; - this.c = next.v - value; - this.gap = next.t - time; - } - }, - - //Back - _createBack = function(n, f) { - var C = _class("easing." + n, function(overshoot) { - this._p1 = (overshoot || overshoot === 0) ? overshoot : 1.70158; - this._p2 = this._p1 * 1.525; - }, true), - p = C.prototype = new Ease(); - p.constructor = C; - p.getRatio = f; - p.config = function(overshoot) { - return new C(overshoot); - }; - return C; - }, - - Back = _wrap("Back", - _createBack("BackOut", function(p) { - return ((p = p - 1) * p * ((this._p1 + 1) * p + this._p1) + 1); - }), - _createBack("BackIn", function(p) { - return p * p * ((this._p1 + 1) * p - this._p1); - }), - _createBack("BackInOut", function(p) { - return ((p *= 2) < 1) ? 0.5 * p * p * ((this._p2 + 1) * p - this._p2) : 0.5 * ((p -= 2) * p * ((this._p2 + 1) * p + this._p2) + 2); - }) - ), - - - //SlowMo - SlowMo = _class("easing.SlowMo", function(linearRatio, power, yoyoMode) { - power = (power || power === 0) ? power : 0.7; - if (linearRatio == null) { - linearRatio = 0.7; - } else if (linearRatio > 1) { - linearRatio = 1; - } - this._p = (linearRatio !== 1) ? power : 0; - this._p1 = (1 - linearRatio) / 2; - this._p2 = linearRatio; - this._p3 = this._p1 + this._p2; - this._calcEnd = (yoyoMode === true); - }, true), - p = SlowMo.prototype = new Ease(), - SteppedEase, RoughEase, _createElastic; - - p.constructor = SlowMo; - p.getRatio = function(p) { - var r = p + (0.5 - p) * this._p; - if (p < this._p1) { - return this._calcEnd ? 1 - ((p = 1 - (p / this._p1)) * p) : r - ((p = 1 - (p / this._p1)) * p * p * p * r); - } else if (p > this._p3) { - return this._calcEnd ? 1 - (p = (p - this._p3) / this._p1) * p : r + ((p - r) * (p = (p - this._p3) / this._p1) * p * p * p); - } - return this._calcEnd ? 1 : r; - }; - SlowMo.ease = new SlowMo(0.7, 0.7); - - p.config = SlowMo.config = function(linearRatio, power, yoyoMode) { - return new SlowMo(linearRatio, power, yoyoMode); - }; - - - //SteppedEase - SteppedEase = _class("easing.SteppedEase", function(steps) { - steps = steps || 1; - this._p1 = 1 / steps; - this._p2 = steps + 1; - }, true); - p = SteppedEase.prototype = new Ease(); - p.constructor = SteppedEase; - p.getRatio = function(p) { - if (p < 0) { - p = 0; - } else if (p >= 1) { - p = 0.999999999; - } - return ((this._p2 * p) >> 0) * this._p1; - }; - p.config = SteppedEase.config = function(steps) { - return new SteppedEase(steps); - }; - - - //RoughEase - RoughEase = _class("easing.RoughEase", function(vars) { - vars = vars || {}; - var taper = vars.taper || "none", - a = [], - cnt = 0, - points = (vars.points || 20) | 0, - i = points, - randomize = (vars.randomize !== false), - clamp = (vars.clamp === true), - template = (vars.template instanceof Ease) ? vars.template : null, - strength = (typeof(vars.strength) === "number") ? vars.strength * 0.4 : 0.4, - x, y, bump, invX, obj, pnt; - while (--i > -1) { - x = randomize ? Math.random() : (1 / points) * i; - y = template ? template.getRatio(x) : x; - if (taper === "none") { - bump = strength; - } else if (taper === "out") { - invX = 1 - x; - bump = invX * invX * strength; - } else if (taper === "in") { - bump = x * x * strength; - } else if (x < 0.5) { //"both" (start) - invX = x * 2; - bump = invX * invX * 0.5 * strength; - } else { //"both" (end) - invX = (1 - x) * 2; - bump = invX * invX * 0.5 * strength; - } - if (randomize) { - y += (Math.random() * bump) - (bump * 0.5); - } else if (i % 2) { - y += bump * 0.5; - } else { - y -= bump * 0.5; - } - if (clamp) { - if (y > 1) { - y = 1; - } else if (y < 0) { - y = 0; - } - } - a[cnt++] = {x:x, y:y}; - } - a.sort(function(a, b) { - return a.x - b.x; - }); - - pnt = new EasePoint(1, 1, null); - i = points; - while (--i > -1) { - obj = a[i]; - pnt = new EasePoint(obj.x, obj.y, pnt); - } - - this._prev = new EasePoint(0, 0, (pnt.t !== 0) ? pnt : pnt.next); - }, true); - p = RoughEase.prototype = new Ease(); - p.constructor = RoughEase; - p.getRatio = function(p) { - var pnt = this._prev; - if (p > pnt.t) { - while (pnt.next && p >= pnt.t) { - pnt = pnt.next; - } - pnt = pnt.prev; - } else { - while (pnt.prev && p <= pnt.t) { - pnt = pnt.prev; - } - } - this._prev = pnt; - return (pnt.v + ((p - pnt.t) / pnt.gap) * pnt.c); - }; - p.config = function(vars) { - return new RoughEase(vars); - }; - RoughEase.ease = new RoughEase(); - - - //Bounce - _wrap("Bounce", - _create("BounceOut", function(p) { - if (p < 1 / 2.75) { - return 7.5625 * p * p; - } else if (p < 2 / 2.75) { - return 7.5625 * (p -= 1.5 / 2.75) * p + 0.75; - } else if (p < 2.5 / 2.75) { - return 7.5625 * (p -= 2.25 / 2.75) * p + 0.9375; - } - return 7.5625 * (p -= 2.625 / 2.75) * p + 0.984375; - }), - _create("BounceIn", function(p) { - if ((p = 1 - p) < 1 / 2.75) { - return 1 - (7.5625 * p * p); - } else if (p < 2 / 2.75) { - return 1 - (7.5625 * (p -= 1.5 / 2.75) * p + 0.75); - } else if (p < 2.5 / 2.75) { - return 1 - (7.5625 * (p -= 2.25 / 2.75) * p + 0.9375); - } - return 1 - (7.5625 * (p -= 2.625 / 2.75) * p + 0.984375); - }), - _create("BounceInOut", function(p) { - var invert = (p < 0.5); - if (invert) { - p = 1 - (p * 2); - } else { - p = (p * 2) - 1; - } - if (p < 1 / 2.75) { - p = 7.5625 * p * p; - } else if (p < 2 / 2.75) { - p = 7.5625 * (p -= 1.5 / 2.75) * p + 0.75; - } else if (p < 2.5 / 2.75) { - p = 7.5625 * (p -= 2.25 / 2.75) * p + 0.9375; - } else { - p = 7.5625 * (p -= 2.625 / 2.75) * p + 0.984375; - } - return invert ? (1 - p) * 0.5 : p * 0.5 + 0.5; - }) - ); - - - //CIRC - _wrap("Circ", - _create("CircOut", function(p) { - return Math.sqrt(1 - (p = p - 1) * p); - }), - _create("CircIn", function(p) { - return -(Math.sqrt(1 - (p * p)) - 1); - }), - _create("CircInOut", function(p) { - return ((p*=2) < 1) ? -0.5 * (Math.sqrt(1 - p * p) - 1) : 0.5 * (Math.sqrt(1 - (p -= 2) * p) + 1); - }) - ); - - - //Elastic - _createElastic = function(n, f, def) { - var C = _class("easing." + n, function(amplitude, period) { - this._p1 = amplitude || 1; - this._p2 = period || def; - this._p3 = this._p2 / _2PI * (Math.asin(1 / this._p1) || 0); - }, true), - p = C.prototype = new Ease(); - p.constructor = C; - p.getRatio = f; - p.config = function(amplitude, period) { - return new C(amplitude, period); - }; - return C; - }; - _wrap("Elastic", - _createElastic("ElasticOut", function(p) { - return this._p1 * Math.pow(2, -10 * p) * Math.sin( (p - this._p3) * _2PI / this._p2 ) + 1; - }, 0.3), - _createElastic("ElasticIn", function(p) { - return -(this._p1 * Math.pow(2, 10 * (p -= 1)) * Math.sin( (p - this._p3) * _2PI / this._p2 )); - }, 0.3), - _createElastic("ElasticInOut", function(p) { - return ((p *= 2) < 1) ? -0.5 * (this._p1 * Math.pow(2, 10 * (p -= 1)) * Math.sin( (p - this._p3) * _2PI / this._p2)) : this._p1 * Math.pow(2, -10 *(p -= 1)) * Math.sin( (p - this._p3) * _2PI / this._p2 ) *0.5 + 1; - }, 0.45) - ); - - - //Expo - _wrap("Expo", - _create("ExpoOut", function(p) { - return 1 - Math.pow(2, -10 * p); - }), - _create("ExpoIn", function(p) { - return Math.pow(2, 10 * (p - 1)) - 0.001; - }), - _create("ExpoInOut", function(p) { - return ((p *= 2) < 1) ? 0.5 * Math.pow(2, 10 * (p - 1)) : 0.5 * (2 - Math.pow(2, -10 * (p - 1))); - }) - ); - - - //Sine - _wrap("Sine", - _create("SineOut", function(p) { - return Math.sin(p * _HALF_PI); - }), - _create("SineIn", function(p) { - return -Math.cos(p * _HALF_PI) + 1; - }), - _create("SineInOut", function(p) { - return -0.5 * (Math.cos(Math.PI * p) - 1); - }) - ); - - _class("easing.EaseLookup", { - find:function(s) { - return Ease.map[s]; - } - }, true); - - //register the non-standard eases - _easeReg(w.SlowMo, "SlowMo", "ease,"); - _easeReg(RoughEase, "RoughEase", "ease,"); - _easeReg(SteppedEase, "SteppedEase", "ease,"); - - return Back; - - }, true); - - -}); - - - - - - - - - - - -/* - * ---------------------------------------------------------------- - * Base classes like TweenLite, SimpleTimeline, Ease, Ticker, etc. - * ---------------------------------------------------------------- - */ -(function(window) { - - "use strict"; - var _globals = window.GreenSockGlobals || window; - if (_globals.TweenLite) { - return; //in case the core set of classes is already loaded, don't instantiate twice. - } - var _namespace = function(ns) { - var a = ns.split("."), - p = _globals, i; - for (i = 0; i < a.length; i++) { - p[a[i]] = p = p[a[i]] || {}; - } - return p; - }, - gs = _namespace("com.greensock"), - _tinyNum = 0.0000000001, - _slice = [].slice, - _emptyFunc = function() {}, - _isArray = (function() { //works around issues in iframe environments where the Array global isn't shared, thus if the object originates in a different window/iframe, "(obj instanceof Array)" will evaluate false. We added some speed optimizations to avoid Object.prototype.toString.call() unless it's absolutely necessary because it's VERY slow (like 20x slower) - var toString = Object.prototype.toString, - array = toString.call([]); - return function(obj) { - return obj != null && (obj instanceof Array || (typeof(obj) === "object" && !!obj.push && toString.call(obj) === array)); - }; - }()), - a, i, p, _ticker, _tickerActive, - _defLookup = {}, - - /** - * @constructor - * Defines a GreenSock class, optionally with an array of dependencies that must be instantiated first and passed into the definition. - * This allows users to load GreenSock JS files in any order even if they have interdependencies (like CSSPlugin extends TweenPlugin which is - * inside TweenLite.js, but if CSSPlugin is loaded first, it should wait to run its code until TweenLite.js loads and instantiates TweenPlugin - * and then pass TweenPlugin to CSSPlugin's definition). This is all done automatically and internally. - * - * Every definition will be added to a "com.greensock" global object (typically window, but if a window.GreenSockGlobals object is found, - * it will go there as of v1.7). For example, TweenLite will be found at window.com.greensock.TweenLite and since it's a global class that should be available anywhere, - * it is ALSO referenced at window.TweenLite. However some classes aren't considered global, like the base com.greensock.core.Animation class, so - * those will only be at the package like window.com.greensock.core.Animation. Again, if you define a GreenSockGlobals object on the window, everything - * gets tucked neatly inside there instead of on the window directly. This allows you to do advanced things like load multiple versions of GreenSock - * files and put them into distinct objects (imagine a banner ad uses a newer version but the main site uses an older one). In that case, you could - * sandbox the banner one like: - * - * <script> - * var gs = window.GreenSockGlobals = {}; //the newer version we're about to load could now be referenced in a "gs" object, like gs.TweenLite.to(...). Use whatever alias you want as long as it's unique, "gs" or "banner" or whatever. - * </script> - * <script src="js/greensock/v1.7/TweenMax.js"></script> - * <script> - * window.GreenSockGlobals = null; //reset it back to null so that the next load of TweenMax affects the window and we can reference things directly like TweenLite.to(...) - * </script> - * <script src="js/greensock/v1.6/TweenMax.js"></script> - * <script> - * gs.TweenLite.to(...); //would use v1.7 - * TweenLite.to(...); //would use v1.6 - * </script> - * - * @param {!string} ns The namespace of the class definition, leaving off "com.greensock." as that's assumed. For example, "TweenLite" or "plugins.CSSPlugin" or "easing.Back". - * @param {!Array.<string>} dependencies An array of dependencies (described as their namespaces minus "com.greensock." prefix). For example ["TweenLite","plugins.TweenPlugin","core.Animation"] - * @param {!function():Object} func The function that should be called and passed the resolved dependencies which will return the actual class for this definition. - * @param {boolean=} global If true, the class will be added to the global scope (typically window unless you define a window.GreenSockGlobals object) - */ - Definition = function(ns, dependencies, func, global) { - this.sc = (_defLookup[ns]) ? _defLookup[ns].sc : []; //subclasses - _defLookup[ns] = this; - this.gsClass = null; - this.func = func; - var _classes = []; - this.check = function(init) { - var i = dependencies.length, - missing = i, - cur, a, n, cl; - while (--i > -1) { - if ((cur = _defLookup[dependencies[i]] || new Definition(dependencies[i], [])).gsClass) { - _classes[i] = cur.gsClass; - missing--; - } else if (init) { - cur.sc.push(this); - } - } - if (missing === 0 && func) { - a = ("com.greensock." + ns).split("."); - n = a.pop(); - cl = _namespace(a.join("."))[n] = this.gsClass = func.apply(func, _classes); - - //exports to multiple environments - if (global) { - _globals[n] = cl; //provides a way to avoid global namespace pollution. By default, the main classes like TweenLite, Power1, Strong, etc. are added to window unless a GreenSockGlobals is defined. So if you want to have things added to a custom object instead, just do something like window.GreenSockGlobals = {} before loading any GreenSock files. You can even set up an alias like window.GreenSockGlobals = windows.gs = {} so that you can access everything like gs.TweenLite. Also remember that ALL classes are added to the window.com.greensock object (in their respective packages, like com.greensock.easing.Power1, com.greensock.TweenLite, etc.) - if (typeof(define) === "function" && define.amd){ //AMD - define((window.GreenSockAMDPath ? window.GreenSockAMDPath + "/" : "") + ns.split(".").join("/"), [], function() { return cl; }); - } else if (typeof(module) !== "undefined" && module.exports){ //node - module.exports = cl; - } - } - for (i = 0; i < this.sc.length; i++) { - this.sc[i].check(); - } - } - }; - this.check(true); - }, - - //used to create Definition instances (which basically registers a class that has dependencies). - _gsDefine = window._gsDefine = function(ns, dependencies, func, global) { - return new Definition(ns, dependencies, func, global); - }, - - //a quick way to create a class that doesn't have any dependencies. Returns the class, but first registers it in the GreenSock namespace so that other classes can grab it (other classes might be dependent on the class). - _class = gs._class = function(ns, func, global) { - func = func || function() {}; - _gsDefine(ns, [], function(){ return func; }, global); - return func; - }; - - _gsDefine.globals = _globals; - - - -/* - * ---------------------------------------------------------------- - * Ease - * ---------------------------------------------------------------- - */ - var _baseParams = [0, 0, 1, 1], - _blankArray = [], - Ease = _class("easing.Ease", function(func, extraParams, type, power) { - this._func = func; - this._type = type || 0; - this._power = power || 0; - this._params = extraParams ? _baseParams.concat(extraParams) : _baseParams; - }, true), - _easeMap = Ease.map = {}, - _easeReg = Ease.register = function(ease, names, types, create) { - var na = names.split(","), - i = na.length, - ta = (types || "easeIn,easeOut,easeInOut").split(","), - e, name, j, type; - while (--i > -1) { - name = na[i]; - e = create ? _class("easing."+name, null, true) : gs.easing[name] || {}; - j = ta.length; - while (--j > -1) { - type = ta[j]; - _easeMap[name + "." + type] = _easeMap[type + name] = e[type] = ease.getRatio ? ease : ease[type] || new ease(); - } - } - }; - - p = Ease.prototype; - p._calcEnd = false; - p.getRatio = function(p) { - if (this._func) { - this._params[0] = p; - return this._func.apply(null, this._params); - } - var t = this._type, - pw = this._power, - r = (t === 1) ? 1 - p : (t === 2) ? p : (p < 0.5) ? p * 2 : (1 - p) * 2; - if (pw === 1) { - r *= r; - } else if (pw === 2) { - r *= r * r; - } else if (pw === 3) { - r *= r * r * r; - } else if (pw === 4) { - r *= r * r * r * r; - } - return (t === 1) ? 1 - r : (t === 2) ? r : (p < 0.5) ? r / 2 : 1 - (r / 2); - }; - - //create all the standard eases like Linear, Quad, Cubic, Quart, Quint, Strong, Power0, Power1, Power2, Power3, and Power4 (each with easeIn, easeOut, and easeInOut) - a = ["Linear","Quad","Cubic","Quart","Quint,Strong"]; - i = a.length; - while (--i > -1) { - p = a[i]+",Power"+i; - _easeReg(new Ease(null,null,1,i), p, "easeOut", true); - _easeReg(new Ease(null,null,2,i), p, "easeIn" + ((i === 0) ? ",easeNone" : "")); - _easeReg(new Ease(null,null,3,i), p, "easeInOut"); - } - _easeMap.linear = gs.easing.Linear.easeIn; - _easeMap.swing = gs.easing.Quad.easeInOut; //for jQuery folks - - -/* - * ---------------------------------------------------------------- - * EventDispatcher - * ---------------------------------------------------------------- - */ - var EventDispatcher = _class("events.EventDispatcher", function(target) { - this._listeners = {}; - this._eventTarget = target || this; - }); - p = EventDispatcher.prototype; - - p.addEventListener = function(type, callback, scope, useParam, priority) { - priority = priority || 0; - var list = this._listeners[type], - index = 0, - listener, i; - if (list == null) { - this._listeners[type] = list = []; - } - i = list.length; - while (--i > -1) { - listener = list[i]; - if (listener.c === callback && listener.s === scope) { - list.splice(i, 1); - } else if (index === 0 && listener.pr < priority) { - index = i + 1; - } - } - list.splice(index, 0, {c:callback, s:scope, up:useParam, pr:priority}); - if (this === _ticker && !_tickerActive) { - _ticker.wake(); - } - }; - - p.removeEventListener = function(type, callback) { - var list = this._listeners[type], i; - if (list) { - i = list.length; - while (--i > -1) { - if (list[i].c === callback) { - list.splice(i, 1); - return; - } - } - } - }; - - p.dispatchEvent = function(type) { - var list = this._listeners[type], - i, t, listener; - if (list) { - i = list.length; - t = this._eventTarget; - while (--i > -1) { - listener = list[i]; - if (listener.up) { - listener.c.call(listener.s || t, {type:type, target:t}); - } else { - listener.c.call(listener.s || t); - } - } - } - }; - - -/* - * ---------------------------------------------------------------- - * Ticker - * ---------------------------------------------------------------- - */ - var _reqAnimFrame = window.requestAnimationFrame, - _cancelAnimFrame = window.cancelAnimationFrame, - _getTime = Date.now || function() {return new Date().getTime();}, - _lastUpdate = _getTime(); - - //now try to determine the requestAnimationFrame and cancelAnimationFrame functions and if none are found, we'll use a setTimeout()/clearTimeout() polyfill. - a = ["ms","moz","webkit","o"]; - i = a.length; - while (--i > -1 && !_reqAnimFrame) { - _reqAnimFrame = window[a[i] + "RequestAnimationFrame"]; - _cancelAnimFrame = window[a[i] + "CancelAnimationFrame"] || window[a[i] + "CancelRequestAnimationFrame"]; - } - - _class("Ticker", function(fps, useRAF) { - var _self = this, - _startTime = _getTime(), - _useRAF = (useRAF !== false && _reqAnimFrame), - _lagThreshold = 500, - _adjustedLag = 33, - _fps, _req, _id, _gap, _nextTime, - _tick = function(manual) { - var elapsed = _getTime() - _lastUpdate, - overlap, dispatch; - if (elapsed > _lagThreshold) { - _startTime += elapsed - _adjustedLag; - } - _lastUpdate += elapsed; - _self.time = (_lastUpdate - _startTime) / 1000; - overlap = _self.time - _nextTime; - if (!_fps || overlap > 0 || manual === true) { - _self.frame++; - _nextTime += overlap + (overlap >= _gap ? 0.004 : _gap - overlap); - dispatch = true; - } - if (manual !== true) { //make sure the request is made before we dispatch the "tick" event so that timing is maintained. Otherwise, if processing the "tick" requires a bunch of time (like 15ms) and we're using a setTimeout() that's based on 16.7ms, it'd technically take 31.7ms between frames otherwise. - _id = _req(_tick); - } - if (dispatch) { - _self.dispatchEvent("tick"); - } - }; - - EventDispatcher.call(_self); - _self.time = _self.frame = 0; - _self.tick = function() { - _tick(true); - }; - - _self.lagSmoothing = function(threshold, adjustedLag) { - _lagThreshold = threshold || (1 / _tinyNum); //zero should be interpreted as basically unlimited - _adjustedLag = Math.min(adjustedLag, _lagThreshold, 0); - }; - - _self.sleep = function() { - if (_id == null) { - return; - } - if (!_useRAF || !_cancelAnimFrame) { - clearTimeout(_id); - } else { - _cancelAnimFrame(_id); - } - _req = _emptyFunc; - _id = null; - if (_self === _ticker) { - _tickerActive = false; - } - }; - - _self.wake = function() { - if (_id !== null) { - _self.sleep(); - } else if (_self.frame > 10) { //don't trigger lagSmoothing if we're just waking up, and make sure that at least 10 frames have elapsed because of the iOS bug that we work around below with the 1.5-second setTimout(). - _lastUpdate = _getTime() - _lagThreshold + 5; - } - _req = (_fps === 0) ? _emptyFunc : (!_useRAF || !_reqAnimFrame) ? function(f) { return setTimeout(f, ((_nextTime - _self.time) * 1000 + 1) | 0); } : _reqAnimFrame; - if (_self === _ticker) { - _tickerActive = true; - } - _tick(2); - }; - - _self.fps = function(value) { - if (!arguments.length) { - return _fps; - } - _fps = value; - _gap = 1 / (_fps || 60); - _nextTime = this.time + _gap; - _self.wake(); - }; - - _self.useRAF = function(value) { - if (!arguments.length) { - return _useRAF; - } - _self.sleep(); - _useRAF = value; - _self.fps(_fps); - }; - _self.fps(fps); - - //a bug in iOS 6 Safari occasionally prevents the requestAnimationFrame from working initially, so we use a 1.5-second timeout that automatically falls back to setTimeout() if it senses this condition. - setTimeout(function() { - if (_useRAF && (!_id || _self.frame < 5)) { - _self.useRAF(false); - } - }, 1500); - }); - - p = gs.Ticker.prototype = new gs.events.EventDispatcher(); - p.constructor = gs.Ticker; - - -/* - * ---------------------------------------------------------------- - * Animation - * ---------------------------------------------------------------- - */ - var Animation = _class("core.Animation", function(duration, vars) { - this.vars = vars = vars || {}; - this._duration = this._totalDuration = duration || 0; - this._delay = Number(vars.delay) || 0; - this._timeScale = 1; - this._active = (vars.immediateRender === true); - this.data = vars.data; - this._reversed = (vars.reversed === true); - - if (!_rootTimeline) { - return; - } - if (!_tickerActive) { //some browsers (like iOS 6 Safari) shut down JavaScript execution when the tab is disabled and they [occasionally] neglect to start up requestAnimationFrame again when returning - this code ensures that the engine starts up again properly. - _ticker.wake(); - } - - var tl = this.vars.useFrames ? _rootFramesTimeline : _rootTimeline; - tl.add(this, tl._time); - - if (this.vars.paused) { - this.paused(true); - } - }); - - _ticker = Animation.ticker = new gs.Ticker(); - p = Animation.prototype; - p._dirty = p._gc = p._initted = p._paused = false; - p._totalTime = p._time = 0; - p._rawPrevTime = -1; - p._next = p._last = p._onUpdate = p._timeline = p.timeline = null; - p._paused = false; - - - //some browsers (like iOS) occasionally drop the requestAnimationFrame event when the user switches to a different tab and then comes back again, so we use a 2-second setTimeout() to sense if/when that condition occurs and then wake() the ticker. - var _checkTimeout = function() { - if (_tickerActive && _getTime() - _lastUpdate > 2000) { - _ticker.wake(); - } - setTimeout(_checkTimeout, 2000); - }; - _checkTimeout(); - - - p.play = function(from, suppressEvents) { - if (from != null) { - this.seek(from, suppressEvents); - } - return this.reversed(false).paused(false); - }; - - p.pause = function(atTime, suppressEvents) { - if (atTime != null) { - this.seek(atTime, suppressEvents); - } - return this.paused(true); - }; - - p.resume = function(from, suppressEvents) { - if (from != null) { - this.seek(from, suppressEvents); - } - return this.paused(false); - }; - - p.seek = function(time, suppressEvents) { - return this.totalTime(Number(time), suppressEvents !== false); - }; - - p.restart = function(includeDelay, suppressEvents) { - return this.reversed(false).paused(false).totalTime(includeDelay ? -this._delay : 0, (suppressEvents !== false), true); - }; - - p.reverse = function(from, suppressEvents) { - if (from != null) { - this.seek((from || this.totalDuration()), suppressEvents); - } - return this.reversed(true).paused(false); - }; - - p.render = function(time, suppressEvents, force) { - //stub - we override this method in subclasses. - }; - - p.invalidate = function() { - return this; - }; - - p.isActive = function() { - var tl = this._timeline, //the 2 root timelines won't have a _timeline; they're always active. - startTime = this._startTime, - rawTime; - return (!tl || (!this._gc && !this._paused && tl.isActive() && (rawTime = tl.rawTime()) >= startTime && rawTime < startTime + this.totalDuration() / this._timeScale)); - }; - - p._enabled = function (enabled, ignoreTimeline) { - if (!_tickerActive) { - _ticker.wake(); - } - this._gc = !enabled; - this._active = this.isActive(); - if (ignoreTimeline !== true) { - if (enabled && !this.timeline) { - this._timeline.add(this, this._startTime - this._delay); - } else if (!enabled && this.timeline) { - this._timeline._remove(this, true); - } - } - return false; - }; - - - p._kill = function(vars, target) { - return this._enabled(false, false); - }; - - p.kill = function(vars, target) { - this._kill(vars, target); - return this; - }; - - p._uncache = function(includeSelf) { - var tween = includeSelf ? this : this.timeline; - while (tween) { - tween._dirty = true; - tween = tween.timeline; - } - return this; - }; - - p._swapSelfInParams = function(params) { - var i = params.length, - copy = params.concat(); - while (--i > -1) { - if (params[i] === "{self}") { - copy[i] = this; - } - } - return copy; - }; - -//----Animation getters/setters -------------------------------------------------------- - - p.eventCallback = function(type, callback, params, scope) { - if ((type || "").substr(0,2) === "on") { - var v = this.vars; - if (arguments.length === 1) { - return v[type]; - } - if (callback == null) { - delete v[type]; - } else { - v[type] = callback; - v[type + "Params"] = (_isArray(params) && params.join("").indexOf("{self}") !== -1) ? this._swapSelfInParams(params) : params; - v[type + "Scope"] = scope; - } - if (type === "onUpdate") { - this._onUpdate = callback; - } - } - return this; - }; - - p.delay = function(value) { - if (!arguments.length) { - return this._delay; - } - if (this._timeline.smoothChildTiming) { - this.startTime( this._startTime + value - this._delay ); - } - this._delay = value; - return this; - }; - - p.duration = function(value) { - if (!arguments.length) { - this._dirty = false; - return this._duration; - } - this._duration = this._totalDuration = value; - this._uncache(true); //true in case it's a TweenMax or TimelineMax that has a repeat - we'll need to refresh the totalDuration. - if (this._timeline.smoothChildTiming) if (this._time > 0) if (this._time < this._duration) if (value !== 0) { - this.totalTime(this._totalTime * (value / this._duration), true); - } - return this; - }; - - p.totalDuration = function(value) { - this._dirty = false; - return (!arguments.length) ? this._totalDuration : this.duration(value); - }; - - p.time = function(value, suppressEvents) { - if (!arguments.length) { - return this._time; - } - if (this._dirty) { - this.totalDuration(); - } - return this.totalTime((value > this._duration) ? this._duration : value, suppressEvents); - }; - - p.totalTime = function(time, suppressEvents, uncapped) { - if (!_tickerActive) { - _ticker.wake(); - } - if (!arguments.length) { - return this._totalTime; - } - if (this._timeline) { - if (time < 0 && !uncapped) { - time += this.totalDuration(); - } - if (this._timeline.smoothChildTiming) { - if (this._dirty) { - this.totalDuration(); - } - var totalDuration = this._totalDuration, - tl = this._timeline; - if (time > totalDuration && !uncapped) { - time = totalDuration; - } - this._startTime = (this._paused ? this._pauseTime : tl._time) - ((!this._reversed ? time : totalDuration - time) / this._timeScale); - if (!tl._dirty) { //for performance improvement. If the parent's cache is already dirty, it already took care of marking the ancestors as dirty too, so skip the function call here. - this._uncache(false); - } - //in case any of the ancestor timelines had completed but should now be enabled, we should reset their totalTime() which will also ensure that they're lined up properly and enabled. Skip for animations that are on the root (wasteful). Example: a TimelineLite.exportRoot() is performed when there's a paused tween on the root, the export will not complete until that tween is unpaused, but imagine a child gets restarted later, after all [unpaused] tweens have completed. The startTime of that child would get pushed out, but one of the ancestors may have completed. - if (tl._timeline) { - while (tl._timeline) { - if (tl._timeline._time !== (tl._startTime + tl._totalTime) / tl._timeScale) { - tl.totalTime(tl._totalTime, true); - } - tl = tl._timeline; - } - } - } - if (this._gc) { - this._enabled(true, false); - } - if (this._totalTime !== time || this._duration === 0) { - this.render(time, suppressEvents, false); - if (_lazyTweens.length) { //in case rendering caused any tweens to lazy-init, we should render them because typically when someone calls seek() or time() or progress(), they expect an immediate render. - _lazyRender(); - } - } - } - return this; - }; - - p.progress = p.totalProgress = function(value, suppressEvents) { - return (!arguments.length) ? this._time / this.duration() : this.totalTime(this.duration() * value, suppressEvents); - }; - - p.startTime = function(value) { - if (!arguments.length) { - return this._startTime; - } - if (value !== this._startTime) { - this._startTime = value; - if (this.timeline) if (this.timeline._sortChildren) { - this.timeline.add(this, value - this._delay); //ensures that any necessary re-sequencing of Animations in the timeline occurs to make sure the rendering order is correct. - } - } - return this; - }; - - p.timeScale = function(value) { - if (!arguments.length) { - return this._timeScale; - } - value = value || _tinyNum; //can't allow zero because it'll throw the math off - if (this._timeline && this._timeline.smoothChildTiming) { - var pauseTime = this._pauseTime, - t = (pauseTime || pauseTime === 0) ? pauseTime : this._timeline.totalTime(); - this._startTime = t - ((t - this._startTime) * this._timeScale / value); - } - this._timeScale = value; - return this._uncache(false); - }; - - p.reversed = function(value) { - if (!arguments.length) { - return this._reversed; - } - if (value != this._reversed) { - this._reversed = value; - this.totalTime(((this._timeline && !this._timeline.smoothChildTiming) ? this.totalDuration() - this._totalTime : this._totalTime), true); - } - return this; - }; - - p.paused = function(value) { - if (!arguments.length) { - return this._paused; - } - if (value != this._paused) if (this._timeline) { - if (!_tickerActive && !value) { - _ticker.wake(); - } - var tl = this._timeline, - raw = tl.rawTime(), - elapsed = raw - this._pauseTime; - if (!value && tl.smoothChildTiming) { - this._startTime += elapsed; - this._uncache(false); - } - this._pauseTime = value ? raw : null; - this._paused = value; - this._active = this.isActive(); - if (!value && elapsed !== 0 && this._initted && this.duration()) { - this.render((tl.smoothChildTiming ? this._totalTime : (raw - this._startTime) / this._timeScale), true, true); //in case the target's properties changed via some other tween or manual update by the user, we should force a render. - } - } - if (this._gc && !value) { - this._enabled(true, false); - } - return this; - }; - - -/* - * ---------------------------------------------------------------- - * SimpleTimeline - * ---------------------------------------------------------------- - */ - var SimpleTimeline = _class("core.SimpleTimeline", function(vars) { - Animation.call(this, 0, vars); - this.autoRemoveChildren = this.smoothChildTiming = true; - }); - - p = SimpleTimeline.prototype = new Animation(); - p.constructor = SimpleTimeline; - p.kill()._gc = false; - p._first = p._last = null; - p._sortChildren = false; - - p.add = p.insert = function(child, position, align, stagger) { - var prevTween, st; - child._startTime = Number(position || 0) + child._delay; - if (child._paused) if (this !== child._timeline) { //we only adjust the _pauseTime if it wasn't in this timeline already. Remember, sometimes a tween will be inserted again into the same timeline when its startTime is changed so that the tweens in the TimelineLite/Max are re-ordered properly in the linked list (so everything renders in the proper order). - child._pauseTime = child._startTime + ((this.rawTime() - child._startTime) / child._timeScale); - } - if (child.timeline) { - child.timeline._remove(child, true); //removes from existing timeline so that it can be properly added to this one. - } - child.timeline = child._timeline = this; - if (child._gc) { - child._enabled(true, true); - } - prevTween = this._last; - if (this._sortChildren) { - st = child._startTime; - while (prevTween && prevTween._startTime > st) { - prevTween = prevTween._prev; - } - } - if (prevTween) { - child._next = prevTween._next; - prevTween._next = child; - } else { - child._next = this._first; - this._first = child; - } - if (child._next) { - child._next._prev = child; - } else { - this._last = child; - } - child._prev = prevTween; - if (this._timeline) { - this._uncache(true); - } - return this; - }; - - p._remove = function(tween, skipDisable) { - if (tween.timeline === this) { - if (!skipDisable) { - tween._enabled(false, true); - } - tween.timeline = null; - - if (tween._prev) { - tween._prev._next = tween._next; - } else if (this._first === tween) { - this._first = tween._next; - } - if (tween._next) { - tween._next._prev = tween._prev; - } else if (this._last === tween) { - this._last = tween._prev; - } - - if (this._timeline) { - this._uncache(true); - } - } - return this; - }; - - p.render = function(time, suppressEvents, force) { - var tween = this._first, - next; - this._totalTime = this._time = this._rawPrevTime = time; - while (tween) { - next = tween._next; //record it here because the value could change after rendering... - if (tween._active || (time >= tween._startTime && !tween._paused)) { - if (!tween._reversed) { - tween.render((time - tween._startTime) * tween._timeScale, suppressEvents, force); - } else { - tween.render(((!tween._dirty) ? tween._totalDuration : tween.totalDuration()) - ((time - tween._startTime) * tween._timeScale), suppressEvents, force); - } - } - tween = next; - } - }; - - p.rawTime = function() { - if (!_tickerActive) { - _ticker.wake(); - } - return this._totalTime; - }; - -/* - * ---------------------------------------------------------------- - * TweenLite - * ---------------------------------------------------------------- - */ - var TweenLite = _class("TweenLite", function(target, duration, vars) { - Animation.call(this, duration, vars); - this.render = TweenLite.prototype.render; //speed optimization (avoid prototype lookup on this "hot" method) - - if (target == null) { - throw "Cannot tween a null target."; - } - - this.target = target = (typeof(target) !== "string") ? target : TweenLite.selector(target) || target; - - var isSelector = (target.jquery || (target.length && target !== window && target[0] && (target[0] === window || (target[0].nodeType && target[0].style && !target.nodeType)))), - overwrite = this.vars.overwrite, - i, targ, targets; - - this._overwrite = overwrite = (overwrite == null) ? _overwriteLookup[TweenLite.defaultOverwrite] : (typeof(overwrite) === "number") ? overwrite >> 0 : _overwriteLookup[overwrite]; - - if ((isSelector || target instanceof Array || (target.push && _isArray(target))) && typeof(target[0]) !== "number") { - this._targets = targets = _slice.call(target, 0); - this._propLookup = []; - this._siblings = []; - for (i = 0; i < targets.length; i++) { - targ = targets[i]; - if (!targ) { - targets.splice(i--, 1); - continue; - } else if (typeof(targ) === "string") { - targ = targets[i--] = TweenLite.selector(targ); //in case it's an array of strings - if (typeof(targ) === "string") { - targets.splice(i+1, 1); //to avoid an endless loop (can't imagine why the selector would return a string, but just in case) - } - continue; - } else if (targ.length && targ !== window && targ[0] && (targ[0] === window || (targ[0].nodeType && targ[0].style && !targ.nodeType))) { //in case the user is passing in an array of selector objects (like jQuery objects), we need to check one more level and pull things out if necessary. Also note that <select> elements pass all the criteria regarding length and the first child having style, so we must also check to ensure the target isn't an HTML node itself. - targets.splice(i--, 1); - this._targets = targets = targets.concat(_slice.call(targ, 0)); - continue; - } - this._siblings[i] = _register(targ, this, false); - if (overwrite === 1) if (this._siblings[i].length > 1) { - _applyOverwrite(targ, this, null, 1, this._siblings[i]); - } - } - - } else { - this._propLookup = {}; - this._siblings = _register(target, this, false); - if (overwrite === 1) if (this._siblings.length > 1) { - _applyOverwrite(target, this, null, 1, this._siblings); - } - } - if (this.vars.immediateRender || (duration === 0 && this._delay === 0 && this.vars.immediateRender !== false)) { - this._time = -_tinyNum; //forces a render without having to set the render() "force" parameter to true because we want to allow lazying by default (using the "force" parameter always forces an immediate full render) - this.render(-this._delay); - } - }, true), - _isSelector = function(v) { - return (v.length && v !== window && v[0] && (v[0] === window || (v[0].nodeType && v[0].style && !v.nodeType))); //we cannot check "nodeType" if the target is window from within an iframe, otherwise it will trigger a security error in some browsers like Firefox. - }, - _autoCSS = function(vars, target) { - var css = {}, - p; - for (p in vars) { - if (!_reservedProps[p] && (!(p in target) || p === "transform" || p === "x" || p === "y" || p === "width" || p === "height" || p === "className" || p === "border") && (!_plugins[p] || (_plugins[p] && _plugins[p]._autoCSS))) { //note: <img> elements contain read-only "x" and "y" properties. We should also prioritize editing css width/height rather than the element's properties. - css[p] = vars[p]; - delete vars[p]; - } - } - vars.css = css; - }; - - p = TweenLite.prototype = new Animation(); - p.constructor = TweenLite; - p.kill()._gc = false; - -//----TweenLite defaults, overwrite management, and root updates ---------------------------------------------------- - - p.ratio = 0; - p._firstPT = p._targets = p._overwrittenProps = p._startAt = null; - p._notifyPluginsOfEnabled = p._lazy = false; - - TweenLite.version = "1.12.1"; - TweenLite.defaultEase = p._ease = new Ease(null, null, 1, 1); - TweenLite.defaultOverwrite = "auto"; - TweenLite.ticker = _ticker; - TweenLite.autoSleep = true; - TweenLite.lagSmoothing = function(threshold, adjustedLag) { - _ticker.lagSmoothing(threshold, adjustedLag); - }; - TweenLite.selector = window.$ || window.jQuery || function(e) { if (window.$) { TweenLite.selector = window.$; return window.$(e); } return window.document ? window.document.getElementById((e.charAt(0) === "#") ? e.substr(1) : e) : e; }; - - var _lazyTweens = [], - _lazyLookup = {}, - _internals = TweenLite._internals = {isArray:_isArray, isSelector:_isSelector, lazyTweens:_lazyTweens}, //gives us a way to expose certain private values to other GreenSock classes without contaminating tha main TweenLite object. - _plugins = TweenLite._plugins = {}, - _tweenLookup = _internals.tweenLookup = {}, - _tweenLookupNum = 0, - _reservedProps = _internals.reservedProps = {ease:1, delay:1, overwrite:1, onComplete:1, onCompleteParams:1, onCompleteScope:1, useFrames:1, runBackwards:1, startAt:1, onUpdate:1, onUpdateParams:1, onUpdateScope:1, onStart:1, onStartParams:1, onStartScope:1, onReverseComplete:1, onReverseCompleteParams:1, onReverseCompleteScope:1, onRepeat:1, onRepeatParams:1, onRepeatScope:1, easeParams:1, yoyo:1, immediateRender:1, repeat:1, repeatDelay:1, data:1, paused:1, reversed:1, autoCSS:1, lazy:1}, - _overwriteLookup = {none:0, all:1, auto:2, concurrent:3, allOnStart:4, preexisting:5, "true":1, "false":0}, - _rootFramesTimeline = Animation._rootFramesTimeline = new SimpleTimeline(), - _rootTimeline = Animation._rootTimeline = new SimpleTimeline(), - _lazyRender = function() { - var i = _lazyTweens.length; - _lazyLookup = {}; - while (--i > -1) { - a = _lazyTweens[i]; - if (a && a._lazy !== false) { - a.render(a._lazy, false, true); - a._lazy = false; - } - } - _lazyTweens.length = 0; - }; - - _rootTimeline._startTime = _ticker.time; - _rootFramesTimeline._startTime = _ticker.frame; - _rootTimeline._active = _rootFramesTimeline._active = true; - setTimeout(_lazyRender, 1); //on some mobile devices, there isn't a "tick" before code runs which means any lazy renders wouldn't run before the next official "tick". - - Animation._updateRoot = TweenLite.render = function() { - var i, a, p; - if (_lazyTweens.length) { //if code is run outside of the requestAnimationFrame loop, there may be tweens queued AFTER the engine refreshed, so we need to ensure any pending renders occur before we refresh again. - _lazyRender(); - } - _rootTimeline.render((_ticker.time - _rootTimeline._startTime) * _rootTimeline._timeScale, false, false); - _rootFramesTimeline.render((_ticker.frame - _rootFramesTimeline._startTime) * _rootFramesTimeline._timeScale, false, false); - if (_lazyTweens.length) { - _lazyRender(); - } - if (!(_ticker.frame % 120)) { //dump garbage every 120 frames... - for (p in _tweenLookup) { - a = _tweenLookup[p].tweens; - i = a.length; - while (--i > -1) { - if (a[i]._gc) { - a.splice(i, 1); - } - } - if (a.length === 0) { - delete _tweenLookup[p]; - } - } - //if there are no more tweens in the root timelines, or if they're all paused, make the _timer sleep to reduce load on the CPU slightly - p = _rootTimeline._first; - if (!p || p._paused) if (TweenLite.autoSleep && !_rootFramesTimeline._first && _ticker._listeners.tick.length === 1) { - while (p && p._paused) { - p = p._next; - } - if (!p) { - _ticker.sleep(); - } - } - } - }; - - _ticker.addEventListener("tick", Animation._updateRoot); - - var _register = function(target, tween, scrub) { - var id = target._gsTweenID, a, i; - if (!_tweenLookup[id || (target._gsTweenID = id = "t" + (_tweenLookupNum++))]) { - _tweenLookup[id] = {target:target, tweens:[]}; - } - if (tween) { - a = _tweenLookup[id].tweens; - a[(i = a.length)] = tween; - if (scrub) { - while (--i > -1) { - if (a[i] === tween) { - a.splice(i, 1); - } - } - } - } - return _tweenLookup[id].tweens; - }, - - _applyOverwrite = function(target, tween, props, mode, siblings) { - var i, changed, curTween, l; - if (mode === 1 || mode >= 4) { - l = siblings.length; - for (i = 0; i < l; i++) { - if ((curTween = siblings[i]) !== tween) { - if (!curTween._gc) if (curTween._enabled(false, false)) { - changed = true; - } - } else if (mode === 5) { - break; - } - } - return changed; - } - //NOTE: Add 0.0000000001 to overcome floating point errors that can cause the startTime to be VERY slightly off (when a tween's time() is set for example) - var startTime = tween._startTime + _tinyNum, - overlaps = [], - oCount = 0, - zeroDur = (tween._duration === 0), - globalStart; - i = siblings.length; - while (--i > -1) { - if ((curTween = siblings[i]) === tween || curTween._gc || curTween._paused) { - //ignore - } else if (curTween._timeline !== tween._timeline) { - globalStart = globalStart || _checkOverlap(tween, 0, zeroDur); - if (_checkOverlap(curTween, globalStart, zeroDur) === 0) { - overlaps[oCount++] = curTween; - } - } else if (curTween._startTime <= startTime) if (curTween._startTime + curTween.totalDuration() / curTween._timeScale > startTime) if (!((zeroDur || !curTween._initted) && startTime - curTween._startTime <= 0.0000000002)) { - overlaps[oCount++] = curTween; - } - } - - i = oCount; - while (--i > -1) { - curTween = overlaps[i]; - if (mode === 2) if (curTween._kill(props, target)) { - changed = true; - } - if (mode !== 2 || (!curTween._firstPT && curTween._initted)) { - if (curTween._enabled(false, false)) { //if all property tweens have been overwritten, kill the tween. - changed = true; - } - } - } - return changed; - }, - - _checkOverlap = function(tween, reference, zeroDur) { - var tl = tween._timeline, - ts = tl._timeScale, - t = tween._startTime; - while (tl._timeline) { - t += tl._startTime; - ts *= tl._timeScale; - if (tl._paused) { - return -100; - } - tl = tl._timeline; - } - t /= ts; - return (t > reference) ? t - reference : ((zeroDur && t === reference) || (!tween._initted && t - reference < 2 * _tinyNum)) ? _tinyNum : ((t += tween.totalDuration() / tween._timeScale / ts) > reference + _tinyNum) ? 0 : t - reference - _tinyNum; - }; - - -//---- TweenLite instance methods ----------------------------------------------------------------------------- - - p._init = function() { - var v = this.vars, - op = this._overwrittenProps, - dur = this._duration, - immediate = !!v.immediateRender, - ease = v.ease, - i, initPlugins, pt, p, startVars; - if (v.startAt) { - if (this._startAt) { - this._startAt.render(-1, true); //if we've run a startAt previously (when the tween instantiated), we should revert it so that the values re-instantiate correctly particularly for relative tweens. Without this, a TweenLite.fromTo(obj, 1, {x:"+=100"}, {x:"-=100"}), for example, would actually jump to +=200 because the startAt would run twice, doubling the relative change. - this._startAt.kill(); - } - startVars = {}; - for (p in v.startAt) { //copy the properties/values into a new object to avoid collisions, like var to = {x:0}, from = {x:500}; timeline.fromTo(e, 1, from, to).fromTo(e, 1, to, from); - startVars[p] = v.startAt[p]; - } - startVars.overwrite = false; - startVars.immediateRender = true; - startVars.lazy = (immediate && v.lazy !== false); - startVars.startAt = startVars.delay = null; //no nesting of startAt objects allowed (otherwise it could cause an infinite loop). - this._startAt = TweenLite.to(this.target, 0, startVars); - if (immediate) { - if (this._time > 0) { - this._startAt = null; //tweens that render immediately (like most from() and fromTo() tweens) shouldn't revert when their parent timeline's playhead goes backward past the startTime because the initial render could have happened anytime and it shouldn't be directly correlated to this tween's startTime. Imagine setting up a complex animation where the beginning states of various objects are rendered immediately but the tween doesn't happen for quite some time - if we revert to the starting values as soon as the playhead goes backward past the tween's startTime, it will throw things off visually. Reversion should only happen in TimelineLite/Max instances where immediateRender was false (which is the default in the convenience methods like from()). - } else if (dur !== 0) { - return; //we skip initialization here so that overwriting doesn't occur until the tween actually begins. Otherwise, if you create several immediateRender:true tweens of the same target/properties to drop into a TimelineLite or TimelineMax, the last one created would overwrite the first ones because they didn't get placed into the timeline yet before the first render occurs and kicks in overwriting. - } - } - } else if (v.runBackwards && dur !== 0) { - //from() tweens must be handled uniquely: their beginning values must be rendered but we don't want overwriting to occur yet (when time is still 0). Wait until the tween actually begins before doing all the routines like overwriting. At that time, we should render at the END of the tween to ensure that things initialize correctly (remember, from() tweens go backwards) - if (this._startAt) { - this._startAt.render(-1, true); - this._startAt.kill(); - this._startAt = null; - } else { - pt = {}; - for (p in v) { //copy props into a new object and skip any reserved props, otherwise onComplete or onUpdate or onStart could fire. We should, however, permit autoCSS to go through. - if (!_reservedProps[p] || p === "autoCSS") { - pt[p] = v[p]; - } - } - pt.overwrite = 0; - pt.data = "isFromStart"; //we tag the tween with as "isFromStart" so that if [inside a plugin] we need to only do something at the very END of a tween, we have a way of identifying this tween as merely the one that's setting the beginning values for a "from()" tween. For example, clearProps in CSSPlugin should only get applied at the very END of a tween and without this tag, from(...{height:100, clearProps:"height", delay:1}) would wipe the height at the beginning of the tween and after 1 second, it'd kick back in. - pt.lazy = (immediate && v.lazy !== false); - pt.immediateRender = immediate; //zero-duration tweens render immediately by default, but if we're not specifically instructed to render this tween immediately, we should skip this and merely _init() to record the starting values (rendering them immediately would push them to completion which is wasteful in that case - we'd have to render(-1) immediately after) - this._startAt = TweenLite.to(this.target, 0, pt); - if (!immediate) { - this._startAt._init(); //ensures that the initial values are recorded - this._startAt._enabled(false); //no need to have the tween render on the next cycle. Disable it because we'll always manually control the renders of the _startAt tween. - } else if (this._time === 0) { - return; - } - } - } - if (!ease) { - this._ease = TweenLite.defaultEase; - } else if (ease instanceof Ease) { - this._ease = (v.easeParams instanceof Array) ? ease.config.apply(ease, v.easeParams) : ease; - } else { - this._ease = (typeof(ease) === "function") ? new Ease(ease, v.easeParams) : _easeMap[ease] || TweenLite.defaultEase; - } - this._easeType = this._ease._type; - this._easePower = this._ease._power; - this._firstPT = null; - - if (this._targets) { - i = this._targets.length; - while (--i > -1) { - if ( this._initProps( this._targets[i], (this._propLookup[i] = {}), this._siblings[i], (op ? op[i] : null)) ) { - initPlugins = true; - } - } - } else { - initPlugins = this._initProps(this.target, this._propLookup, this._siblings, op); - } - - if (initPlugins) { - TweenLite._onPluginEvent("_onInitAllProps", this); //reorders the array in order of priority. Uses a static TweenPlugin method in order to minimize file size in TweenLite - } - if (op) if (!this._firstPT) if (typeof(this.target) !== "function") { //if all tweening properties have been overwritten, kill the tween. If the target is a function, it's probably a delayedCall so let it live. - this._enabled(false, false); - } - if (v.runBackwards) { - pt = this._firstPT; - while (pt) { - pt.s += pt.c; - pt.c = -pt.c; - pt = pt._next; - } - } - this._onUpdate = v.onUpdate; - this._initted = true; - }; - - p._initProps = function(target, propLookup, siblings, overwrittenProps) { - var p, i, initPlugins, plugin, pt, v; - if (target == null) { - return false; - } - - if (_lazyLookup[target._gsTweenID]) { - _lazyRender(); //if other tweens of the same target have recently initted but haven't rendered yet, we've got to force the render so that the starting values are correct (imagine populating a timeline with a bunch of sequential tweens and then jumping to the end) - } - - if (!this.vars.css) if (target.style) if (target !== window && target.nodeType) if (_plugins.css) if (this.vars.autoCSS !== false) { //it's so common to use TweenLite/Max to animate the css of DOM elements, we assume that if the target is a DOM element, that's what is intended (a convenience so that users don't have to wrap things in css:{}, although we still recommend it for a slight performance boost and better specificity). Note: we cannot check "nodeType" on the window inside an iframe. - _autoCSS(this.vars, target); - } - for (p in this.vars) { - v = this.vars[p]; - if (_reservedProps[p]) { - if (v) if ((v instanceof Array) || (v.push && _isArray(v))) if (v.join("").indexOf("{self}") !== -1) { - this.vars[p] = v = this._swapSelfInParams(v, this); - } - - } else if (_plugins[p] && (plugin = new _plugins[p]())._onInitTween(target, this.vars[p], this)) { - - //t - target [object] - //p - property [string] - //s - start [number] - //c - change [number] - //f - isFunction [boolean] - //n - name [string] - //pg - isPlugin [boolean] - //pr - priority [number] - this._firstPT = pt = {_next:this._firstPT, t:plugin, p:"setRatio", s:0, c:1, f:true, n:p, pg:true, pr:plugin._priority}; - i = plugin._overwriteProps.length; - while (--i > -1) { - propLookup[plugin._overwriteProps[i]] = this._firstPT; - } - if (plugin._priority || plugin._onInitAllProps) { - initPlugins = true; - } - if (plugin._onDisable || plugin._onEnable) { - this._notifyPluginsOfEnabled = true; - } - - } else { - this._firstPT = propLookup[p] = pt = {_next:this._firstPT, t:target, p:p, f:(typeof(target[p]) === "function"), n:p, pg:false, pr:0}; - pt.s = (!pt.f) ? parseFloat(target[p]) : target[ ((p.indexOf("set") || typeof(target["get" + p.substr(3)]) !== "function") ? p : "get" + p.substr(3)) ](); - pt.c = (typeof(v) === "string" && v.charAt(1) === "=") ? parseInt(v.charAt(0) + "1", 10) * Number(v.substr(2)) : (Number(v) - pt.s) || 0; - } - if (pt) if (pt._next) { - pt._next._prev = pt; - } - } - - if (overwrittenProps) if (this._kill(overwrittenProps, target)) { //another tween may have tried to overwrite properties of this tween before init() was called (like if two tweens start at the same time, the one created second will run first) - return this._initProps(target, propLookup, siblings, overwrittenProps); - } - if (this._overwrite > 1) if (this._firstPT) if (siblings.length > 1) if (_applyOverwrite(target, this, propLookup, this._overwrite, siblings)) { - this._kill(propLookup, target); - return this._initProps(target, propLookup, siblings, overwrittenProps); - } - if (this._firstPT) if ((this.vars.lazy !== false && this._duration) || (this.vars.lazy && !this._duration)) { //zero duration tweens don't lazy render by default; everything else does. - _lazyLookup[target._gsTweenID] = true; - } - return initPlugins; - }; - - p.render = function(time, suppressEvents, force) { - var prevTime = this._time, - duration = this._duration, - prevRawPrevTime = this._rawPrevTime, - isComplete, callback, pt, rawPrevTime; - if (time >= duration) { - this._totalTime = this._time = duration; - this.ratio = this._ease._calcEnd ? this._ease.getRatio(1) : 1; - if (!this._reversed ) { - isComplete = true; - callback = "onComplete"; - } - if (duration === 0) if (this._initted || !this.vars.lazy || force) { //zero-duration tweens are tricky because we must discern the momentum/direction of time in order to determine whether the starting values should be rendered or the ending values. If the "playhead" of its timeline goes past the zero-duration tween in the forward direction or lands directly on it, the end values should be rendered, but if the timeline's "playhead" moves past it in the backward direction (from a postitive time to a negative time), the starting values must be rendered. - if (this._startTime === this._timeline._duration) { //if a zero-duration tween is at the VERY end of a timeline and that timeline renders at its end, it will typically add a tiny bit of cushion to the render time to prevent rounding errors from getting in the way of tweens rendering their VERY end. If we then reverse() that timeline, the zero-duration tween will trigger its onReverseComplete even though technically the playhead didn't pass over it again. It's a very specific edge case we must accommodate. - time = 0; - } - if (time === 0 || prevRawPrevTime < 0 || prevRawPrevTime === _tinyNum) if (prevRawPrevTime !== time) { - force = true; - if (prevRawPrevTime > _tinyNum) { - callback = "onReverseComplete"; - } - } - this._rawPrevTime = rawPrevTime = (!suppressEvents || time || prevRawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. - } - - } else if (time < 0.0000001) { //to work around occasional floating point math artifacts, round super small values to 0. - this._totalTime = this._time = 0; - this.ratio = this._ease._calcEnd ? this._ease.getRatio(0) : 0; - if (prevTime !== 0 || (duration === 0 && prevRawPrevTime > 0 && prevRawPrevTime !== _tinyNum)) { - callback = "onReverseComplete"; - isComplete = this._reversed; - } - if (time < 0) { - this._active = false; - if (duration === 0) if (this._initted || !this.vars.lazy || force) { //zero-duration tweens are tricky because we must discern the momentum/direction of time in order to determine whether the starting values should be rendered or the ending values. If the "playhead" of its timeline goes past the zero-duration tween in the forward direction or lands directly on it, the end values should be rendered, but if the timeline's "playhead" moves past it in the backward direction (from a postitive time to a negative time), the starting values must be rendered. - if (prevRawPrevTime >= 0) { - force = true; - } - this._rawPrevTime = rawPrevTime = (!suppressEvents || time || prevRawPrevTime === time) ? time : _tinyNum; //when the playhead arrives at EXACTLY time 0 (right on top) of a zero-duration tween, we need to discern if events are suppressed so that when the playhead moves again (next time), it'll trigger the callback. If events are NOT suppressed, obviously the callback would be triggered in this render. Basically, the callback should fire either when the playhead ARRIVES or LEAVES this exact spot, not both. Imagine doing a timeline.seek(0) and there's a callback that sits at 0. Since events are suppressed on that seek() by default, nothing will fire, but when the playhead moves off of that position, the callback should fire. This behavior is what people intuitively expect. We set the _rawPrevTime to be a precise tiny number to indicate this scenario rather than using another property/variable which would increase memory usage. This technique is less readable, but more efficient. - } - } else if (!this._initted) { //if we render the very beginning (time == 0) of a fromTo(), we must force the render (normal tweens wouldn't need to render at a time of 0 when the prevTime was also 0). This is also mandatory to make sure overwriting kicks in immediately. - force = true; - } - } else { - this._totalTime = this._time = time; - - if (this._easeType) { - var r = time / duration, type = this._easeType, pow = this._easePower; - if (type === 1 || (type === 3 && r >= 0.5)) { - r = 1 - r; - } - if (type === 3) { - r *= 2; - } - if (pow === 1) { - r *= r; - } else if (pow === 2) { - r *= r * r; - } else if (pow === 3) { - r *= r * r * r; - } else if (pow === 4) { - r *= r * r * r * r; - } - - if (type === 1) { - this.ratio = 1 - r; - } else if (type === 2) { - this.ratio = r; - } else if (time / duration < 0.5) { - this.ratio = r / 2; - } else { - this.ratio = 1 - (r / 2); - } - - } else { - this.ratio = this._ease.getRatio(time / duration); - } - } - - if (this._time === prevTime && !force) { - return; - } else if (!this._initted) { - this._init(); - if (!this._initted || this._gc) { //immediateRender tweens typically won't initialize until the playhead advances (_time is greater than 0) in order to ensure that overwriting occurs properly. Also, if all of the tweening properties have been overwritten (which would cause _gc to be true, as set in _init()), we shouldn't continue otherwise an onStart callback could be called for example. - return; - } else if (!force && this._firstPT && ((this.vars.lazy !== false && this._duration) || (this.vars.lazy && !this._duration))) { - this._time = this._totalTime = prevTime; - this._rawPrevTime = prevRawPrevTime; - _lazyTweens.push(this); - this._lazy = time; - return; - } - //_ease is initially set to defaultEase, so now that init() has run, _ease is set properly and we need to recalculate the ratio. Overall this is faster than using conditional logic earlier in the method to avoid having to set ratio twice because we only init() once but renderTime() gets called VERY frequently. - if (this._time && !isComplete) { - this.ratio = this._ease.getRatio(this._time / duration); - } else if (isComplete && this._ease._calcEnd) { - this.ratio = this._ease.getRatio((this._time === 0) ? 0 : 1); - } - } - if (this._lazy !== false) { //in case a lazy render is pending, we should flush it because the new render is occuring now (imagine a lazy tween instantiating and then immediately the user calls tween.seek(tween.duration()), skipping to the end - the end render would be forced, and then if we didn't flush the lazy render, it'd fire AFTER the seek(), rendering it at the wrong time. - this._lazy = false; - } - if (!this._active) if (!this._paused && this._time !== prevTime && time >= 0) { - this._active = true; //so that if the user renders a tween (as opposed to the timeline rendering it), the timeline is forced to re-render and align it with the proper time/frame on the next rendering cycle. Maybe the tween already finished but the user manually re-renders it as halfway done. - } - if (prevTime === 0) { - if (this._startAt) { - if (time >= 0) { - this._startAt.render(time, suppressEvents, force); - } else if (!callback) { - callback = "_dummyGS"; //if no callback is defined, use a dummy value just so that the condition at the end evaluates as true because _startAt should render AFTER the normal render loop when the time is negative. We could handle this in a more intuitive way, of course, but the render loop is the MOST important thing to optimize, so this technique allows us to avoid adding extra conditional logic in a high-frequency area. - } - } - if (this.vars.onStart) if (this._time !== 0 || duration === 0) if (!suppressEvents) { - this.vars.onStart.apply(this.vars.onStartScope || this, this.vars.onStartParams || _blankArray); - } - } - - pt = this._firstPT; - while (pt) { - if (pt.f) { - pt.t[pt.p](pt.c * this.ratio + pt.s); - } else { - pt.t[pt.p] = pt.c * this.ratio + pt.s; - } - pt = pt._next; - } - - if (this._onUpdate) { - if (time < 0) if (this._startAt && this._startTime) { //if the tween is positioned at the VERY beginning (_startTime 0) of its parent timeline, it's illegal for the playhead to go back further, so we should not render the recorded startAt values. - this._startAt.render(time, suppressEvents, force); //note: for performance reasons, we tuck this conditional logic inside less traveled areas (most tweens don't have an onUpdate). We'd just have it at the end before the onComplete, but the values should be updated before any onUpdate is called, so we ALSO put it here and then if it's not called, we do so later near the onComplete. - } - if (!suppressEvents) if (this._time !== prevTime || isComplete) { - this._onUpdate.apply(this.vars.onUpdateScope || this, this.vars.onUpdateParams || _blankArray); - } - } - - if (callback) if (!this._gc) { //check _gc because there's a chance that kill() could be called in an onUpdate - if (time < 0 && this._startAt && !this._onUpdate && this._startTime) { //if the tween is positioned at the VERY beginning (_startTime 0) of its parent timeline, it's illegal for the playhead to go back further, so we should not render the recorded startAt values. - this._startAt.render(time, suppressEvents, force); - } - if (isComplete) { - if (this._timeline.autoRemoveChildren) { - this._enabled(false, false); - } - this._active = false; - } - if (!suppressEvents && this.vars[callback]) { - this.vars[callback].apply(this.vars[callback + "Scope"] || this, this.vars[callback + "Params"] || _blankArray); - } - if (duration === 0 && this._rawPrevTime === _tinyNum && rawPrevTime !== _tinyNum) { //the onComplete or onReverseComplete could trigger movement of the playhead and for zero-duration tweens (which must discern direction) that land directly back on their start time, we don't want to fire again on the next render. Think of several addPause()'s in a timeline that forces the playhead to a certain spot, but what if it's already paused and another tween is tweening the "time" of the timeline? Each time it moves [forward] past that spot, it would move back, and since suppressEvents is true, it'd reset _rawPrevTime to _tinyNum so that when it begins again, the callback would fire (so ultimately it could bounce back and forth during that tween). Again, this is a very uncommon scenario, but possible nonetheless. - this._rawPrevTime = 0; - } - } - - }; - - p._kill = function(vars, target) { - if (vars === "all") { - vars = null; - } - if (vars == null) if (target == null || target === this.target) { - this._lazy = false; - return this._enabled(false, false); - } - target = (typeof(target) !== "string") ? (target || this._targets || this.target) : TweenLite.selector(target) || target; - var i, overwrittenProps, p, pt, propLookup, changed, killProps, record; - if ((_isArray(target) || _isSelector(target)) && typeof(target[0]) !== "number") { - i = target.length; - while (--i > -1) { - if (this._kill(vars, target[i])) { - changed = true; - } - } - } else { - if (this._targets) { - i = this._targets.length; - while (--i > -1) { - if (target === this._targets[i]) { - propLookup = this._propLookup[i] || {}; - this._overwrittenProps = this._overwrittenProps || []; - overwrittenProps = this._overwrittenProps[i] = vars ? this._overwrittenProps[i] || {} : "all"; - break; - } - } - } else if (target !== this.target) { - return false; - } else { - propLookup = this._propLookup; - overwrittenProps = this._overwrittenProps = vars ? this._overwrittenProps || {} : "all"; - } - - if (propLookup) { - killProps = vars || propLookup; - record = (vars !== overwrittenProps && overwrittenProps !== "all" && vars !== propLookup && (typeof(vars) !== "object" || !vars._tempKill)); //_tempKill is a super-secret way to delete a particular tweening property but NOT have it remembered as an official overwritten property (like in BezierPlugin) - for (p in killProps) { - if ((pt = propLookup[p])) { - if (pt.pg && pt.t._kill(killProps)) { - changed = true; //some plugins need to be notified so they can perform cleanup tasks first - } - if (!pt.pg || pt.t._overwriteProps.length === 0) { - if (pt._prev) { - pt._prev._next = pt._next; - } else if (pt === this._firstPT) { - this._firstPT = pt._next; - } - if (pt._next) { - pt._next._prev = pt._prev; - } - pt._next = pt._prev = null; - } - delete propLookup[p]; - } - if (record) { - overwrittenProps[p] = 1; - } - } - if (!this._firstPT && this._initted) { //if all tweening properties are killed, kill the tween. Without this line, if there's a tween with multiple targets and then you killTweensOf() each target individually, the tween would technically still remain active and fire its onComplete even though there aren't any more properties tweening. - this._enabled(false, false); - } - } - } - return changed; - }; - - p.invalidate = function() { - if (this._notifyPluginsOfEnabled) { - TweenLite._onPluginEvent("_onDisable", this); - } - this._firstPT = null; - this._overwrittenProps = null; - this._onUpdate = null; - this._startAt = null; - this._initted = this._active = this._notifyPluginsOfEnabled = this._lazy = false; - this._propLookup = (this._targets) ? {} : []; - return this; - }; - - p._enabled = function(enabled, ignoreTimeline) { - if (!_tickerActive) { - _ticker.wake(); - } - if (enabled && this._gc) { - var targets = this._targets, - i; - if (targets) { - i = targets.length; - while (--i > -1) { - this._siblings[i] = _register(targets[i], this, true); - } - } else { - this._siblings = _register(this.target, this, true); - } - } - Animation.prototype._enabled.call(this, enabled, ignoreTimeline); - if (this._notifyPluginsOfEnabled) if (this._firstPT) { - return TweenLite._onPluginEvent((enabled ? "_onEnable" : "_onDisable"), this); - } - return false; - }; - - -//----TweenLite static methods ----------------------------------------------------- - - TweenLite.to = function(target, duration, vars) { - return new TweenLite(target, duration, vars); - }; - - TweenLite.from = function(target, duration, vars) { - vars.runBackwards = true; - vars.immediateRender = (vars.immediateRender != false); - return new TweenLite(target, duration, vars); - }; - - TweenLite.fromTo = function(target, duration, fromVars, toVars) { - toVars.startAt = fromVars; - toVars.immediateRender = (toVars.immediateRender != false && fromVars.immediateRender != false); - return new TweenLite(target, duration, toVars); - }; - - TweenLite.delayedCall = function(delay, callback, params, scope, useFrames) { - return new TweenLite(callback, 0, {delay:delay, onComplete:callback, onCompleteParams:params, onCompleteScope:scope, onReverseComplete:callback, onReverseCompleteParams:params, onReverseCompleteScope:scope, immediateRender:false, useFrames:useFrames, overwrite:0}); - }; - - TweenLite.set = function(target, vars) { - return new TweenLite(target, 0, vars); - }; - - TweenLite.getTweensOf = function(target, onlyActive) { - if (target == null) { return []; } - target = (typeof(target) !== "string") ? target : TweenLite.selector(target) || target; - var i, a, j, t; - if ((_isArray(target) || _isSelector(target)) && typeof(target[0]) !== "number") { - i = target.length; - a = []; - while (--i > -1) { - a = a.concat(TweenLite.getTweensOf(target[i], onlyActive)); - } - i = a.length; - //now get rid of any duplicates (tweens of arrays of objects could cause duplicates) - while (--i > -1) { - t = a[i]; - j = i; - while (--j > -1) { - if (t === a[j]) { - a.splice(i, 1); - } - } - } - } else { - a = _register(target).concat(); - i = a.length; - while (--i > -1) { - if (a[i]._gc || (onlyActive && !a[i].isActive())) { - a.splice(i, 1); - } - } - } - return a; - }; - - TweenLite.killTweensOf = TweenLite.killDelayedCallsTo = function(target, onlyActive, vars) { - if (typeof(onlyActive) === "object") { - vars = onlyActive; //for backwards compatibility (before "onlyActive" parameter was inserted) - onlyActive = false; - } - var a = TweenLite.getTweensOf(target, onlyActive), - i = a.length; - while (--i > -1) { - a[i]._kill(vars, target); - } - }; - - - -/* - * ---------------------------------------------------------------- - * TweenPlugin (could easily be split out as a separate file/class, but included for ease of use (so that people don't need to include another <script> call before loading plugins which is easy to forget) - * ---------------------------------------------------------------- - */ - var TweenPlugin = _class("plugins.TweenPlugin", function(props, priority) { - this._overwriteProps = (props || "").split(","); - this._propName = this._overwriteProps[0]; - this._priority = priority || 0; - this._super = TweenPlugin.prototype; - }, true); - - p = TweenPlugin.prototype; - TweenPlugin.version = "1.10.1"; - TweenPlugin.API = 2; - p._firstPT = null; - - p._addTween = function(target, prop, start, end, overwriteProp, round) { - var c, pt; - if (end != null && (c = (typeof(end) === "number" || end.charAt(1) !== "=") ? Number(end) - start : parseInt(end.charAt(0) + "1", 10) * Number(end.substr(2)))) { - this._firstPT = pt = {_next:this._firstPT, t:target, p:prop, s:start, c:c, f:(typeof(target[prop]) === "function"), n:overwriteProp || prop, r:round}; - if (pt._next) { - pt._next._prev = pt; - } - return pt; - } - }; - - p.setRatio = function(v) { - var pt = this._firstPT, - min = 0.000001, - val; - while (pt) { - val = pt.c * v + pt.s; - if (pt.r) { - val = Math.round(val); - } else if (val < min) if (val > -min) { //prevents issues with converting very small numbers to strings in the browser - val = 0; - } - if (pt.f) { - pt.t[pt.p](val); - } else { - pt.t[pt.p] = val; - } - pt = pt._next; - } - }; - - p._kill = function(lookup) { - var a = this._overwriteProps, - pt = this._firstPT, - i; - if (lookup[this._propName] != null) { - this._overwriteProps = []; - } else { - i = a.length; - while (--i > -1) { - if (lookup[a[i]] != null) { - a.splice(i, 1); - } - } - } - while (pt) { - if (lookup[pt.n] != null) { - if (pt._next) { - pt._next._prev = pt._prev; - } - if (pt._prev) { - pt._prev._next = pt._next; - pt._prev = null; - } else if (this._firstPT === pt) { - this._firstPT = pt._next; - } - } - pt = pt._next; - } - return false; - }; - - p._roundProps = function(lookup, value) { - var pt = this._firstPT; - while (pt) { - if (lookup[this._propName] || (pt.n != null && lookup[ pt.n.split(this._propName + "_").join("") ])) { //some properties that are very plugin-specific add a prefix named after the _propName plus an underscore, so we need to ignore that extra stuff here. - pt.r = value; - } - pt = pt._next; - } - }; - - TweenLite._onPluginEvent = function(type, tween) { - var pt = tween._firstPT, - changed, pt2, first, last, next; - if (type === "_onInitAllProps") { - //sorts the PropTween linked list in order of priority because some plugins need to render earlier/later than others, like MotionBlurPlugin applies its effects after all x/y/alpha tweens have rendered on each frame. - while (pt) { - next = pt._next; - pt2 = first; - while (pt2 && pt2.pr > pt.pr) { - pt2 = pt2._next; - } - if ((pt._prev = pt2 ? pt2._prev : last)) { - pt._prev._next = pt; - } else { - first = pt; - } - if ((pt._next = pt2)) { - pt2._prev = pt; - } else { - last = pt; - } - pt = next; - } - pt = tween._firstPT = first; - } - while (pt) { - if (pt.pg) if (typeof(pt.t[type]) === "function") if (pt.t[type]()) { - changed = true; - } - pt = pt._next; - } - return changed; - }; - - TweenPlugin.activate = function(plugins) { - var i = plugins.length; - while (--i > -1) { - if (plugins[i].API === TweenPlugin.API) { - _plugins[(new plugins[i]())._propName] = plugins[i]; - } - } - return true; - }; - - //provides a more concise way to define plugins that have no dependencies besides TweenPlugin and TweenLite, wrapping common boilerplate stuff into one function (added in 1.9.0). You don't NEED to use this to define a plugin - the old way still works and can be useful in certain (rare) situations. - _gsDefine.plugin = function(config) { - if (!config || !config.propName || !config.init || !config.API) { throw "illegal plugin definition."; } - var propName = config.propName, - priority = config.priority || 0, - overwriteProps = config.overwriteProps, - map = {init:"_onInitTween", set:"setRatio", kill:"_kill", round:"_roundProps", initAll:"_onInitAllProps"}, - Plugin = _class("plugins." + propName.charAt(0).toUpperCase() + propName.substr(1) + "Plugin", - function() { - TweenPlugin.call(this, propName, priority); - this._overwriteProps = overwriteProps || []; - }, (config.global === true)), - p = Plugin.prototype = new TweenPlugin(propName), - prop; - p.constructor = Plugin; - Plugin.API = config.API; - for (prop in map) { - if (typeof(config[prop]) === "function") { - p[map[prop]] = config[prop]; - } - } - Plugin.version = config.version; - TweenPlugin.activate([Plugin]); - return Plugin; - }; - - - //now run through all the dependencies discovered and if any are missing, log that to the console as a warning. This is why it's best to have TweenLite load last - it can check all the dependencies for you. - a = window._gsQueue; - if (a) { - for (i = 0; i < a.length; i++) { - a[i](); - } - for (p in _defLookup) { - if (!_defLookup[p].func) { - //window.console.log("GSAP encountered missing dependency: com.greensock." + p); - } - } - } - - _tickerActive = false; //ensures that the first official animation forces a ticker.tick() to update the time when it is instantiated - -})(window); angular.module('b2b.att.collapse', ['b2b.att.transition']) diff --git a/ecomp-sdk/epsdk-core/pom.xml b/ecomp-sdk/epsdk-core/pom.xml index 9be09a7c..d9993110 100644 --- a/ecomp-sdk/epsdk-core/pom.xml +++ b/ecomp-sdk/epsdk-core/pom.xml @@ -322,6 +322,12 @@ <version>1.0.0</version> </dependency> + <dependency> + <groupId>org.owasp.esapi</groupId> + <artifactId>esapi</artifactId> + <version>2.1.0.1</version> + </dependency> + <!-- UEB was originally named Cambria --> <dependency> <groupId>com.att.nsa</groupId> diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ElementLinkService.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ElementLinkService.java index e096d832..4d06d827 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ElementLinkService.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ElementLinkService.java @@ -44,6 +44,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.io.FilenameUtils; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.onap.portalsdk.core.util.SystemProperties; import org.onap.portalsdk.core.util.YamlUtils; @@ -68,7 +69,7 @@ public class ElementLinkService { relFilePath = SystemProperties.getProperty("customCallFlow_path"); else relFilePath = SystemProperties.getProperty("element_map_file_path"); - final String yamlDirPath = new File(args[0], relFilePath).getPath(); + final String yamlDirPath = FilenameUtils.normalize(new File(args[0], relFilePath).getPath()); String callFlowBusinessYml = ""; String callFlowStep = ""; diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ElementMapService.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ElementMapService.java index e838e783..75f3dc8e 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ElementMapService.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/ElementMapService.java @@ -47,6 +47,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; +import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang.StringUtils; import org.onap.portalsdk.core.domain.support.Container; import org.onap.portalsdk.core.domain.support.Domain; @@ -205,7 +206,7 @@ public class ElementMapService { */ public String buildElementMapYaml(String args[]) throws IOException { - final String yamlDirPath = new File(args[2], filePath).getPath(); + final String yamlDirPath = FilenameUtils.normalize(new File(args[2], filePath).getPath()); if (args != null && args.length > 4) { if (args[3] != null) networkToscaYml = args[3] + ".yml"; diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RoleServiceCentralizedAccess.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RoleServiceCentralizedAccess.java index 3ef7cb8b..777968e5 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RoleServiceCentralizedAccess.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/RoleServiceCentralizedAccess.java @@ -134,8 +134,8 @@ public class RoleServiceCentralizedAccess implements RoleService { @Override public void deleteRole(String loginId, Role domainRole) throws IOException { - String roleName = domainRole.getName().replaceAll(" ", "%20"); - restApiRequestBuilder.deleteViaRest("/deleteRole/" + roleName, true, null, loginId); + Long roleId = domainRole.getId(); + restApiRequestBuilder.deleteViaRest("v2/deleteRole/" + roleId, true, null, loginId); } @Override diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/util/SecurityCodecUtil.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/util/SecurityCodecUtil.java new file mode 100644 index 00000000..c3e00c3f --- /dev/null +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/util/SecurityCodecUtil.java @@ -0,0 +1,76 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal SDK + * =================================================================== + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ +package org.onap.portalsdk.core.util; + +import org.apache.commons.lang.StringUtils; +import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.owasp.esapi.codecs.Codec; +import org.owasp.esapi.codecs.MySQLCodec; +import org.owasp.esapi.codecs.MySQLCodec.Mode; +import org.owasp.esapi.codecs.OracleCodec; + +public class SecurityCodecUtil { + + private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SecurityCodecUtil.class); + + private static final String MYSQL_DB = "mysql"; + private static final String ORACLE_DB = "oracle"; + private static final String MARIA_DB = "mariadb"; + private static Codec instance = null; + + public static Codec getCodec() { + try { + if (null == instance) { + if (StringUtils.containsIgnoreCase(SystemProperties.getProperty(SystemProperties.DB_DRIVER), MYSQL_DB) + || StringUtils.containsIgnoreCase(SystemProperties.getProperty(SystemProperties.DB_DRIVER), + MARIA_DB)) { + instance = new MySQLCodec(Mode.STANDARD); + + } else if (StringUtils.containsIgnoreCase(SystemProperties.getProperty(SystemProperties.DB_DRIVER), + ORACLE_DB)) { + instance = new OracleCodec(); + } + } + + } catch (Exception ex) { + logger.error(EELFLoggerDelegate.errorLogger, "getCodec() failed", ex); + } + return instance; + + } +}
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/util/YamlUtils.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/util/YamlUtils.java index 38bd2075..5072e5a2 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/util/YamlUtils.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/util/YamlUtils.java @@ -43,6 +43,7 @@ import java.io.FileWriter; import java.io.IOException; import java.util.Map; +import org.apache.commons.io.FilenameUtils; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.representer.Representer; @@ -71,7 +72,7 @@ public class YamlUtils { @SuppressWarnings("unchecked") public static Map<String, Object> readYamlFile(String filePath, String fileName) throws IOException { - FileReader reader = new FileReader(filePath + File.separator + fileName); + FileReader reader = new FileReader(FilenameUtils.normalize(filePath + File.separator + fileName)); Map<String, Object> callFlowBs = (Map<String, Object>) yaml.load(reader); reader.close(); return callFlowBs; diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/web/support/UserUtils.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/web/support/UserUtils.java index 89f34050..bd7d5ed5 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/web/support/UserUtils.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/web/support/UserUtils.java @@ -346,6 +346,7 @@ public class UserUtils { userJson.setOrgId(user.getOrgId()); userJson.setPhone(user.getPhone()); userJson.setOrgUserId(user.getOrgUserId()); + userJson.setActive(user.getActive()); Set<EcompRole> ecompRoles = new TreeSet<>(); for (Role role : user.getRoles()) { ecompRoles.add(convertToEcompRole(role)); diff --git a/ecomp-sdk/epsdk-fw/pom.xml b/ecomp-sdk/epsdk-fw/pom.xml index ab07ae2a..cb431a1a 100644 --- a/ecomp-sdk/epsdk-fw/pom.xml +++ b/ecomp-sdk/epsdk-fw/pom.xml @@ -81,6 +81,11 @@ <artifactId>jackson-databind</artifactId> <version>2.6.3</version> </dependency> + <dependency> + <groupId>org.owasp.esapi</groupId> + <artifactId>esapi</artifactId> + <version>2.1.0.1</version> + </dependency> </dependencies> diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/rest/RestWebServiceClient.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/rest/RestWebServiceClient.java index 1533db79..91f019be 100644 --- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/rest/RestWebServiceClient.java +++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/rest/RestWebServiceClient.java @@ -49,6 +49,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.onap.portalsdk.core.onboarding.util.PortalApiConstants; import org.onap.portalsdk.core.onboarding.util.PortalApiProperties; +import org.owasp.esapi.ESAPI; + /** * Simple REST client for GET, POST and DELETE operations against the Portal @@ -209,7 +211,7 @@ public class RestWebServiceClient { // add request header con.setRequestProperty("uebkey", appUebKey); - con.setRequestProperty("LoginId", loginId); + con.setRequestProperty("LoginId", ESAPI.encoder().canonicalize(loginId)); con.setRequestProperty("user-agent", appName); con.setRequestProperty("X-ECOMP-RequestID", requestId); con.setRequestProperty("username", appUserName); diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java index ce70c717..92d9ffc3 100644 --- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java +++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/CipherUtil.java @@ -143,7 +143,7 @@ public class CipherUtil { return CipherUtil.decrypt(encryptedText, key); } - public static void main(String[] args) throws CipherUtilException { +/* public static void main(String[] args) throws CipherUtilException { String testValue = "Welcome123"; String encrypted; @@ -170,5 +170,5 @@ public class CipherUtil { System.out.println("Encrypted Text" + encrypted); } } - } + }*/ } diff --git a/ecomp-sdk/pom.xml b/ecomp-sdk/pom.xml index c9664d03..bb390560 100644 --- a/ecomp-sdk/pom.xml +++ b/ecomp-sdk/pom.xml @@ -42,25 +42,25 @@ <!-- Specify the repositories here to avoid coordination of ~/.m2/settings.xml files among developers. Use values (not properties) so oparent can - be resolved. --> + be resolved. The IDs should match Jenkins template values. --> <repositories> <repository> - <id>onap-releases</id> + <id>releases</id> <name>ONAP - Release Repository</name> <url>https://nexus.onap.org/content/repositories/releases</url> </repository> <repository> - <id>onap-staging</id> + <id>staging</id> <name>ONAP - Staging Repository</name> <url>https://nexus.onap.org/content/repositories/staging</url> </repository> <repository> - <id>onap-snapshots</id> + <id>snapshots</id> <name>ONAP - Snapshot Repository</name> <url>https://nexus.onap.org/content/repositories/snapshots</url> </repository> <repository> - <id>onap-public</id> + <id>public</id> <url>https://nexus.onap.org/content/groups/public</url> </repository> </repositories> @@ -217,13 +217,14 @@ </build> <distributionManagement> - <!-- Override the OParent sections which use id "ecomp-releases" etc. The - ids below must match .m2/settings.xml/servers/server/id --> + <!-- Override the OParent sections which use id "ecomp-releases" etc. + The IDs MUST match Jenkins template values. --> <repository> <id>releases</id> <name>OpenECOMP - Release Repository</name> <url>${nexusproxy}/${releaseNexusPath}</url> </repository> + <!-- no support for a "stagingRepository" --> <snapshotRepository> <id>snapshots</id> <name>OpenECOMP - Snapshot Repository</name> |